客户主动同步bug修复

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java

@@ -532,6 +532,7 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
              *   2.2 商品编码为空，项目名称不为空，使用商品名称补全
              */
             item.setZnfm("1");
+            item.setTswl("0");
             if (StringUtils.isNotBlank(item.getSpId())) {
                 R r = commodityService.queryCommodityById(item.getSpId(), shList);
                 if (ConfigureConstant.STRING_0000.equals(r.get(OrderManagementConstant.CODE))) {
@@ -603,6 +604,8 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
                             item.setGgxh(commodityCodeEntity.getGgxh());
                         }
 
+                        item.setTswl(commodityCodeEntity.getTswl());
+
                     }
 
                 } else if (StringUtils.isBlank(item.getSpbm())) {

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java

@@ -438,12 +438,12 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
                 .map(DATABO::getDATAINFOS)
                 .map(DATAINFOSBO::getDATAINFO)
                 .map(i -> {
-                    // 转成List<MdmSyncGroupTaxCodeReqBO>
+                    // 转成List<MdmGmfxxtbReqBO>
                     return i.stream().map(j -> {
-                        return JSONObject.parseObject(JSONObject.toJSONString(j), MdmSyncGroupTaxCodeReqBO.class);
+                        return JSONObject.parseObject(JSONObject.toJSONString(j), MdmGmfxxtbReqBO.class);
                     }).collect(Collectors.toList());
                 })
-                .orElse(new ArrayList<MdmSyncGroupTaxCodeReqBO>());
+                .orElse(new ArrayList<MdmGmfxxtbReqBO>());
 
         AjaxResult syncResult = this.syncBuyerMessage(mdmGmfxxtbReqBOS, resp);
         if (syncResult.isSuccess()) {