|
@@ -1,9 +1,5 @@
|
|
|
package com.fs.hisStore.service.impl;
|
|
package com.fs.hisStore.service.impl;
|
|
|
|
|
|
|
|
-import java.math.BigDecimal;
|
|
|
|
|
-import java.util.*;
|
|
|
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
-
|
|
|
|
|
import cn.hutool.core.collection.ListUtil;
|
|
import cn.hutool.core.collection.ListUtil;
|
|
|
import cn.hutool.core.util.ArrayUtil;
|
|
import cn.hutool.core.util.ArrayUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
@@ -11,9 +7,7 @@ import cn.hutool.core.util.StrUtil;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.fs.common.BeanCopyUtils;
|
|
import com.fs.common.BeanCopyUtils;
|
|
|
-import com.fs.common.annotation.Log;
|
|
|
|
|
import com.fs.common.core.domain.R;
|
|
import com.fs.common.core.domain.R;
|
|
|
-import com.fs.common.enums.BusinessType;
|
|
|
|
|
import com.fs.common.exception.CustomException;
|
|
import com.fs.common.exception.CustomException;
|
|
|
import com.fs.common.exception.ServiceException;
|
|
import com.fs.common.exception.ServiceException;
|
|
|
import com.fs.common.utils.DateUtils;
|
|
import com.fs.common.utils.DateUtils;
|
|
@@ -26,24 +20,31 @@ import com.fs.his.utils.ConfigUtil;
|
|
|
import com.fs.his.vo.FsStoreProductExcelVO;
|
|
import com.fs.his.vo.FsStoreProductExcelVO;
|
|
|
import com.fs.his.vo.FsStoreProductListSVO;
|
|
import com.fs.his.vo.FsStoreProductListSVO;
|
|
|
import com.fs.his.vo.OptionsVO;
|
|
import com.fs.his.vo.OptionsVO;
|
|
|
-import com.fs.hisStore.domain.*;
|
|
|
|
|
-import com.fs.hisStore.mapper.*;
|
|
|
|
|
-import com.fs.statis.dto.ModifyMoreDTO;
|
|
|
|
|
|
|
+import com.fs.hisStore.domain.FsStoreProductAttrScrm;
|
|
|
|
|
+import com.fs.hisStore.domain.FsStoreProductAttrValueScrm;
|
|
|
|
|
+import com.fs.hisStore.domain.FsStoreProductRuleScrm;
|
|
|
|
|
+import com.fs.hisStore.domain.FsStoreProductScrm;
|
|
|
import com.fs.hisStore.dto.ProductArrtDTO;
|
|
import com.fs.hisStore.dto.ProductArrtDTO;
|
|
|
import com.fs.hisStore.dto.ProductAttrCountDto;
|
|
import com.fs.hisStore.dto.ProductAttrCountDto;
|
|
|
|
|
+import com.fs.hisStore.mapper.*;
|
|
|
import com.fs.hisStore.param.FsStoreProductAddEditParam;
|
|
import com.fs.hisStore.param.FsStoreProductAddEditParam;
|
|
|
import com.fs.hisStore.param.FsStoreProductQueryParam;
|
|
import com.fs.hisStore.param.FsStoreProductQueryParam;
|
|
|
import com.fs.hisStore.service.IFsStoreProductAttrValueScrmService;
|
|
import com.fs.hisStore.service.IFsStoreProductAttrValueScrmService;
|
|
|
|
|
+import com.fs.hisStore.service.IFsStoreProductScrmService;
|
|
|
import com.fs.hisStore.vo.*;
|
|
import com.fs.hisStore.vo.*;
|
|
|
|
|
+import com.fs.statis.dto.ModifyMoreDTO;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Qualifier;
|
|
import org.springframework.beans.factory.annotation.Qualifier;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
-import com.fs.hisStore.service.IFsStoreProductScrmService;
|
|
|
|
|
import org.springframework.transaction.annotation.Propagation;
|
|
import org.springframework.transaction.annotation.Propagation;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
|
|
+import java.math.BigDecimal;
|
|
|
|
|
+import java.util.*;
|
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 商品Service业务层处理
|
|
* 商品Service业务层处理
|
|
|
*
|
|
*
|
|
@@ -256,6 +257,7 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
|
|
|
valueMap.put("cost", 0);
|
|
valueMap.put("cost", 0);
|
|
|
valueMap.put("otPrice", 0);
|
|
valueMap.put("otPrice", 0);
|
|
|
valueMap.put("stock", 0);
|
|
valueMap.put("stock", 0);
|
|
|
|
|
+ valueMap.put("purchaseLimit", 0);
|
|
|
valueMap.put("barCode", "");
|
|
valueMap.put("barCode", "");
|
|
|
valueMap.put("groupBarCode", "");
|
|
valueMap.put("groupBarCode", "");
|
|
|
valueMap.put("agentPrice", 0);
|
|
valueMap.put("agentPrice", 0);
|
|
@@ -283,6 +285,7 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
|
|
|
valueMap.put("otPrice", values.get(0).getOtPrice());
|
|
valueMap.put("otPrice", values.get(0).getOtPrice());
|
|
|
valueMap.put("agentPrice", values.get(0).getAgentPrice());
|
|
valueMap.put("agentPrice", values.get(0).getAgentPrice());
|
|
|
valueMap.put("stock", values.get(0).getStock());
|
|
valueMap.put("stock", values.get(0).getStock());
|
|
|
|
|
+ valueMap.put("purchaseLimit", values.get(0).getPurchaseLimit());
|
|
|
valueMap.put("barCode", values.get(0).getBarCode());
|
|
valueMap.put("barCode", values.get(0).getBarCode());
|
|
|
valueMap.put("groupBarCode", values.get(0).getGroupBarCode());
|
|
valueMap.put("groupBarCode", values.get(0).getGroupBarCode());
|
|
|
valueMap.put("weight", values.get(0).getWeight());
|
|
valueMap.put("weight", values.get(0).getWeight());
|