货代公司问题处理，添加客户添加联系人接口，到货质检编号生成错误问题处理

hx-admin/src/main/resources/application-test.yml

@@ -69,6 +69,10 @@ spring:
                     url: jdbc:mysql://127.0.0.1:17330/bytesailing_dingding?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
+                ehsd:
+                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_ehsd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: fjhx2012mysql
+                    password: 3PN-Mzn#vnP&q6d
 
     # redis 配置
     redis:

hx-customer/src/main/java/com/fjhx/customer/service/customer/impl/CustomerUserServiceImpl.java

@@ -1,9 +1,11 @@
 package com.fjhx.customer.service.customer.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.fjhx.customer.entity.customer.po.CustomerUser;
 import com.fjhx.customer.mapper.customer.CustomerUserMapper;
 import com.fjhx.customer.service.customer.CustomerUserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.obs.services.internal.ServiceException;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.customer.entity.customer.vo.CustomerUserVo;
@@ -50,6 +52,13 @@ public class CustomerUserServiceImpl extends ServiceImpl<CustomerUserMapper, Cus
 
     @Override
     public void add(CustomerUserDto customerUserDto) {
+        if(ObjectUtil.isEmpty(customerUserDto.getCustomerId())){
+            throw new ServiceException("客户id不能为空");
+        }
+        List<CustomerUser> list = this.list(q -> q.eq(CustomerUser::getCustomerId, customerUserDto.getCustomerId()).eq(CustomerUser::getEmail, customerUserDto.getEmail()));
+        if(ObjectUtil.isNotEmpty(list)){
+            throw new ServiceException("邮箱不能重复");
+        }
         this.save(customerUserDto);
     }
 

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/quality/impl/QualityInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fjhx.victoriatourist.service.quality.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
@@ -17,7 +18,6 @@ import com.fjhx.victoriatourist.entity.quality.vo.QualityInfoVo;
 import com.fjhx.victoriatourist.mapper.quality.QualityInfoMapper;
 import com.fjhx.victoriatourist.service.quality.QualityDetailsService;
 import com.fjhx.victoriatourist.service.quality.QualityInfoService;
-import com.fjhx.victoriatourist.utils.CodeEnum;
 import com.fjhx.wms.entity.arrival.po.ArrivalStockRecords;
 import com.fjhx.wms.entity.arrival.po.ArrivalStockRecordsDetails;
 import com.fjhx.wms.entity.stock.emums.JournalType;
@@ -125,7 +125,17 @@ public class QualityInfoServiceImpl extends ServiceImpl<QualityInfoMapper, Quali
         arrivalStockRecords.setQualityStatus(2);//质检完成
 
         //根据到货编号生成质检编号
-        qualityInfoDto.setCode(arrivalStockRecords.getArrivalCode() + CodeEnum.QUALITY.getCode());
+        Integer codeNum = 0;
+        String itemPrefix = arrivalStockRecords.getArrivalCode();
+        QualityInfo qualityInfo = this.query()
+                .likeRight("code", itemPrefix).
+                orderByDesc("code").last("limit 1")
+                .one();
+        if (ObjectUtil.isNotEmpty(qualityInfo)) {
+            codeNum = Convert.toInt(qualityInfo.getCode().substring(itemPrefix.length() + 1));
+        }
+        String code = String.format("%s-%0" + 3 + "d", itemPrefix, codeNum + 1);
+        qualityInfoDto.setCode(code);
 
         qualityInfoDto.setWarehouseId(arrivalStockRecords.getWarehouseId());
         //查询入库明细

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/utils/CodeEnum.java

@@ -29,9 +29,7 @@ public enum CodeEnum {
     //京东退货质检
     JD_BACK_QUALITY("PA", "yyMM-", "code", 3, JdBackQualityDetailsService.class),
     //异常记录
-    ABNORMAL("PO", "yyMM-", "code", 3, AbnormalInfoService.class),
-    //到货质检
-    QUALITY("", null, "code", 3, QualityInfoService.class);
+    ABNORMAL("PO", "yyMM-", "code", 3, AbnormalInfoService.class);
 
     CodeEnum(String prefix, String dateFormat, String codeFieldName, Integer length, Class<? extends IService<?>> serviceCls) {
         this.prefix = prefix;