订单、商品相关优化

sckw-modules/sckw-message/src/main/java/com/sckw/message/service/SckwSmsHandlerService.java

@@ -1,6 +1,7 @@
 package com.sckw.message.service;
 
 import com.alibaba.fastjson2.JSON;
+import com.sckw.core.exception.BusinessException;
 import com.sckw.message.model.KwmSms;
 import com.sckw.redis.constant.RedisConstant;
 import com.sckw.redis.utils.RedissonUtils;
@@ -41,6 +42,9 @@ public class SckwSmsHandlerService {
         }
         try {
             String valueKey = getKey(RedisConstant.MESSAGE_SMS_VERIFY_CODE_VALUE_KEY, type, phone);
+            if (Boolean.TRUE.equals(RedissonUtils.exists(valueKey))) {
+                throw new BusinessException("请勿频繁获取短信验证码！");
+            }
             //发送短信
             SmsUtil.sendSms(sckwSms.getPhone(), sckwSms.getSignName(), sckwSms.getTemplateCode().getName(), JSON.toJSONString(sckwSms.getParams()));
             //放入缓存

sckw-modules/sckw-order/src/main/java/com/sckw/order/dubbo/TradeOrderInfoServiceImpl.java

@@ -69,11 +69,11 @@ public class TradeOrderInfoServiceImpl implements TradeOrderInfoService {
         Integer status = param.getStatus();
         Long updateBy = param.getUpdateBy();
         if (Objects.equals(String.valueOf(status), DictEnum.TORDER_STATUS_6.getValue())) {
-            if (!Objects.equals(String.valueOf(status), DictEnum.TORDER_STATUS_5.getValue())) {
+            if (!Objects.equals(String.valueOf(order.getStatus()), DictEnum.TORDER_STATUS_5.getValue())) {
                 throw new BusinessException("已完结的订单才可对账!");
             }
         } else if (Objects.equals(String.valueOf(status), DictEnum.TORDER_STATUS_7.getValue())) {
-            if (!Objects.equals(String.valueOf(status), DictEnum.TORDER_STATUS_6.getValue())) {
+            if (!Objects.equals(String.valueOf(order.getStatus()), DictEnum.TORDER_STATUS_6.getValue())) {
                 throw new BusinessException("已对账的订单才可结算!");
             }
         } else {

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/PurchaseOrderParam.java

@@ -77,7 +77,7 @@ public class PurchaseOrderParam {
     /**
      * 交易方式(预付款、货到付款）
      */
-    @NotNull(message = "交易方式不能为空")
+    @NotBlank(message = "交易方式不能为空")
     private String trading;
     /**
      * 备注

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

@@ -647,11 +647,11 @@ public class KwpGoodsService {
     @Transactional(rollbackFor = Exception.class)
     public void batchDelete(List<Long> ids) {
         LambdaQueryWrapper<KwpGoods> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(KwpGoods::getId, ids).in(KwpGoods::getStatus, 0, 2)
+        wrapper.in(KwpGoods::getId, ids).eq(KwpGoods::getStatus, 0)
                 .eq(KwpGoods::getEntId, LoginUserHolder.getEntId()).eq(KwpGoods::getDelFlag, Global.NO);
         List<KwpGoods> list = kwpGoodsMapper.selectList(wrapper);
         if (!Objects.equals(ids.size(), list.size())) {
-            throw new BusinessException("删除操作仅针对“已下架”“草稿”状态的单据");
+            throw new BusinessException("删除操作仅针对“草稿”状态的单据");
         }
         LambdaUpdateWrapper<KwpGoods> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.set(KwpGoods::getDelFlag, Global.YES).in(KwpGoods::getId, ids);
@@ -750,10 +750,16 @@ public class KwpGoodsService {
     public List<GoodsDropList> dropList(GoodsDropListReq params) {
         LambdaQueryWrapper<KwpGoods> wrapper = new LambdaQueryWrapper<>();
         if (Objects.equals(params.getOrderType(), 2)) {
-            if (Objects.isNull(params.getSupplyEntId())) {
+            Long supplyEntId = params.getSupplyEntId();
+            if (Objects.isNull(supplyEntId)) {
                 throw new BusinessException("供应单位不能为空！");
             }
-            wrapper.eq(KwpGoods::getSupplyEntId, params.getSupplyEntId());
+            Map<Long, EntCacheResDto> map = remoteSystemService.queryEntTreeByIds(List.of(supplyEntId));
+            EntCacheResDto ent = map.get(supplyEntId);
+            if (Objects.isNull(ent) || Objects.isNull(ent.getId())) {
+                throw new BusinessException("供应单位一级企业为空！");
+            }
+            wrapper.eq(KwpGoods::getSupplyEntId, ent.getId());
         }
         wrapper.like(StringUtils.isNotBlank(params.getName()), KwpGoods::getName, params.getName())
                 .eq(KwpGoods::getStatus, GoodsStatusEnum.PUT_ON_SHELVES.getCode())

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwOrderService.java

@@ -124,11 +124,11 @@ public class KwOrderService {
         criteria.and(topEnt).is(entId).and("delFlag").is(0);
         //日期范围
         if (Objects.nonNull(params.getStartCreateTime()) && Objects.nonNull(params.getEndCreateTime())) {
-            criteria.and("createTime").gte(params.getStartCreateTime()).lte(DateUtil.offsetDay(params.getEndCreateTime(), 1));
+            criteria.and("createTime").gte(params.getStartCreateTime()).lte(params.getEndCreateTime());
         } else if (Objects.nonNull(params.getStartCreateTime())) {
             criteria.and("createTime").gte(params.getStartCreateTime());
         } else if (Objects.nonNull(params.getEndCreateTime())) {
-            criteria.and("createTime").lte(DateUtil.offsetDay(params.getEndCreateTime(), 1));
+            criteria.and("createTime").lte(params.getEndCreateTime());
         }
         //装卸货地址
         String loadCode = params.getShippingAddressCode();

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/param/TradeOrderListStatisticParam.java

@@ -30,15 +30,15 @@ public class TradeOrderListStatisticParam {
      */
     private String keywords;
     /**
-     * 创建时间开始（yyyy-MM-dd）
+     * 创建时间开始（yyyy-MM-dd HH:mm:ss）
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date startCreateTime;
 
     /**
-     * 创建时间结束（yyyy-MM-dd）
+     * 创建时间结束（yyyy-MM-dd HH:mm:ss）
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date endCreateTime;
 
     /**