feature:客户信息同步接口开发、物料克隆bug修复、集团物料获取最新数据

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

@@ -422,9 +422,11 @@ public class BuyerServiceImpl implements BuyerService {
             buyerEntity.setId(existBuyer.getId());
         }
         // 处理MDM默认银行账户等信息
+        //判断是否存在默认银行信息
+        Boolean isDefaultMark = true;
         String buyerId = baseService.getGenerateShotKey();
         if (CollectionUtil.isNotEmpty(buyerEntity.getBuyerEntityDetail())) {
-            buyerEntity.getBuyerEntityDetail().forEach(t -> {
+            for (BuyerEntityDetail t : buyerEntity.getBuyerEntityDetail()) {
                 if(ConfigureConstant.STRING_1.equals(buyerEntity.getIsEdit())){
                     t.setUpdateUser("");
                     t.setUpdateTime(new Date());
@@ -439,8 +441,9 @@ public class BuyerServiceImpl implements BuyerService {
                     buyerEntity.setPhone(t.getPhone());
                     buyerEntity.setBankNumber(t.getBankAccount());
                     buyerEntity.setBankOfDeposit(t.getBankName());
+                    isDefaultMark = false;
                 }
-            });
+            }
         }
         buyerMapper.deleteBuyerDetail(buyerEntity.getId());
         if(buyerEntity.getBuyerEntityDetail() != null && buyerEntity.getBuyerEntityDetail().size()>0){
@@ -449,9 +452,16 @@ public class BuyerServiceImpl implements BuyerService {
         if(isAdd && existBuyer != null){
             return r.put("message", "客户编码已存在").put(OrderManagementConstant.CODE, ConfigureConstant.STRING_9999);
         }
+
         if (existBuyer != null) {//StringUtils.isNotBlank(buyerEntity.getId())
 
             buyerEntity.setModifyTime(new Date());
+            if(isDefaultMark){
+                buyerEntity.setAddress("");
+                buyerEntity.setPhone("");
+                buyerEntity.setBankNumber("");
+                buyerEntity.setBankOfDeposit("");
+            }
             //更新明细表，最好的办法是先删除后新增
             int i = buyerMapper.updateBuyer(buyerEntity, shList);
 

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java

@@ -619,7 +619,7 @@ public class CommodityController {
     public void exportCommodityExcel(@RequestBody Map<String, Object> map, HttpServletResponse response) {
         log.info("导出商品信息入参： {}", map);
         String xhfNsrsbh = (String) map.get("xhfNsrsbh");
-        String entId = (String) map.get("entId"); // 数据权限id，对应的大B下的企业id
+        String entId = (String) map.get("entList"); // 数据权限id，对应的大B下的企业id
         if (StringUtils.isBlank(xhfNsrsbh)) {
             log.error("{},请求税号为空!", LOGGER_MSG);
         }

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

@@ -115,7 +115,7 @@ public class CommodityCodeModifyLogServiceImpl implements CommodityCodeModifyLog
                         originValue = "0".equals(originValue)?"否":"是";
                     }
                     if(StringUtils.isNotBlank((String)newValue)){
-                        newValue = "0".equals(originValue)?"否":"是";
+                        newValue = "0".equals(newValue)?"否":"是";
                     }
                 }
                 if("yhzcbs".equals(fieldName)){

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/taxcodematch/controller/SdenergyTaxCodeMatchController.java

@@ -31,6 +31,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 物料分类编码表控制层
@@ -154,6 +155,11 @@ public class SdenergyTaxCodeMatchController {
         }
         List<Map<String,String>> errorMsgList = Lists.newArrayList();
         int resultIndex = 2;
+        Map<String, List<SdenergyTaxCodeMatch>> collect = uploadList.stream().collect(Collectors.groupingBy(t -> t.getSsflbm()));
+        List<String> collect1 = collect.keySet().stream().filter(t -> collect.get(t).size() > 1).collect(Collectors.toList());
+        if(!collect1.isEmpty()){
+            return R.error("导入物料分类编码异常，物料分类编码存在重复项，请检查");
+        }
         for (SdenergyTaxCodeMatch taxCodeMatch : uploadList) {
             resultIndex++;
             String wlflbm = taxCodeMatch.getWlflbm();

order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/dao/OrderInfoMapper.java

@@ -46,7 +46,7 @@ public interface OrderInfoMapper {
      * @param shList
      * @return
      */
-    int updateOrderInfoByOrderId(@Param("orderInfo") OrderInfo orderInfo, @Param("ent") List<String> shList);
+    int updateOrderInfoByOrderId(@Param("orderInfo") OrderInfo orderInfo, @Param("shList") List<String> shList);
 
     /**
      * 根据销方税号