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

sckw-common/sckw-common-mongo/src/main/java/com/sckw/mongo/model/SckwTradeOrder.java

@@ -1,6 +1,7 @@
 package com.sckw.mongo.model;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -33,11 +34,13 @@ public class SckwTradeOrder {
     /**
      * 订单主键
      */
+    @JsonProperty("tOrderId")
     private Long tOrderId;
 
     /**
      * 订单编号
      */
+    @JsonProperty("tOrderNo")
     private String tOrderNo;
 
     /**

sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/model/CompleteLogisticsOrderParam.java

@@ -1,5 +1,6 @@
 package com.sckw.order.api.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -25,6 +26,7 @@ public class CompleteLogisticsOrderParam implements Serializable {
     /**
      * 订单id
      */
+    @JsonProperty("tOrderId")
     private Long tOrderId;
 
     /**

sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/model/CreateOrCancelLogisticsOrderParam.java

@@ -1,5 +1,6 @@
 package com.sckw.order.api.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -25,6 +26,7 @@ public class CreateOrCancelLogisticsOrderParam implements Serializable {
     /**
      * 订单id
      */
+    @JsonProperty("tOrderId")
     private Long tOrderId;
 
     /**

sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/model/OrderDetailRes.java

@@ -1,6 +1,7 @@
 package com.sckw.order.api.model;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -43,6 +44,7 @@ public class OrderDetailRes implements Serializable {
     /**
      * 订单编号
      */
+    @JsonProperty("tOrderNo")
     private String tOrderNo;
 
     /**

sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/model/UpdateAssociateStatementParam.java

@@ -1,5 +1,6 @@
 package com.sckw.order.api.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -23,6 +24,7 @@ public class UpdateAssociateStatementParam implements Serializable {
     /**
      * 订单id
      */
+    @JsonProperty("tOrderId")
     private Long tOrderId;
 
     /**

sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/model/UpdateOrderAmountParam.java

@@ -1,5 +1,6 @@
 package com.sckw.order.api.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -24,6 +25,7 @@ public class UpdateOrderAmountParam implements Serializable {
     /**
      * 订单id
      */
+    @JsonProperty("tOrderId")
     private Long tOrderId;
 
     /**

sckw-modules-api/sckw-order-api/src/main/java/com/sckw/order/api/model/UpdateOrderStatusParam.java

@@ -1,5 +1,6 @@
 package com.sckw.order.api.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -22,6 +23,7 @@ public class UpdateOrderStatusParam implements Serializable {
     /**
      * 订单id
      */
+    @JsonProperty("tOrderId")
     private Long tOrderId;
 
     /**

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfDriverService.java

@@ -583,7 +583,7 @@ public class KwfDriverService {
         }
 
         /**从缓存中取出验证码/校验**/
-        String valueKey = StringUtils.getKey(RedisConstant.MESSAGE_SMS_VERIFY_CODE_VALUE_KEY, params.getPhone());
+        String valueKey = StringUtils.format(RedisConstant.MESSAGE_SMS_VERIFY_CODE_VALUE_KEY, params.getPhone());
         String phoneCaptcha = RedissonUtils.getString(valueKey);
         if (StringUtils.isBlank(phoneCaptcha)) {
             return HttpResult.error("手机验证码不正确请确认！");

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrder.java

@@ -1,6 +1,7 @@
 package com.sckw.order.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sckw.core.model.base.BaseModel;
 import lombok.Getter;
 import lombok.Setter;
@@ -32,6 +33,7 @@ public class KwoTradeOrder extends BaseModel implements Serializable {
     /**
      * 订单编号
      */
+    @JsonProperty("tOrderNo")
     private String tOrderNo;
 
     /**

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderAddress.java

@@ -1,6 +1,7 @@
 package com.sckw.order.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sckw.core.model.base.BaseModel;
 import lombok.Getter;
 import lombok.Setter;
@@ -28,11 +29,13 @@ public class KwoTradeOrderAddress extends BaseModel implements Serializable {
     /**
      * 交易订单id
      */
+    @JsonProperty("tOrderId")
     private Long tOrderId;
 
     /**
      * 订单编号
      */
+    @JsonProperty("tOrderNo")
     private String tOrderNo;
 
     /**

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderContract.java

@@ -1,6 +1,7 @@
 package com.sckw.order.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sckw.core.model.base.BaseModel;
 import lombok.Getter;
 import lombok.Setter;
@@ -37,11 +38,13 @@ public class KwoTradeOrderContract extends BaseModel implements Serializable {
     /**
      * 订单id（销售订单/采购订单）
      */
+    @JsonProperty("tOrderId")
     private Long tOrderId;
 
     /**
      * 订单编号（销售订单/采购订单）
      */
+    @JsonProperty("tOrderNo")
     private String tOrderNo;
 
 }

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderGoods.java

@@ -1,6 +1,7 @@
 package com.sckw.order.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sckw.core.model.base.BaseModel;
 import lombok.Getter;
 import lombok.Setter;
@@ -28,11 +29,13 @@ public class KwoTradeOrderGoods extends BaseModel implements Serializable {
     /**
      * 交易订单id
      */
+    @JsonProperty("tOrderId")
     private Long tOrderId;
 
     /**
      * 订单编号
      */
+    @JsonProperty("tOrderNo")
     private String tOrderNo;
 
     /**

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderTrack.java

@@ -1,6 +1,7 @@
 package com.sckw.order.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sckw.core.model.base.BaseModel;
 import lombok.Getter;
 import lombok.Setter;
@@ -27,11 +28,13 @@ public class KwoTradeOrderTrack extends BaseModel implements Serializable {
     /**
      * 交易订单id
      */
+    @JsonProperty("tOrderId")
     private Long tOrderId;
 
     /**
      * 订单编号
      */
+    @JsonProperty("tOrderNo")
     private String tOrderNo;
 
 }

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrderUnit.java

@@ -1,6 +1,7 @@
 package com.sckw.order.model;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sckw.core.model.base.BaseModel;
 import lombok.Getter;
 import lombok.Setter;
@@ -27,11 +28,13 @@ public class KwoTradeOrderUnit extends BaseModel implements Serializable {
     /**
      * 交易订单id
      */
+    @JsonProperty("tOrderId")
     private Long tOrderId;
 
     /**
      * 订单编号
      */
+    @JsonProperty("tOrderNo")
     private String tOrderNo;
 
     /**

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/res/OrderDetailRes.java

@@ -1,6 +1,7 @@
 package com.sckw.order.model.vo.res;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sckw.order.model.vo.req.ContractInfo;
 import lombok.Getter;
 import lombok.Setter;
@@ -44,6 +45,7 @@ public class OrderDetailRes implements Serializable {
     /**
      * 订单编号
      */
+    @JsonProperty("tOrderNo")
     private String tOrderNo;
 
     /**

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/res/OrderListRes.java

@@ -1,5 +1,6 @@
 package com.sckw.order.model.vo.res;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -33,6 +34,7 @@ public class OrderListRes implements Serializable {
     /**
      * 订单编号
      */
+    @JsonProperty("tOrderNo")
     private String tOrderNo;
     /**
      * 采购单位

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/vo/OrderListRes.java

@@ -1,6 +1,7 @@
 package com.sckw.report.service.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -24,6 +25,7 @@ public class OrderListRes {
     /**
      * 订单id
      */
+    @JsonProperty("tOrderId")
     private Long tOrderId;
     /**
      * 订单状态
@@ -36,6 +38,7 @@ public class OrderListRes {
     /**
      * 订单编号
      */
+    @JsonProperty("tOrderNo")
     private String tOrderNo;
     /**
      * 采购企业主键ID

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/LogisticsConsignmentController.java

@@ -8,6 +8,7 @@ import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.transport.model.dto.OrderFinishDTO;
 import com.sckw.transport.model.param.LogisticsConsignmentParam;
+import com.sckw.transport.model.param.OrderQuery;
 import com.sckw.transport.model.vo.PurchaseLogisticOrderExcelVo;
 import com.sckw.transport.model.vo.SellLogisticOrderExcelVo;
 import com.sckw.transport.service.LogisticsConsignmentService;
@@ -15,7 +16,6 @@ import io.seata.spring.annotation.GlobalTransactional;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,13 +64,11 @@ public class LogisticsConsignmentController {
      * @param ids 销售订单id
      * @return
      */
-    @RequestMapping(value = "/purchaseLogisticsOrder", method = RequestMethod.GET)
-    public HttpResult purchaseLogisticsOrder(@RequestParam("ids") @NotBlank(message = "单据id不能为空") String ids,
-                                             @RequestParam("page") @NotNull(message = "当前页不能为空") int page,
-                                             @RequestParam("pageSize") @NotNull(message = "每页条数不能为空") int pageSize) {
-        log.info("采购订单-托运订单列表 传递参数信息:{}", ids);
+    @RequestMapping(value = "/purchaseLogisticsOrder", method = RequestMethod.POST)
+    public HttpResult purchaseLogisticsOrder(@RequestBody @Valid OrderQuery orderQuery) {
+        log.info("采购订单-托运订单列表 传递参数信息:{}", JSONObject.toJSONString(orderQuery));
         try {
-            return logisticsConsignmentService.logisticsOrder(ids, page, pageSize, "1");
+            return logisticsConsignmentService.logisticsOrder(orderQuery.getIds(), orderQuery.getPage(), orderQuery.getPageSize(), "1");
         } catch (Exception e) {
             log.error("采购订单-托运订单列表 error :{}", e.getMessage(), e);
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
@@ -115,21 +113,16 @@ public class LogisticsConsignmentController {
     }
 
     /**
-     * 采购订单-车辆信息-销售订单ids
-     *
-     * @param ids      销售订单ids
-     * @param page
-     * @param pageSize
+     * 购订单-车辆信息-销售订单ids
+     * @param orderQuery
      * @return
      */
     @Validated
-    @RequestMapping(value = "/purchaseLogisticsCar", method = RequestMethod.GET)
-    public HttpResult purchaseLogisticsCar(@RequestParam("ids") @NotBlank(message = "单据id不能为空") String ids,
-                                           @RequestParam("page") @NotNull(message = "当前页不能为空") int page,
-                                           @RequestParam("pageSize") @NotNull(message = "每页条数不能为空") int pageSize) {
-        log.info("采购订单-车辆详情 传递参数信息:{}", ids);
+    @RequestMapping(value = "/purchaseLogisticsCar", method = RequestMethod.POST)
+    public HttpResult purchaseLogisticsCar(@Valid @RequestBody OrderQuery orderQuery) {
+        log.info("采购订单-车辆详情 传递参数信息:{}", JSONObject.toJSONString(orderQuery));
         try {
-            return logisticsConsignmentService.purchaseLogisticsCar(ids, page, pageSize);
+            return logisticsConsignmentService.purchaseLogisticsCar(orderQuery.getIds(), orderQuery.getPage(), orderQuery.getPageSize());
         } catch (Exception e) {
             log.error("采购订单-车辆详情 error :{}", e.getMessage(), e);
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
@@ -196,13 +189,11 @@ public class LogisticsConsignmentController {
      * @param ids 销售订单id
      * @return
      */
-    @RequestMapping(value = "/sellLogisticsOrder", method = RequestMethod.GET)
-    public HttpResult sellLogisticsOrder(@RequestParam("ids") @NotBlank(message = "单据id不能为空") String ids,
-                                         @RequestParam("page") @NotNull(message = "当前页不能为空") int page,
-                                         @RequestParam("pageSize") @NotNull(message = "每页条数不能为空") int pageSize) {
-        log.info("销售订单-托运订单列表 传递参数信息:{}", ids);
+    @RequestMapping(value = "/sellLogisticsOrder", method = RequestMethod.POST)
+    public HttpResult sellLogisticsOrder(@Valid @RequestBody OrderQuery query ) {
+        log.info("销售订单-托运订单列表 传递参数信息:{}", JSONObject.toJSONString(query));
         try {
-            return logisticsConsignmentService.logisticsOrder(ids, page, pageSize, "2");
+            return logisticsConsignmentService.logisticsOrder(query.getIds(), query.getPage(), query.getPageSize(), "2");
         } catch (Exception e) {
             log.error("销售订单-托运订单列表 error :{}", e.getMessage(), e);
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
@@ -233,13 +224,11 @@ public class LogisticsConsignmentController {
      * @param ids 销售订单ids
      * @return
      */
-    @RequestMapping(value = "/sellLogisticsCar", method = RequestMethod.GET)
-    public HttpResult sellLogisticsCar(@RequestParam("ids") @NotBlank(message = "单据id不能为空") String ids,
-                                       @RequestParam("page") @NotNull(message = "当前页不能为空") int page,
-                                       @RequestParam("pageSize") @NotNull(message = "每页条数不能为空") int pageSize) {
-        log.info("销售订单-车辆列表 传递参数信息:{}", ids);
+    @RequestMapping(value = "/sellLogisticsCar", method = RequestMethod.POST)
+    public HttpResult sellLogisticsCar(@Valid @RequestBody OrderQuery orderQuery) {
+        log.info("销售订单-车辆列表 传递参数信息:{}", JSONObject.toJSONString(orderQuery));
         try {
-            return logisticsConsignmentService.sellLogisticsCar(ids, page, pageSize);
+            return logisticsConsignmentService.sellLogisticsCar(orderQuery.getIds(), orderQuery.getPage(), orderQuery.getPageSize());
         } catch (Exception e) {
             log.error("销售订单-车辆列表 error :{}", e.getMessage(), e);
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/OrderQuery.java

@@ -0,0 +1,21 @@
+package com.sckw.transport.model.param;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * @author lfdc
+ * @description 订单查询query
+ * @date 2023-08-14 16:08:53
+ */
+@Data
+public class OrderQuery {
+    @NotBlank(message = "ids不能为空")
+    private  String ids;
+    @NotNull(message = "当前页不能为空")
+    private  Integer page;
+    @NotNull(message = "每页条数不能为空")
+    private  Integer pageSize;
+
+}