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

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/CommonBusinessService.java

@@ -1,5 +1,6 @@
 package com.sckw.contract.service;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -143,9 +144,10 @@ public class CommonBusinessService {
     public void approval(ESignCallBackReqVo reqVo) {
         Long contractId = reqVo.getContractId();
         KwcContractTrade kwcContractTrade = kwcContractTradeMapper.selectById(contractId);
+        Date date = DateUtil.offsetSecond(new Date(), Global.NUMERICAL_TWO);
         if (Objects.nonNull(kwcContractTrade)) {
             kwcContractTradeService.approval(reqVo.getContractId(), reqVo.getStatus(), reqVo.getRemark());
-            kwcContractTradeTrackService.saveContractTradeTrack(contractId, reqVo.getStatus());
+            kwcContractTradeTrackService.saveContractTradeTrack(contractId, reqVo.getStatus(), date);
             notifyOrder(contractId, kwcContractTrade.getCreateBy());
             sendTradePassMessage(kwcContractTrade);
             return;
@@ -154,7 +156,7 @@ public class CommonBusinessService {
         KwcContractLogistics kwcContractLogistics = kwcContractLogisticsMapper.selectById(contractId);
         if (Objects.nonNull(kwcContractLogistics)) {
             kwcContractLogisticsService.approval(reqVo.getContractId(), reqVo.getStatus(), reqVo.getRemark());
-            kwcContractLogisticsTrackService.saveContractLogisticsTrack(contractId, reqVo.getStatus());
+            kwcContractLogisticsTrackService.saveContractLogisticsTrack(contractId, reqVo.getStatus(), date);
             notifyOrder(contractId, kwcContractLogistics.getCreateBy());
             sendLogisticsPassMessage(kwcContractLogistics);
             return;

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractLogisticsService.java

@@ -520,7 +520,7 @@ public class KwcContractLogisticsService {
         if (kwcContractLogisticsMapper.updateById(kwcContractLogistics) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
         }
-        kwcContractLogisticsTrackService.saveContractLogisticsTrack(id, ContractTrackEnum.SIGNING.getCode());
+        kwcContractLogisticsTrackService.saveContractLogisticsTrack(id, ContractTrackEnum.SIGNING.getCode(), new Date());
     }
 
 
@@ -627,7 +627,7 @@ public class KwcContractLogisticsService {
         if (kwcContractLogisticsMapper.updateById(kwcContractLogistic) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
         }
-        kwcContractLogisticsTrackService.saveContractLogisticsTrack(kwcContractLogistic.getId(), ContractTrackEnum.OVER.getCode());
+        kwcContractLogisticsTrackService.saveContractLogisticsTrack(kwcContractLogistic.getId(), ContractTrackEnum.OVER.getCode(), new Date());
 
 
         //发送消息

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractLogisticsTrackService.java

@@ -50,10 +50,8 @@ public class KwcContractLogisticsTrackService {
      * @author: czh
      * @date: 2023/7/14
      */
-    public void saveContractLogisticsTrack(Long contractId, Integer status) {
+    public void saveContractLogisticsTrack(Long contractId, Integer status, Date date) {
         KwcContractLogisticsTrack kwcContractLogisticsTrack = new KwcContractLogisticsTrack();
-        Date date = new Date();
-        date = DateUtil.offsetSecond(date, Global.NUMERICAL_TWO);
         kwcContractLogisticsTrack.setId(new IdWorker(1L).nextId());
         kwcContractLogisticsTrack.setContractId(contractId);
         kwcContractLogisticsTrack.setType(status);

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractTradeService.java

@@ -599,7 +599,7 @@ public class KwcContractTradeService {
         if (kwcContractTradeMapper.updateById(kwcContractTrade) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
         }
-        kwcContractTradeTrackService.saveContractTradeTrack(id, code);
+        kwcContractTradeTrackService.saveContractTradeTrack(id, code, new Date());
     }
 
     /**
@@ -704,7 +704,7 @@ public class KwcContractTradeService {
         if (kwcContractTradeMapper.updateById(kwcContractTrade) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
         }
-        kwcContractTradeTrackService.saveContractTradeTrack(kwcContractTrade.getId(), ContractTrackEnum.OVER.getCode());
+        kwcContractTradeTrackService.saveContractTradeTrack(kwcContractTrade.getId(), ContractTrackEnum.OVER.getCode(), new Date());
 
         //完结相关订单
         ContractSignCompletedParam contractSignCompletedParam = new ContractSignCompletedParam();

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractTradeTrackService.java

@@ -44,9 +44,7 @@ public class KwcContractTradeTrackService {
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private RemoteSystemService remoteSystemService;
 
-    public void saveContractTradeTrack(Long contractId, Integer status) {
-        Date date = new Date();
-        date = DateUtil.offsetSecond(date, Global.NUMERICAL_TWO);
+    public void saveContractTradeTrack(Long contractId, Integer status, Date date) {
         KwcContractTradeTrack kwcContractTradeTrack = new KwcContractTradeTrack();
         kwcContractTradeTrack.setId(new IdWorker(1L).nextId());
         kwcContractTradeTrack.setContractId(contractId);

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -432,7 +432,11 @@ public class KwoTradeOrderService {
         BigDecimal amount = param.getAmount();
         String trading = param.getTrading();
         BigDecimal price = param.getPrice();
-        if (!isAcceptanceOrder) {
+        KwpGoods goods = goodsInfoService.getGoodsById(param.getGoodsId());
+        if (Objects.isNull(goods) || Objects.equals(goods.getDelFlag(), Global.YES) ) {
+            throw new BusinessException("商品不存在！");
+        }
+        if (Boolean.FALSE.equals(isAcceptanceOrder)) {
             if (price.compareTo(amount.multiply(param.getUnitPrice())) != 0) {
                 throw new BusinessException("订单总金额不等于商品单价*订单总量！");
             }
@@ -447,13 +451,9 @@ public class KwoTradeOrderService {
             if (CollectionUtils.isEmpty(entCooperate)) {
                 throw new BusinessException("供采双方企业无合作关系！");
             }
-        }
-        KwpGoods goods = goodsInfoService.getGoodsById(param.getGoodsId());
-        if (Objects.isNull(goods) || Objects.equals(goods.getDelFlag(), Global.YES) || !Objects.equals(goods.getStatus(), 1)) {
-            throw new BusinessException("商品不存在或已下架！");
-        }
-        if (goods.getAmount().compareTo(amount) < 0) {
-            throw new BusinessException("商品库存不足，请联系供应方！");
+            if (goods.getAmount().compareTo(amount) < 0) {
+                throw new BusinessException("商品库存不足，请联系供应方！");
+            }
         }
         //支付方式预付款校验
         if (trading.startsWith("1")) {

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/AddGoodsDraftParam.java

@@ -2,12 +2,12 @@ package com.sckw.product.model.vo.req;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-import org.apache.logging.log4j.core.config.plugins.validation.constraints.NotBlank;
 import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.Range;
 

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/AddGoodsParam.java

@@ -1,14 +1,10 @@
 package com.sckw.product.model.vo.req;
 
 import jakarta.validation.Valid;
-import jakarta.validation.constraints.DecimalMin;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.*;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-import org.apache.logging.log4j.core.config.plugins.validation.constraints.NotBlank;
 import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.Range;
 
@@ -46,7 +42,6 @@ public class AddGoodsParam {
     /**
      * 规格尺寸
      */
-    @NotBlank(message = "规格尺寸不能为空")
     @Length(max = 20, message = "规格尺寸最多支持20字")
     private String spec;
 

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/AddressInfo.java

@@ -1,11 +1,11 @@
 package com.sckw.product.model.vo.req;
 
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-import org.apache.logging.log4j.core.config.plugins.validation.constraints.NotBlank;
 import org.hibernate.validator.constraints.Length;
 
 /**

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/GoodsImages.java

@@ -1,10 +1,11 @@
 package com.sckw.product.model.vo.req;
 
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-import org.apache.logging.log4j.core.config.plugins.validation.constraints.NotBlank;
+
 
 /**
  * @desc: 商品图片

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/req/UpdateGoodsParam.java

@@ -2,12 +2,12 @@ package com.sckw.product.model.vo.req;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
-import org.apache.logging.log4j.core.config.plugins.validation.constraints.NotBlank;
 import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.Range;
 

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -316,7 +316,7 @@ public class KwpGoodsService {
      */
     @Transactional(rollbackFor = Exception.class)
     public void update(UpdateGoodsParam param) {
-        if (nameDuplicationJudgment(param.getName(), param.getSupplyEntId(), param.getId())) {
+        if (Boolean.TRUE.equals(nameDuplicationJudgment(param.getName(), param.getSupplyEntId(), param.getId()))) {
             throw new BusinessException("已存在相同商品名称！");
         }
         KwpGoods goods = getGoodsById(param.getId());
@@ -428,9 +428,6 @@ public class KwpGoodsService {
         if (StringUtils.isBlank(param.getUnit())) {
             return "计量单位不能为空！";
         }
-        if (StringUtils.isBlank(param.getSpec())) {
-            return "规格尺寸不能为空！";
-        }
         if (Objects.isNull(param.getAmount())) {
             return "库存数量不能为空！";
         }

sckw-modules/sckw-system/src/main/java/com/sckw/system/dao/SysAreaDao.java

@@ -15,7 +15,7 @@ import java.util.Map;
 @Mapper
 public interface SysAreaDao {
 
-    List<Map<String, Object>> findList(Map<String, Object> params);
+    List<SysArea> findList(Map<String, Object> params);
 
     SysArea selectById(Integer code);
 

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteSystemServiceImpl.java

@@ -721,16 +721,26 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
         if (Objects.isNull(code)) {
             return Collections.emptyList();
         }
-        Map<String, Object> params = new HashMap<>(1);
-        params.put("pcode", code);
-        List<Map<String, Object>> list = sysAreaService.findList(params);
+
+        List<SysArea> list = sysAreaService.findList(null);
         if (CollectionUtils.isEmpty(list)) {
-            return null;
+            return Collections.emptyList();
         }
 
-        List<FindAreaTreeResVo> result = BeanUtils.copyToList(list, FindAreaTreeResVo.class);
+        return getAreaChild(BeanUtils.copyToList(list, FindAreaTreeResVo.class), code);
+    }
+
+    private List<FindAreaTreeResVo> getAreaChild(List<FindAreaTreeResVo> findAreaTreeResVoList, Integer code) {
+        List<FindAreaTreeResVo> result = findAreaTreeResVoList.stream().filter(item -> item.getPcode().equals(code)).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(result)) {
+            return null;
+        }
         for (FindAreaTreeResVo findAreaTreeResVo : result) {
-            findAreaTreeResVo.setChild(queryAreaGroup(findAreaTreeResVo.getCode()));
+            if (findAreaTreeResVo.getLevel().equals(Global.NUMERICAL_THREE)) {
+                continue;
+            }
+
+            findAreaTreeResVo.setChild(getAreaChild(findAreaTreeResVoList, findAreaTreeResVo.getCode()));
         }
         return result;
     }

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/ForgetPasswordReqVo.java

@@ -1,8 +1,7 @@
 package com.sckw.system.model.vo.req;
 
-import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
-import org.apache.logging.log4j.core.config.plugins.validation.constraints.NotBlank;
 
 import java.io.Serial;
 import java.io.Serializable;

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/UpdatePasswordReqVo.java

@@ -1,8 +1,8 @@
 package com.sckw.system.model.vo.req;
 
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
-import org.apache.logging.log4j.core.config.plugins.validation.constraints.NotBlank;
 
 import java.io.Serial;
 import java.io.Serializable;

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/SysAreaService.java

@@ -28,7 +28,7 @@ public class SysAreaService {
      * @param params
      * @return
      */
-    public List<Map<String, Object>> findList(Map<String, Object> params) {
+    public List<SysArea> findList(Map<String, Object> params) {
         return sysAreaDao.findList(params);
     }
 

sckw-modules/sckw-system/src/main/resources/mapper/KwsEnterpriseDao.xml

@@ -284,11 +284,13 @@
     from kws_enterprise a
            left join kws_dept b on a.id = b.ent_id
            LEFT JOIN kws_user d ON a.phone = d.account
-           left join kws_role f on b.id = f.dept_id
+           left join kws_user_role e on d.id = e.user_id
+           left join kws_role f on e.role_id = f.id
     where a.del_flag = 0
       and b.del_flag = 0
       and d.del_flag = 0
       and f.del_flag = 0
+      and e.del_flag = 0
       and d.is_main = 1
       and d.system_type = 2
       and a.id = #{entId}

sckw-modules/sckw-system/src/main/resources/mapper/SysAreaDao.xml

@@ -31,7 +31,7 @@
     del_flag
   </sql>
 
-  <select id="findList" resultType="java.util.Map" parameterType="java.util.Map" >
+  <select id="findList" resultType="com.sckw.system.model.SysArea" parameterType="java.util.Map" >
     SELECT
     code , pcode , name, code, hot, level, lng, lat, letter, merger_name mergerName,
     short_name shortName

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/WaybillManagementService.java

@@ -121,10 +121,16 @@ public class WaybillManagementService {
             wayBillDetailDTO.setEndTime(info.getEndTime());
             wayBillDetailDTO.setCreateBy(info.getCreateByName());
             wayBillDetailDTO.setGoodsName(info.getGoodsName());
-//            wayBillDetailDTO.setLoadDetailAddress(info.getLoadCityName().concat(info.getLoadDetailAddress()));
-//            wayBillDetailDTO.setUnloadDetailAddress(info.getUnloadCityName().concat(info.getUnloadDetailAddress()));
-            wayBillDetailDTO.setLoadDetailAddress(info.getLoadDetailAddress());
-            wayBillDetailDTO.setUnloadDetailAddress(info.getUnloadDetailAddress());
+            if (info.getLoadDetailAddress().contains(info.getLoadCityName())){
+                wayBillDetailDTO.setLoadDetailAddress(info.getLoadDetailAddress());
+            }else {
+                wayBillDetailDTO.setLoadDetailAddress(info.getLoadCityName().concat(info.getLoadDetailAddress()));
+            }
+            if (info.getUnloadDetailAddress().contains(info.getUnloadCityName())){
+                wayBillDetailDTO.setUnloadDetailAddress(info.getUnloadDetailAddress());
+            }else {
+                wayBillDetailDTO.setUnloadDetailAddress(info.getUnloadCityName().concat(info.getUnloadDetailAddress()));
+            }
             wayBillDetailDTO.setLoadName(info.getLoadName());
             wayBillDetailDTO.setUnloadName(info.getUnloadName());
             wayBillDetailDTO.setCarrierFirmName(info.getCarrierFirmName());