Merge branch 'feature/update_bankInfo' into release

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

@@ -3,7 +3,6 @@ package com.dxhy.order.consumer.openapi.service.impl;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
-import com.dxhy.order.baseservice.module.base.dao.DictionaryMapper;
 import com.dxhy.order.baseservice.module.base.model.DictionaryEntity;
 import com.dxhy.order.baseservice.module.base.service.BaseService;
 import com.dxhy.order.baseservice.module.base.service.DictionaryService;
@@ -20,7 +19,6 @@ import com.dxhy.order.baseservice.module.taxclass.model.TaxClassCodeEntity;
 import com.dxhy.order.baseservice.module.thirdservice.user.dto.AddUserRequestDto;
 import com.dxhy.order.baseservice.module.thirdservice.user.service.UserInfoService;
 import com.dxhy.order.baseservice.utils.BaseServiceBeanTransitionUtils;
-import com.dxhy.order.constant.ConfigureConstant;
 import com.dxhy.order.consumer.dao.GroupCommodityCodeMapper;
 import com.dxhy.order.consumer.modules.taxcodematch.dao.SdenergyTaxCodeMatchDao;
 import com.dxhy.order.consumer.modules.taxcodematch.entity.SdenergyTaxCodeMatch;
@@ -28,9 +26,7 @@ import com.dxhy.order.consumer.openapi.protocol.AjaxResult;
 import com.dxhy.order.consumer.openapi.protocol.v6.sdenergy.*;
 import com.dxhy.order.model.R;
 import com.dxhy.order.utils.DistributedKeyMaker;
-import com.dxhy.order.utils.GbkUtil;
 import com.dxhy.order.utils.JsonUtils;
-import com.dxhy.order.utils.StringUtil;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -42,8 +38,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.io.IOException;
-import java.text.DecimalFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -156,12 +150,10 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract {
                     }
                     buyerManageIds.add(buyerEntity.getId());
                 }
-//                if(detailStatus){//mdm下发的客户信息不更新明细
-//                    buyerMapper.batchDeleteBuyerDetail(buyerManageIds);
-//                    if(buyerEntityDetail.size()>0){
-//                        buyerMapper.batchInsertBuyerDetail(buyerEntityDetail);
-//                    }
-//                }
+                buyerMapper.batchDeleteBuyerDetail(buyerManageIds);
+                if(buyerEntityDetail.size()>0){
+                    buyerMapper.batchInsertBuyerDetail(buyerEntityDetail);
+                }
                 if (buyerMapper.batchUpdateBuyer(entity, null,buyerManageIds) > 0) {
                     entity.setSuccess(true);
                 } else {