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

sckw-modules/sckw-message/src/main/java/com/sckw/message/controller/SmsController.java

@@ -1,12 +1,17 @@
 package com.sckw.message.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.message.model.vo.req.SendSmsVerifyCoderReqVO;
 import com.sckw.message.service.SmsService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author: yzc
@@ -17,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping(value = "/kwmSms")
 @RequiredArgsConstructor
+@Slf4j
 public class SmsController {
 
     private final SmsService smsService;
@@ -30,6 +36,7 @@ public class SmsController {
      */
     @PostMapping(value = "/sendVerifyCode", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult sendVerifyCode(@Valid @RequestBody SendSmsVerifyCoderReqVO param) {
+        log.info("发送验证码参数：{}", JSON.toJSONString(param));
         smsService.sendVerifyCode(param);
         return HttpResult.ok();
     }

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

@@ -2,6 +2,7 @@ package com.sckw.order.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;
@@ -44,6 +45,7 @@ public class AddressInfo {
      * 联系电话
      */
     @NotBlank(message = "联系电话不能为空")
+    @Pattern(regexp = "^1[3456789]\\d{9}$", message = "非法手机号格式")
     private String phone;
 
     /**

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

@@ -1,5 +1,6 @@
 package com.sckw.order.model.vo.req;
 
+import jakarta.validation.constraints.DecimalMin;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
@@ -70,6 +71,7 @@ public class GoodsInfo {
      * 订单成交单价
      */
     @NotNull(message = "订单成交单价不能为空")
+    @DecimalMin(value = "0.00",message = "订单成交单价最小为零")
     private BigDecimal unitPrice;
 
     /**

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

@@ -2,10 +2,7 @@ package com.sckw.order.model.vo.req;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
-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;
@@ -36,11 +33,13 @@ public class PurchaseOrderParam {
      * 订单总量
      */
     @NotNull(message = "订单总量不能为空")
+    @DecimalMin(value = "0.00",message = "订单总量最小为零")
     private BigDecimal amount;
     /**
      * 订单金额
      */
     @NotNull(message = "订单金额不能为空")
+    @DecimalMin(value = "0.00",message = "订单金额最小为零")
     private BigDecimal price;
 
     /**

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

@@ -2,6 +2,7 @@ package com.sckw.order.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;
@@ -44,5 +45,6 @@ public class UnitInfo {
      * 联系电话
      */
     @NotBlank(message = "联系电话不能为空")
+    @Pattern(regexp = "^1[3456789]\\d{9}$", message = "非法手机号格式")
     private String phone;
 }

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

@@ -1,10 +1,7 @@
 package com.sckw.order.model.vo.req;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import jakarta.validation.constraints.Max;
-import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.*;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -43,10 +40,13 @@ public class UpdateOrderParam {
     /**
      * 订单总量
      */
+    @DecimalMin(value = "0.00",message = "订单总量最小为零")
     private BigDecimal amount;
+
     /**
      * 订单金额
      */
+    @DecimalMin(value = "0.00",message = "订单金额最小为零")
     private BigDecimal price;
 
     /**

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

@@ -410,11 +410,11 @@ public class KwoTradeOrderService {
 
 
     private void checkParams(UpdateOrderParam param, String source) {
-        if (Objects.isNull(param.getAmount())) {
-            throw new BusinessException("订单总量不能为空！");
+        if (Objects.isNull(param.getAmount()) || param.getAmount().compareTo(BigDecimal.ZERO) < 0) {
+            throw new BusinessException("订单总量不能为空且不能为负数！");
         }
-        if (Objects.isNull(param.getPrice())) {
-            throw new BusinessException("订单金额不能为空！");
+        if (Objects.isNull(param.getPrice()) || param.getPrice().compareTo(BigDecimal.ZERO) < 0) {
+            throw new BusinessException("订单金额不能为空且不能为负数！");
         }
         if (StringUtils.isBlank(param.getTrading())) {
             throw new BusinessException("交易方式不能为空!");
@@ -465,8 +465,8 @@ public class KwoTradeOrderService {
         if (StringUtils.isBlank(goodsInfo.getGoodsType())) {
             throw new BusinessException("商品类型不能为空！");
         }
-        if (Objects.isNull(goodsInfo.getGoodsTaxRate())) {
-            throw new BusinessException("商品发票税率不能为空！");
+        if (Objects.isNull(goodsInfo.getGoodsTaxRate()) || goodsInfo.getGoodsTaxRate().compareTo(BigDecimal.ZERO) < 0) {
+            throw new BusinessException("商品发票税率不能为空且不能为负数！");
         }
         if (StringUtils.isBlank(goodsInfo.getGoodsSpec())) {
             throw new BusinessException("商品尺寸大小不能为空！");
@@ -477,8 +477,8 @@ public class KwoTradeOrderService {
         if (Objects.isNull(goodsInfo.getPriceRangeId())) {
             throw new BusinessException("价格段id不能为空！");
         }
-        if (Objects.isNull(goodsInfo.getUnitPrice())) {
-            throw new BusinessException("订单成交单价不能为空！");
+        if (Objects.isNull(goodsInfo.getUnitPrice()) || goodsInfo.getUnitPrice().compareTo(BigDecimal.ZERO) < 0) {
+            throw new BusinessException("订单成交单价不能为空且不能为负数！");
         }
         if (Objects.isNull(goodsInfo.getCollectionUnitId())) {
             throw new BusinessException("收款单位id不能为空！");

sckw-modules/sckw-product/src/main/java/com/sckw/product/controller/KwpGoodsController.java

@@ -88,7 +88,7 @@ public class KwpGoodsController {
      */
     @PostMapping(value = "/select", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult select(@RequestBody SelectGoodsListParam params) {
-        return HttpResult.ok(kwpGoodsService.select(params, true));
+        return HttpResult.ok(kwpGoodsService.select(params));
     }
 
     /**

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

@@ -24,7 +24,7 @@ public class AddGoodsParam {
      * 商品名称
      */
     @NotBlank(message = "商品名称不能为空")
-    @Length(max = 100, message = "商品名称最多支持100字")
+    @Length(max = 50, message = "商品名称最多支持50字")
     private String name;
 
     /**
@@ -43,6 +43,7 @@ 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

@@ -22,7 +22,7 @@ public class AddressInfo {
      * 地址名称
      */
     @NotBlank(message = "地址名称不能为空")
-    @Length(max = 60,message = "地址名称最长60字符")
+    @Length(max = 50,message = "地址名称最长50字符")
     private String name;
 
     /**

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

@@ -18,12 +18,12 @@ public class GoodsAttributes {
     /**
      * 参数名称
      */
-    @Length(max = 40,message = "参数名称最长40字符")
+    @Length(max = 10,message = "参数名称最长10字符")
     private String name;
 
     /**
      * 参数值
      */
-    @Length(max = 40,message = "参数值最长40字符")
+    @Length(max = 20,message = "参数值最长20字符")
     private String val;
 }

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

@@ -30,7 +30,7 @@ public class UpdateGoodsParam {
     /**
      * 商品名称
      */
-    @Length(max = 100, message = "商品名称最多支持100字")
+    @Length(max = 50, message = "商品名称最多支持50字")
     private String name;
 
     /**

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

@@ -294,8 +294,8 @@ public class KwpGoodsService {
      * @return: void
      */
     private void judgeParameters(@NotNull UpdateGoodsParam param) {
-        if (StringUtils.isBlank(param.getName()) || param.getName().length() > 100) {
-            throw new BusinessException("商品名称不能为空且最长100字符！");
+        if (StringUtils.isBlank(param.getName()) || param.getName().length() > 50) {
+            throw new BusinessException("商品名称不能为空且最长50字符！");
         }
         if (StringUtils.isBlank(param.getGoodsType())) {
             throw new BusinessException("商品类型不能为空！");
@@ -303,14 +303,14 @@ public class KwpGoodsService {
         if (StringUtils.isBlank(param.getUnit())) {
             throw new BusinessException("计量单位不能为空！");
         }
-        if (StringUtils.isBlank(param.getSpec())) {
+        if (StringUtils.isBlank(param.getSpec()) || param.getSpec().length() > 20) {
             throw new BusinessException("规格尺寸不能为空！");
         }
         if (Objects.isNull(param.getAmount()) || param.getAmount().compareTo(BigDecimal.ZERO) < 0) {
             throw new BusinessException("库存数量不能为空且最小为零！");
         }
-        if (Objects.isNull(param.getTaxRate())) {
-            throw new BusinessException("发票税率不能为空！");
+        if (Objects.isNull(param.getTaxRate())|| param.getTaxRate().compareTo(BigDecimal.ZERO) < 0) {
+            throw new BusinessException("发票税率不能为空最小为零！");
         }
         if (StringUtils.isBlank(param.getTrading())) {
             throw new BusinessException("交易方式不能为空！");
@@ -322,11 +322,11 @@ public class KwpGoodsService {
         List<GoodsAttributes> attributes = param.getAttributes();
         if (CollectionUtils.isNotEmpty(attributes)) {
             attributes.forEach(e -> {
-                if (StringUtils.isBlank(e.getName()) || e.getName().length() > 40) {
-                    throw new BusinessException("参数名称不能为空且最长40字符！");
+                if (StringUtils.isBlank(e.getName()) || e.getName().length() > 10) {
+                    throw new BusinessException("参数名称不能为空且最长10字符！");
                 }
-                if (StringUtils.isBlank(e.getVal()) || e.getVal().length() > 40) {
-                    throw new BusinessException("参数值不能为空且最长40字符！");
+                if (StringUtils.isBlank(e.getVal()) || e.getVal().length() > 20) {
+                    throw new BusinessException("参数值不能为空且最长20字符！");
                 }
             });
         }
@@ -363,8 +363,8 @@ public class KwpGoodsService {
         if (Objects.isNull(address)) {
             throw new BusinessException("地址信息不能为空！");
         }
-        if (StringUtils.isBlank(address.getName()) || address.getName().length() > 60) {
-            throw new BusinessException("参数名称不能为空且最长60字符！");
+        if (StringUtils.isBlank(address.getName()) || address.getName().length() > 50) {
+            throw new BusinessException("地址名称不能为空且最长50字符！");
         }
         if (StringUtils.isBlank(address.getType())) {
             throw new BusinessException("地址类型不能为空！");
@@ -405,8 +405,8 @@ public class KwpGoodsService {
      * @Param params:
      * @return: java.util.List<com.sckw.product.model.vo.res.GoodsList>
      */
-    public PageResult select(SelectGoodsListParam params, Boolean isPage) {
-        IPage<KwpGoods> goodsIpage = getGoodsLists(params, isPage);
+    public PageResult select(SelectGoodsListParam params) {
+        IPage<KwpGoods> goodsIpage = getGoodsLists(params, true);
         List<KwpGoods> goodsLists = goodsIpage.getRecords();
         if (CollectionUtils.isEmpty(goodsLists)) {
             return PageResult.build(params.getPage(), params.getPageSize(), goodsIpage.getTotal(), Collections.emptyList());
@@ -472,7 +472,7 @@ public class KwpGoodsService {
                     .le(Objects.nonNull(params.getEndCreateTime()), KwpGoods::getCreateTime, params.getEndCreateTime())
                     .eq(StringUtils.isNotBlank(params.getTrading()), KwpGoods::getTrading, params.getTrading())
                     .eq(StringUtils.isNotBlank(params.getGoodsType()), KwpGoods::getGoodsType, params.getGoodsType())
-                    .eq(Objects.nonNull(params.getStatus()), KwpGoods::getStatus, params.getStatus());
+                    .eq(Objects.nonNull(params.getStatus()) && isPage, KwpGoods::getStatus, params.getStatus());
             if (StringUtils.isNotBlank(params.getKeywords())) {
                 List<EntCacheResDto> entList = remoteSystemService.queryEntCacheByName(params.getKeywords());
                 List<Long> entIds = entList.stream().map(EntCacheResDto::getId).toList();
@@ -529,7 +529,7 @@ public class KwpGoodsService {
      * @return: void
      */
     public List<GoodsListExport> export(ExportGoodsListParam params) {
-        PageResult pageResult = select(BeanUtils.copyProperties(params, SelectGoodsListParam.class), false);
+        PageResult pageResult = select(BeanUtils.copyProperties(params, SelectGoodsListParam.class));
         List<GoodsList> goodsLists = pageResult.getList();
         if (CollectionUtils.isEmpty(goodsLists)) {
             return Collections.emptyList();

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

@@ -66,7 +66,7 @@ public class KwOrderService {
      * @return: com.sckw.core.model.page.PageResult
      */
     public PageResult tradeOrderSelect(TradeOrderListSelectParam params) {
-        Query query = getQuery(params);
+        Query query = getQuery(params, false);
         return getResult(query, params.getPage(), params.getPageSize());
     }
 
@@ -104,9 +104,10 @@ public class KwOrderService {
      * @author: yzc
      * @date: 2023-07-17 18:08
      * @Param params:
+     * @Param isStatistic:
      * @return: org.springframework.data.mongodb.core.query.Query
      */
-    private Query getQuery(TradeOrderListStatisticParam params) {
+    private Query getQuery(TradeOrderListStatisticParam params, Boolean isStatistic) {
         Long entId = LoginUserHolder.getEntId();
         Query query = new Query();
         Criteria criteria = new Criteria();
@@ -152,7 +153,7 @@ public class KwOrderService {
         }
         List<Criteria> orCriteriaList = new ArrayList<>();
         //订单状态
-        if (Objects.nonNull(params.getStatus())) {
+        if (Objects.nonNull(params.getStatus()) && !isStatistic) {
             criteria.and("status").is(params.getStatus());
             if (Objects.equals(params.getStatus(), Integer.valueOf(DictEnum.TORDER_STATUS_0.getValue()))) {
                 //草稿状态只能创建订单的企业能看
@@ -187,7 +188,7 @@ public class KwOrderService {
      */
     public TableStatisticRes tradeOrderStatistic(TradeOrderListStatisticParam params) {
         TableStatisticRes res = new TableStatisticRes();
-        Query query = getQuery(params);
+        Query query = getQuery(params, true);
         List<SckwTradeOrder> orders = mongoTemplate.find(query, SckwTradeOrder.class);
         Map<Integer, List<SckwTradeOrder>> map = orders.stream().collect(Collectors.groupingBy(SckwTradeOrder::getStatus));
         List<TableTop> tableTops = new ArrayList<>();
@@ -220,16 +221,16 @@ public class KwOrderService {
             Long entId = LoginUserHolder.getEntId();
             Criteria criteria = new Criteria();
             criteria.and("tOrderId").in(params.getIds()).and("delFlag").is(0);
-            //销售订单
-            if (Objects.equals(params.getOrderType(), 2)) {
-                criteria.and("supplyTopEntId").is(entId);
-            } else {
+            if (Objects.equals(params.getOrderType(), 1)) {
                 //采购订单
                 criteria.and("procureTopEntId").is(entId);
+            } else {
+                //销售订单
+                criteria.and("supplyTopEntId").is(entId);
             }
             query.addCriteria(criteria);
         } else {
-            query = getQuery(params);
+            query = getQuery(params,false);
         }
         List<SckwTradeOrder> orders = mongoTemplate.find(query, SckwTradeOrder.class);
         if (CollectionUtils.isEmpty(orders)) {