feature:客户信息mdm拉取、物料mdm拉取、物料克隆

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/controller/BuyerController.java

@@ -7,6 +7,7 @@ import com.dxhy.order.baseservice.annotation.SysLog;
 import com.dxhy.order.baseservice.config.BaseServiceConfig;
 import com.dxhy.order.baseservice.module.base.service.ExcelReadService;
 import com.dxhy.order.baseservice.module.buyer.model.BuyerEntity;
+import com.dxhy.order.baseservice.module.buyer.model.BuyerEntityDetail;
 import com.dxhy.order.baseservice.module.buyer.model.BuyerImportExcel;
 import com.dxhy.order.baseservice.module.buyer.model.BuyerImportExcelEnum;
 import com.dxhy.order.baseservice.module.buyer.service.BuyerService;

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerEntity.java

@@ -135,4 +135,6 @@ public class BuyerEntity implements Serializable {
     private Integer bankDefaultIndex;
 
     private String synchronizeOrders;
+
+    private String entId;
 }

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java

@@ -205,7 +205,22 @@ public class BuyerServiceImpl implements BuyerService {
                 if (StringUtils.isBlank(buyerEntity.getBuyerCode())) {
                     buyerEntity.setBuyerCode(baseService.getGenerateShotKey());
                 }
-
+                List<BuyerEntityDetail> buyerEntityDetail = new ArrayList<>();
+                BuyerEntityDetail buyerEntityDetail1 = new BuyerEntityDetail();
+                buyerEntityDetail1.setBuyerManageId(buyerEntity.getId());
+                buyerEntityDetail1.setBankAccount(buyerEntity.getBankNumber());
+                buyerEntityDetail1.setBankName(buyerEntity.getBankOfDeposit());
+                buyerEntityDetail1.setAddress(buyerEntity.getAddress());
+                buyerEntityDetail1.setPhone(buyerEntity.getPhone());
+                buyerEntityDetail1.setCreateTime(new Date());
+                buyerEntityDetail1.setDefaultMark("0");
+                try {
+                    buyerEntityDetail1.setCreateUser(userInfoService.getUser().getUserId().toString());
+                } catch (Exception e) {
+                    buyerEntityDetail1.setCreateUser("");
+                }
+                buyerEntityDetail.add(buyerEntityDetail1);
+                buyerMapper.batchInsertBuyerDetail(buyerEntityDetail);
             }
             if (buyerEntityList.size() < ConfigureConstant.BATCH_INSERT) {
                 buyerMapper.insertBuyerByList(buyerEntityList);

order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml

@@ -134,7 +134,6 @@
                     #{item}
                 </foreach>
             </if>
-            and cc.xhf_nsrsbh != '-1'
             <!-- 商品编码表ID-->
             <if test="map.id != null and map.id != ''">
                 AND cc.id = #{map.id,jdbcType=VARCHAR}

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

@@ -332,7 +332,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
             commodityCodeEntity.setSpjc(taxClassCodeEntity.getSpjc());
             commodityCodeEntity.setYhzcbs(taxClassCodeEntity.getZzstsgl());
             commodityCodeEntity.setHsbz("1");
-            commodityCodeEntity.setSl(taxClassCodeEntity.getZzssl());
+//            commodityCodeEntity.setSl(taxClassCodeEntity.getZzssl());
             commodityCodeEntity.setYhzcbs("0");
             if (StringUtils.isNotBlank(taxClassCodeEntity.getYhzcmc())) {
                 commodityCodeEntity.setYhzcbs("1");
@@ -451,7 +451,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
             return R.error("获取物料信息失败，请检查客户编码是否正确");
         }
         SDEnergyMdmBaseBO baseBO = JSONObject.parseObject(resp, SDEnergyMdmBaseBO.class);
-        if(baseBO == null || baseBO.getESB() == null || "S".equals(baseBO.getESB().getRESULT())){
+        if(baseBO == null || baseBO.getESB() == null|| baseBO.getESB().getDATA()==null){
             return R.error("获取物料信息失败，请检查客户编码是否正确");
         }
         List<MdmSyncGroupTaxCodeReqBO> mdmGmfxxtbReqBOS = (List<MdmSyncGroupTaxCodeReqBO>) Optional.of(baseBO)
@@ -540,7 +540,7 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
             return R.error("获取客户信息失败，请检查客户编码是否正确");
         }
         SDEnergyMdmBaseBO baseBO = JSONObject.parseObject(resp, SDEnergyMdmBaseBO.class);
-        if(baseBO == null || baseBO.getESB() == null || "S".equals(baseBO.getESB().getRESULT())){
+        if(baseBO == null || baseBO.getESB() == null || baseBO.getESB().getDATA() == null){
             return R.error("获取客户信息失败，请检查客户编码是否正确");
         }
         List<MdmGmfxxtbReqBO> mdmGmfxxtbReqBOS = (List<MdmGmfxxtbReqBO>) Optional.of(baseBO)

order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml

@@ -517,7 +517,7 @@
         where xhf_nsrsbh = #{xhfNsrsbh,jdbcType=VARCHAR} and ent_id = #{entId,jdbcType=VARCHAR}
     </delete>
 
-    <insert id="cloneCommodityCode" useGeneratedKeys="true" keyProperty="id">
+    <insert id="cloneCommodityCode">
         insert into commodity_code (
             id,commodity_id, sort_id, xhf_nsrsbh, merchandise_name, encoding, tax_items,
             brief_code,