对象错误修改

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

@@ -111,11 +111,11 @@ public class ItemServiceImpl implements ItemService{
                 GetProductsVo skuProductsVo = new GetProductsVo();
                 //保存货号到三方商品编号字段
                 if(toPosCustomerCode){
-                    skuProductsVo.setCustomerCode(productBean.getProductCode());
-                    skuProductsVo.setProductCode(productBean.getCustomerCode());
+                    skuProductsVo.setCustomerCode(skuProductBean.getProductCode());
+                    skuProductsVo.setProductCode(skuProductBean.getCustomerCode());
                 }else {
-                    skuProductsVo.setCustomerCode(productBean.getCustomerCode());
-                    skuProductsVo.setProductCode(productBean.getProductCode());
+                    skuProductsVo.setCustomerCode(skuProductBean.getCustomerCode());
+                    skuProductsVo.setProductCode(skuProductBean.getProductCode());
                 }
                 //第三方商品规格值id
                 if (CollectionUtils.isNotEmpty(skuProductBean.getSkuSpecValues())) {
@@ -149,11 +149,11 @@ public class ItemServiceImpl implements ItemService{
                 GetProductsVo comboProductsVo = new GetProductsVo();
                 //保存货号到三方商品编号字段
                 if(toPosCustomerCode){
-                    comboProductsVo.setCustomerCode(productBean.getProductCode());
-                    comboProductsVo.setProductCode(productBean.getCustomerCode());
+                    comboProductsVo.setCustomerCode(productComboListDto.getProductCode());
+                    comboProductsVo.setProductCode(productComboListDto.getCustomerCode());
                 }else {
-                    comboProductsVo.setCustomerCode(productBean.getCustomerCode());
-                    comboProductsVo.setProductCode(productBean.getProductCode());
+                    comboProductsVo.setCustomerCode(productComboListDto.getCustomerCode());
+                    comboProductsVo.setProductCode(productComboListDto.getProductCode());
                 }
                 if (productComboListDto.getIsStaple()!=null && stapleFood.contains(productComboListDto.getIsStaple())) {
                     comboProductsVo.setStapleFood(productComboListDto.getIsStaple());
@@ -195,11 +195,11 @@ public class ItemServiceImpl implements ItemService{
 
                     //保存货号到三方商品编号字段
                     if(toPosCustomerCode){
-                        groupProductsVo.setCustomerCode(productBean.getProductCode());
-                        groupProductsVo.setProductCode(productBean.getCustomerCode());
+                        groupProductsVo.setCustomerCode(groupDetailBean.getProductCode());
+                        groupProductsVo.setProductCode(groupDetailBean.getCustomerCode());
                     }else {
-                        groupProductsVo.setCustomerCode(productBean.getCustomerCode());
-                        groupProductsVo.setProductCode(productBean.getProductCode());
+                        groupProductsVo.setCustomerCode(groupDetailBean.getCustomerCode());
+                        groupProductsVo.setProductCode(groupDetailBean.getProductCode());
                     }
                     //第三方商品属性信息
                     groupProductsVo.setProductAttributeGroupList(groupDetailBean.getProductAttributeGroupList());

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

@@ -967,7 +967,6 @@ public class PayServiceImpl {
         UpdateOrderReq updateOrderReq = new UpdateOrderReq();
         updateOrderReq.setOrderCode(orderEditRequest.getOrderId());
         updateOrderReq.setExtInfo(orderEditRequest.getExtInfo());
-        updateOrderReq.setOrderClient(OrderClientType.SAAS.getIndex());
         updateOrderReq.setOrderPayItem(orderEditRequest.getOrderPayItem());
         updateOrderReq.setPayChannel(orderEditRequest.getPayChannel());
         updateOrderReq.setPayChannelName(orderEditRequest.getPayChannelName());