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

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

@@ -7,7 +7,6 @@ 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;
@@ -117,7 +116,10 @@ public class BuyerController {
 
         // 购方名称 带中文括号的转换成英文括号
         buyerEntity.setPurchaseName(StringUtil.replaceStr(buyerEntity.getPurchaseName(), true));
-
+        String buyerCode = buyerEntity.getBuyerCode();
+        if(StringUtils.isBlank(buyerCode)){
+            return R.error("客户编码不能为空");
+        }
         // 获取当前登录人id
         Long userId = userInfoService.getUser().getUserId();
         String id = buyerEntity.getId();

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

@@ -346,6 +346,19 @@ public class BuyerServiceImpl implements BuyerService {
         shList.add(buyerEntity.getXhfNsrsbh());
         R r = new R();
 
+        BuyerEntity queryBuyerEntity = new BuyerEntity();
+        queryBuyerEntity.setBuyerCode(buyerEntity.getId());
+        BuyerEntity entity = buyerMapper.selectBuyerByCodeOrNameAndNsrsbh("", buyerEntity.getBuyerCode(), null);
+        if(entity != null){
+            if (StringUtils.isNotBlank(buyerEntity.getId())) {
+                if(!buyerEntity.getId().equals(entity.getId())){
+                    return r.put("message", "客户编码已存在").put(OrderManagementConstant.CODE, ConfigureConstant.STRING_9999);
+                }
+            }else {
+                return r.put("message", "客户编码已存在").put(OrderManagementConstant.CODE, ConfigureConstant.STRING_9999);
+            }
+        }
+
 //        if (ConfigureConstant.STRING_1.equals(buyerEntity.getIsEdit()) && StringUtils.isBlank(buyerEntity.getId())) {
         BuyerEntity existBuyer = isExistBuyer(buyerEntity);
         if (ObjectUtil.isNotNull(existBuyer)) {
@@ -525,7 +538,6 @@ public class BuyerServiceImpl implements BuyerService {
      * @return
      */
     private BuyerEntity isExistBuyer(BuyerEntity buyerEntity) {
-
         BuyerEntity queryBuyerEntity = new BuyerEntity();
         if (StringUtils.isNotBlank(buyerEntity.getId())) {
             queryBuyerEntity.setId(buyerEntity.getId());

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

@@ -906,9 +906,6 @@
         FROM
         buyer_manage_info
         <where>
-            <if test="shList != null and shList.size() == 0">
-                and xhf_nsrsbh = ''
-            </if>
             <if test="shList != null and shList.size() == 1">
                 and xhf_nsrsbh =
                 <foreach collection="shList" index="index" item="item">

order-management-consumer/src/main/java/com/dxhy/order/consumer/handle/YpyjTask.java

@@ -1,17 +1,17 @@
-package com.dxhy.order.consumer.handle;//package com.dxhy.order.consumer.handle;
+//package com.dxhy.order.consumer.handle;
 //
 //import cn.hutool.core.util.ObjectUtil;
 //import cn.hutool.core.util.RandomUtil;
+//import com.dxhy.order.baseservice.config.BaseServiceConfig;
 //import com.dxhy.order.baseservice.module.base.model.InvoiceWarningInfo;
 //import com.dxhy.order.baseservice.module.base.service.YpWarningService;
 //import com.dxhy.order.baseservice.module.thirdservice.itaxmsg.service.ItaxMsgService;
 //import com.dxhy.order.baseservice.module.thirdservice.simsback.service.SimsBackService;
+//import com.dxhy.order.baseservice.utils.HttpInvoiceRequestUtil;
 //import com.dxhy.order.constant.ConfigureConstant;
 //import com.dxhy.order.constant.OrderInfoEnum;
 //import com.dxhy.order.constant.RedisConstant;
-//import com.dxhy.order.invoice.config.InvoiceConfig;
 //import com.dxhy.order.invoice.module.invoice.service.EmailService;
-//import com.dxhy.order.invoice.utils.HttpInvoiceRequestUtil;
 //import com.dxhy.order.model.sk.sld.SldKcByFjhResponseExtend;
 //import com.dxhy.order.model.sk.sld.SldKcRequest;
 //import com.dxhy.order.model.sk.sld.SldKcmxByFjh;
@@ -36,7 +36,6 @@ package com.dxhy.order.consumer.handle;//package com.dxhy.order.consumer.handle;
 //import java.util.stream.Collectors;
 //
 ///**
-// * todo 转为基础服务提供服务
 // * @Description 余票预警定时任务
 // * @Author xieyuanqiang
 // * @Date 11:09 2018-09-19
@@ -56,7 +55,7 @@ package com.dxhy.order.consumer.handle;//package com.dxhy.order.consumer.handle;
 //    @Resource
 //    private SimsBackService simsBackService;
 //    @Resource
-//    private InvoiceConfig invoiceConfig;
+//    private BaseServiceConfig baseServiceConfig;
 //
 //    @Override
 //    public ReturnT<String> execute(String s) {
@@ -109,9 +108,9 @@ package com.dxhy.order.consumer.handle;//package com.dxhy.order.consumer.handle;
 //                            kccxRequest.setFjh(request.split(ConfigureConstant.STRING_UNDERLINE)[1]);
 //                        }
 //
-//                        String kcxxUrl = invoiceConfig.configQuerykcxxByFjh();
+//                        String kcxxUrl = baseServiceConfig.configQuerykcxxByFjh();
 //                        if (CommonUtils.judgeNewInterface(terminalCode)) {
-//                            kcxxUrl = invoiceConfig.configQueryTaxpayerStockInfo();
+//                            kcxxUrl = baseServiceConfig.configQueryTaxpayerStockInfo();
 //                        }
 //                        SldKcByFjhResponseExtend sldKcByFjhResponseExtend = HttpInvoiceRequestUtil.queryKcxxByFjh(kcxxUrl, kccxRequest, terminalCode);
 //                        sldKcByFjhResponseExtendMap.put(request, sldKcByFjhResponseExtend);