Merge remote-tracking branch 'origin/release' into release

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

@@ -1,8 +1,10 @@
 package com.dxhy.order.baseservice.module.buyer.controller;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONException;
+import com.dxhy.order.baseservice.module.buyer.protocol.MdmBankListBO;
 import com.dxhy.order.constant.ConfigureConstant;
 import com.dxhy.order.constant.OrderInfoContentEnum;
 import com.dxhy.order.constant.OrderInfoEnum;
@@ -111,20 +113,43 @@ public class BuyerController {
             return R.error(OrderInfoContentEnum.TAXCODE_ISNULL);
         }
 
-        //购货方企业类型 默认值01 企业
+        // 购货方企业类型 默认值01 企业
         buyerEntity.setGhfQylx(OrderInfoEnum.GHF_QYLX_01.getKey());
 
-        //购方名称 带中文括号的转换成英文括号
+        // 购方名称 带中文括号的转换成英文括号
         buyerEntity.setPurchaseName(StringUtil.replaceStr(buyerEntity.getPurchaseName(), true));
 
-        //获取当前登录人id
+        // 获取当前登录人id
         Long userId = userInfoService.getUser().getUserId();
         String id = buyerEntity.getId();
+
+        // 处理MDM默认银行账户等信息
+        List<MdmBankListBO> bankListBOS = new ArrayList<>();
+        if (CollectionUtil.isNotEmpty(buyerEntity.getBanks())) {
+            buyerEntity.getBanks().forEach(i -> {
+                MdmBankListBO temp = new MdmBankListBO();
+                temp.setAddress(i.getAddress());
+                temp.setPhone(i.getPhone());
+                temp.setBankNumber(i.getBankNumber());
+                temp.setBankOfDeposit(i.getBankOfDeposit());
+                bankListBOS.add(temp);
+            });
+
+            if (buyerEntity.getBankDefaultIndex() != null) {
+                buyerEntity.getBanks().get(buyerEntity.getBankDefaultIndex());
+                Integer index = buyerEntity.getBankDefaultIndex();
+                buyerEntity.setAddress(buyerEntity.getBanks().get(index).getAddress());
+                buyerEntity.setPhone(buyerEntity.getBanks().get(index).getPhone());
+                buyerEntity.setBankNumber(buyerEntity.getBanks().get(index).getBankNumber());
+                buyerEntity.setBankOfDeposit(buyerEntity.getBanks().get(index).getBankOfDeposit());
+            }
+        }
+
         if (StringUtils.isNotBlank(id)) {
-            //修改
+            // 修改
             buyerEntity.setModifyUserId(userId.toString());
         } else {
-            //添加
+            // 添加
             buyerEntity.setModifyUserId(userId.toString());
             buyerEntity.setCreateUserId(userId.toString());
         }
@@ -137,7 +162,7 @@ public class BuyerController {
     @PostMapping("/saveBuyerInfoList")
     public R saveBuyerInfoList(@RequestBody List<BuyerEntity> buyerList) {
 
-        //业务逻辑放到provider
+        // 业务逻辑放到provider
         return buyerService.saveBuyerInfoList(buyerList,
                 userInfoService.getUser().getUserId() == null ? "" : String.valueOf(userInfoService.getUser().getUserId()));
     }
@@ -178,12 +203,12 @@ public class BuyerController {
 
         R r = new R();
         try {
-            //从excel中读取数据
+            // 从excel中读取数据
             long t1 = System.currentTimeMillis();
             log.debug("{}excel读取开始,当前时间:{}", LOGGER_MSG, t1);
             Map<String, String> headToProperty = new HashMap<>(10);
 
-            //转换枚举类
+            // 转换枚举类
             for (BuyerImportExcelEnum importExcelEnum : BuyerImportExcelEnum.values()) {
                 headToProperty.put(importExcelEnum.getKey(), importExcelEnum.getValue());
             }
@@ -224,6 +249,7 @@ public class BuyerController {
                 }
                 buyerEntity.setStatus("1");
                 //购方名称 带中文括号的转换成英文括号
+                // 购方名称 带中文括号的转换成英文括号
                 buyerEntity.setPurchaseName(StringUtil.replaceStr(buyerEntity.getPurchaseName(), true));
                 buyerEntityList.add(buyerEntity);
             }

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

@@ -1,10 +1,12 @@
 package com.dxhy.order.baseservice.module.buyer.model;
 
+import com.dxhy.order.baseservice.module.buyer.protocol.BuyerEntityBankBO;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 购方信息实体类
@@ -123,4 +125,10 @@ public class BuyerEntity implements Serializable {
      * 客户状态(0:冻结;1:非冻结)
      */
     private String status;
+
+    // 银行账户
+    private List<BuyerEntityBankBO> banks;
+
+    // 默认银行账户的索引7
+    private Integer bankDefaultIndex;
 }

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/protocol/BuyerEntityBankBO.java

@@ -0,0 +1,23 @@
+package com.dxhy.order.baseservice.module.buyer.protocol;
+
+import lombok.Data;
+
+/**
+ * @Description 购方银行账户
+ * @Author 巩权林
+ * @Date 2023/4/11 21:27
+ **/
+@Data
+public class BuyerEntityBankBO {
+    // 购方地址
+    private String address;
+
+    // 购方电话
+    private String phone;
+
+    // 开户行
+    private String bankOfDeposit;
+
+    // 开户账号
+    private String bankNumber;
+}

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/protocol/MdmBankListBO.java

@@ -1,4 +1,4 @@
-package com.dxhy.order.consumer.openapi.protocol.v6.sdenergy;
+package com.dxhy.order.baseservice.module.buyer.protocol;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/protocol/MdmGmfxxtbMulticodeValuelistBO.java

@@ -1,4 +1,4 @@
-package com.dxhy.order.consumer.openapi.protocol.v6.sdenergy;
+package com.dxhy.order.baseservice.module.buyer.protocol;
 
 import lombok.ToString;
 

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityCodeModifyLogServiceImpl.java

@@ -92,7 +92,9 @@ public class CommodityCodeModifyLogServiceImpl implements CommodityCodeModifyLog
                 throw new RuntimeException(e);
             }
         }
-
+        if(modifyLogs.isEmpty()){
+            return -1;
+        }
         // 批量插入保存
         return commodityCodeModifyLogDao.batchInsert(modifyLogs);
     }

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java

@@ -118,9 +118,11 @@ public class CommodityServiceImpl implements CommodityService {
             }
             // 记录修改记录
             Long userId = userInfoService.getUser().getUserId();
-            commodityCodeModifyLogService.saveCommodityCodeDifferenceBetween2(commodityCodeEntity, codeEntity, userId);
+            int i = commodityCodeModifyLogService.saveCommodityCodeDifferenceBetween2(commodityCodeEntity, codeEntity, userId);
+            if(i != -1){
+                i = commodityMapper.updateCommodity(codeEntity, shList);
+            }
 
-            int i = commodityMapper.updateCommodity(codeEntity, shList);
             flag = i >= 0;
         } else {
 
@@ -652,8 +654,8 @@ public class CommodityServiceImpl implements CommodityService {
     /**
      * 数据转换
      *
-     * @param orderItemInfo
-     * @param xhfMc
+     * @param
+     * @param
      * @param taxClassCodeEntity
      * @return
      */

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

@@ -69,8 +69,8 @@
         values (
                 <foreach collection="list" item="item" index="index" separator=",">
                     (#{item.id}, #{item.commodityCodeId}, #{item.key}, #{item.originValue}, #{item.newValue}, #{item.modifyUserId}, #{item.modifyTime})
-               )
                 </foreach>
+               )
     </insert>
 
     <!--通过主键修改数据-->

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestApiV6.java

@@ -39,7 +39,7 @@ import com.dxhy.order.consumer.openapi.protocol.v5.order.DdfpcxReqV5;
 import com.dxhy.order.consumer.openapi.protocol.v5.order.DdfpcxRspV5;
 import com.dxhy.order.consumer.openapi.protocol.v5.order.DdpcxxRspV5;
 import com.dxhy.order.consumer.openapi.protocol.v6.hzqrd.QdCommonRspV6;
-import com.dxhy.order.consumer.openapi.protocol.v6.sdenergy.MdmGmfxxtbMulticodeValuelistBO;
+import com.dxhy.order.baseservice.module.buyer.protocol.MdmGmfxxtbMulticodeValuelistBO;
 import com.dxhy.order.consumer.openapi.protocol.v6.sdenergy.MdmGmfxxtbReqBO;
 import com.dxhy.order.consumer.openapi.service.*;
 import com.dxhy.order.consumer.utils.BeanTransitionUtils;

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v6/sdenergy/MdmGmfxxtbMulticodeBO.java

@@ -1,6 +1,7 @@
 package com.dxhy.order.consumer.openapi.protocol.v6.sdenergy;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.dxhy.order.baseservice.module.buyer.protocol.MdmGmfxxtbMulticodeValuelistBO;
 import lombok.ToString;
 
 import java.util.List;

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

@@ -6,6 +6,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.dxhy.order.baseservice.module.base.service.BaseService;
 import com.dxhy.order.baseservice.module.buyer.dao.BuyerMapper;
 import com.dxhy.order.baseservice.module.buyer.model.BuyerEntity;
+import com.dxhy.order.baseservice.module.buyer.protocol.MdmBankListBO;
+import com.dxhy.order.baseservice.module.buyer.protocol.MdmGmfxxtbMulticodeValuelistBO;
 import com.dxhy.order.baseservice.module.commodity.dao.CommodityMapper;
 import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity;
 import com.dxhy.order.baseservice.module.taxclass.dao.GroupTaxClassCodeMapper;
@@ -245,14 +247,6 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
             commodityCodeEntity.setId(DistributedKeyMaker.generateShotKey());
             commodityCodeEntity.setSortId((long) i);
             commodityCodeEntity.setXmmc(reqBO.getDESC1()); // 商品名称
-            commodityCodeEntity.setZxbm(reqBO.getCODE()); // 编码
-            commodityCodeEntity.setXmdw(reqBO.getDESC5());
-            commodityCodeEntity.setCreateTime(new Date());
-            commodityCodeEntity.setBz(reqBO.getDESCSHORT());
-            commodityCodeEntity.setUUID(reqBO.getUUID());
-            commodityCodeEntity.setWlflbm(reqBO.getCATEGORYCODE());
-            commodityCodeEntity.setWlflmc(reqBO.getCATEGORYNAME());
-            commodityCodeEntity.setDataSource("4");
 
             // 维护税编和商品编码
             if (codeEntityForMatch != null && StringUtils.isNotBlank(codeEntityForMatch.getSsflMc())) {
@@ -267,6 +261,14 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
 
             // 进行物料匹配
             matchCommodityCode(commodityCodeEntity);
+            commodityCodeEntity.setZxbm(reqBO.getCODE()); // 编码
+            commodityCodeEntity.setXmdw(reqBO.getDESC5());
+            commodityCodeEntity.setCreateTime(new Date());
+            commodityCodeEntity.setBz(reqBO.getDESCSHORT());
+            commodityCodeEntity.setUUID(reqBO.getUUID());
+            commodityCodeEntity.setWlflbm(reqBO.getCATEGORYCODE());
+            commodityCodeEntity.setWlflmc(reqBO.getCATEGORYNAME());
+            commodityCodeEntity.setDataSource("4");
 
             if (commodityMapper.insertCommodityOnDuplicateKey(commodityCodeEntity) > 0) {
                 commodityCodeEntity.setSuccess(true);