根据商品配置，保存货号到三方商品编号字段

order-application-service/src/main/java/cn/freemud/service/impl/ItemServiceImpl.java

@@ -60,12 +60,18 @@ public class ItemServiceImpl implements ItemService{
         AppLogUtil.infoLog("storeItemClient_listProductInfos", gson.toJson(getProductInfoDto), gson.toJson(productInfosDto));
         if (ResponseCodeConstant.RESPONSE_SUCCESS.equals(productInfosDto.getErrcode()) && productInfosDto.getData() != null
                 && CollectionUtils.isNotEmpty(productInfosDto.getData().getProducts())) {
-            boolean b = productInfosDto.getData().getToPosProductIdType() != null &&  productInfosDto.getData().getToPosProductIdType() == 1 ? true : false;
+            //1传货号给当三方商品编号给pos
+            boolean toPosCustomerCode = productInfosDto.getData().getToPosProductIdType() != null && productInfosDto.getData().getToPosProductIdType() == 1;
             productInfosDto.getData().getProducts().forEach(productBean -> {
                 GetProductsVo spuProductsVo = new GetProductsVo();
-
-                spuProductsVo.setCustomerCode(productBean.getCustomerCode());
-                spuProductsVo.setProductCode(productBean.getProductCode());
+                //保存货号到三方商品编号字段
+                if(toPosCustomerCode){
+                    spuProductsVo.setCustomerCode(productBean.getProductCode());
+                    spuProductsVo.setProductCode(productBean.getCustomerCode());
+                }else {
+                    spuProductsVo.setCustomerCode(productBean.getCustomerCode());
+                    spuProductsVo.setProductCode(productBean.getProductCode());
+                }
                 List<AttributeValue> attributeValues  = new ArrayList<>();
                 //第三方商品属性信息
                 if (CollectionUtils.isNotEmpty(productBean.getProductAttributeGroupList())) {
@@ -86,9 +92,9 @@ public class ItemServiceImpl implements ItemService{
                 resultMap.put(productBean.getPid(), spuProductsVo);
 
                 //多规格商品
-                saveSkuProductsThirdInfo(productBean,productBean.getProductAttributeGroupList(),resultMap);
+                saveSkuProductsThirdInfo(productBean,productBean.getProductAttributeGroupList(),resultMap,toPosCustomerCode);
                 //套餐商品内子商品
-                saveComboProductsThirdInfo(productBean,resultMap);
+                saveComboProductsThirdInfo(productBean,resultMap,toPosCustomerCode);
             });
         }
         return resultMap;
@@ -98,12 +104,19 @@ public class ItemServiceImpl implements ItemService{
     /**
      * 多规格商品保存第三方信息
      */
-    private void saveSkuProductsThirdInfo(ProductInfo productBean,List<ProductAttributeGroup> productAttributeGroupList,Map<String, GetProductsVo> resultMap){
+    private void saveSkuProductsThirdInfo(ProductInfo productBean,List<ProductAttributeGroup> productAttributeGroupList,
+                                          Map<String, GetProductsVo> resultMap, boolean toPosCustomerCode){
         if (CollectionUtils.isNotEmpty(productBean.getSkuList())) {
             for (SkuProduct skuProductBean : productBean.getSkuList()) {
                 GetProductsVo skuProductsVo = new GetProductsVo();
-                skuProductsVo.setCustomerCode(skuProductBean.getCustomerCode());
-                skuProductsVo.setProductCode(skuProductBean.getProductCode());
+                //保存货号到三方商品编号字段
+                if(toPosCustomerCode){
+                    skuProductsVo.setCustomerCode(productBean.getProductCode());
+                    skuProductsVo.setProductCode(productBean.getCustomerCode());
+                }else {
+                    skuProductsVo.setCustomerCode(productBean.getCustomerCode());
+                    skuProductsVo.setProductCode(productBean.getProductCode());
+                }
                 //第三方商品规格值id
                 if (CollectionUtils.isNotEmpty(skuProductBean.getSkuSpecValues())) {
                     List<String> list = new ArrayList<>();
@@ -127,15 +140,21 @@ public class ItemServiceImpl implements ItemService{
     /**
      * 套餐商品保存第三方信息
      */
-    private void saveComboProductsThirdInfo(ProductInfo productBean,Map<String, GetProductsVo> resultMap){
+    private void saveComboProductsThirdInfo(ProductInfo productBean,Map<String, GetProductsVo> resultMap,boolean toPosCustomerCode){
         GetProductsVo spuProductsVo = resultMap.get(productBean.getPid());
         List<Integer> stapleFood = Arrays.asList(0,1);
         //套餐固定商品
         if (CollectionUtils.isNotEmpty(productBean.getProductComboList())) {
             for (ProductComboListDto productComboListDto : productBean.getProductComboList()) {
                 GetProductsVo comboProductsVo = new GetProductsVo();
-                comboProductsVo.setCustomerCode(productComboListDto.getCustomerCode());
-                comboProductsVo.setProductCode(productComboListDto.getProductCode());
+                //保存货号到三方商品编号字段
+                if(toPosCustomerCode){
+                    comboProductsVo.setCustomerCode(productBean.getProductCode());
+                    comboProductsVo.setProductCode(productBean.getCustomerCode());
+                }else {
+                    comboProductsVo.setCustomerCode(productBean.getCustomerCode());
+                    comboProductsVo.setProductCode(productBean.getProductCode());
+                }
                 if (productComboListDto.getIsStaple()!=null && stapleFood.contains(productComboListDto.getIsStaple())) {
                     comboProductsVo.setStapleFood(productComboListDto.getIsStaple());
                 } else {
@@ -173,8 +192,15 @@ public class ItemServiceImpl implements ItemService{
                 for(GroupDetail groupDetailBean : group.getGroupDetail()){
                     //多规格获取sku信息
                     GetProductsVo groupProductsVo = new GetProductsVo();
-                    groupProductsVo.setCustomerCode(groupDetailBean.getCustomerCode());
-                    groupProductsVo.setProductCode(groupDetailBean.getProductCode());
+
+                    //保存货号到三方商品编号字段
+                    if(toPosCustomerCode){
+                        groupProductsVo.setCustomerCode(productBean.getProductCode());
+                        groupProductsVo.setProductCode(productBean.getCustomerCode());
+                    }else {
+                        groupProductsVo.setCustomerCode(productBean.getCustomerCode());
+                        groupProductsVo.setProductCode(productBean.getProductCode());
+                    }
                     //第三方商品属性信息
                     groupProductsVo.setProductAttributeGroupList(groupDetailBean.getProductAttributeGroupList());
 

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -2433,7 +2433,6 @@ public class OrderServiceImpl implements Orderservice {
             if (CollectionUtils.isNotEmpty(productDto.getComboProduct())) {
                 for (CreateOrderProductRequest comboProduct : productDto.getComboProduct()) {
                     String comboSkuId = comboProduct.getSpecification();
-                    System.out.println(comboSkuId);
                     if (products.get(comboSkuId) != null) {
                         comboProduct.setCustomerCode(products.get(comboSkuId).getCustomerCode());
                         comboProduct.setProductCode(products.get(comboSkuId).getProductCode());