fix:推送代服 订单明细

fs-service/src/main/java/com/fs/erp/service/impl/DfOrderServiceImpl.java

@@ -37,15 +37,13 @@ import com.fs.his.service.IFsIntegralOrderService;
 import com.fs.his.service.IFsStoreOrderLogsService;
 import com.fs.his.service.IFsStoreOrderService;
 import com.fs.his.utils.ConfigUtil;
-import com.fs.hisStore.domain.FsExpressScrm;
-import com.fs.hisStore.domain.FsStoreOrderItemScrm;
-import com.fs.hisStore.domain.FsStoreOrderScrm;
-import com.fs.hisStore.domain.FsStoreProductScrm;
+import com.fs.hisStore.domain.*;
 import com.fs.hisStore.enums.OrderInfoEnum;
 import com.fs.hisStore.enums.OrderLogEnum;
 import com.fs.hisStore.enums.ShipperCodeEnum;
 import com.fs.hisStore.mapper.FsStoreOrderItemScrmMapper;
 import com.fs.hisStore.mapper.FsStoreOrderScrmMapper;
+import com.fs.hisStore.mapper.FsStoreProductAttrValueScrmMapper;
 import com.fs.hisStore.mapper.FsStoreProductScrmMapper;
 import com.fs.hisStore.param.FsStoreAfterSalesParam;
 import com.fs.hisStore.service.IFsExpressScrmService;
@@ -167,6 +165,9 @@ public class DfOrderServiceImpl implements IErpOrderService {
     @Autowired
     private LiveOrderItemMapper liveOrderItemMapper;
 
+    @Autowired
+    private FsStoreProductAttrValueScrmMapper fsStoreProductAttrValueMapper;
+
     @Override
     public ErpOrderResponse addOrder(ErpOrder order) {
         if (!Objects.isNull(order.getIsIntegralOrder()) && order.getIsIntegralOrder())
@@ -1451,8 +1452,21 @@ public class DfOrderServiceImpl implements IErpOrderService {
                 Asserts.check(ObjectUtils.isNotNull(product), "该产品不存在! 产品id: {} ", item.getProductId());
                 skuVo.setProductName(product.getProductName()); //商品名称
                 com.alibaba.fastjson.JSONObject jsonObject = JSON.parseObject(item.getJsonInfo());
-                skuVo.setSkuCode(jsonObject.getString("sku")); //sku编码
+                String skuCode = jsonObject.getString("sku"); //sku编码
                 String barCode = jsonObject.getString("barCode");
+                if (StringUtils.isBlank(skuCode) || StringUtils.isBlank(skuCode)) {
+                    //查询商品编号
+                    FsStoreProductAttrValueScrm attrValueMap=new FsStoreProductAttrValueScrm();
+                    attrValueMap.setProductId(item.getProductId());
+                    List<FsStoreProductAttrValueScrm> values = fsStoreProductAttrValueMapper.selectFsStoreProductAttrValueList(attrValueMap);
+                    if (values != null) {
+                        barCode = StringUtils.isBlank(barCode)?values.get(0).getBarCode().trim():barCode;
+                        skuCode = StringUtils.isBlank(skuCode)?values.get(0).getSku().trim():skuCode;
+                    }
+                }
+
+//                skuVo.setSkuCode(jsonObject.getString("sku")); //sku编码
+                skuVo.setSkuCode(skuCode); //sku编码
                 if (StringUtils.isNotBlank(barCode)) {
                     skuVo.setProductCode(barCode); //商品编号
                 } else {