yzc 2 лет назад
Родитель
Сommit
33af3adef3
16 измененных файлов с 750 добавлено и 14 удалено
  1. 4 1
      sckw-common/sckw-common-core/src/main/java/com/sckw/core/common/enums/enums/DictEnum.java
  2. 1 0
      sckw-common/sckw-common-core/src/main/java/com/sckw/core/common/enums/enums/DictTypeEnum.java
  3. 1 1
      sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/dubbo/PayCenterDubboService.java
  4. 122 3
      sckw-modules/sckw-order/src/main/java/com/sckw/order/controller/KwoTransportDemandController.java
  5. 59 0
      sckw-modules/sckw-order/src/main/java/com/sckw/order/model/dto/TransportDemandExport.java
  6. 3 1
      sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/AddTransportDemandDraftParam.java
  7. 3 1
      sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/AddTransportDemandParam.java
  8. 49 0
      sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/ExportTransportDemandParam.java
  9. 63 0
      sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/SelectTransportDemandParam.java
  10. 57 0
      sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/StatisticTransportDemandParam.java
  11. 20 0
      sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/TransportDemandSquaresParam.java
  12. 99 0
      sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/UpdateTransportDemandParam.java
  13. 148 0
      sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/res/TransportDemandDetailRes.java
  14. 1 1
      sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java
  15. 119 5
      sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTransportDemandService.java
  16. 1 1
      sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

+ 4 - 1
sckw-common/sckw-common-core/src/main/java/com/sckw/core/common/enums/enums/DictEnum.java

@@ -72,7 +72,10 @@ public enum DictEnum {
     CHARGING_TYPE_2("charging_type", "2", "按卸货量") ,
     CHARGING_TYPE_3("charging_type", "3", "按车次"),
     SIGNING_WAY_1("signing_way", "1", "线上签约"),
-    SIGNING_WAY_2("signing_way", "2", "线下签约");
+    SIGNING_WAY_2("signing_way", "2", "线下签约"),
+    TRANSPORT_DEMAND_STATUS_0("transport_demand_status", "0","已保存"),
+    TRANSPORT_DEMAND_STATUS_1("transport_demand_status", "1","已上架"),
+    TRANSPORT_DEMAND_STATUS_2("transport_demand_status", "2","已下架");
 
     private final String type;
     private final String value;

+ 1 - 0
sckw-common/sckw-common-core/src/main/java/com/sckw/core/common/enums/enums/DictTypeEnum.java

@@ -39,6 +39,7 @@ public enum DictTypeEnum {
     USE_TYPE("use_type", "使用性质"),
     SIGNING_WAY("signing_way", "签约方式"),
     WEIGHT_CAR("weight_car", "以车的限重"),
+    TRANSPORT_DEMAND_STATUS("transport_demand_status", "运需状态"),
     ;
 
     private final String type;

+ 1 - 1
sckw-modules-api/sckw-payment-api/src/main/java/com/sckw/payment/api/dubbo/PayCenterDubboService.java

@@ -2,8 +2,8 @@ package com.sckw.payment.api.dubbo;
 
 import com.sckw.payment.api.model.constant.ChannelEnum;
 import com.sckw.payment.api.model.dto.MemberDetail;
-import com.sckw.payment.api.model.dto.R;
 import com.sckw.payment.api.model.dto.WalletDto;
+import com.sckw.payment.api.model.dto.common.R;
 
 import java.util.List;
 

+ 122 - 3
sckw-modules/sckw-order/src/main/java/com/sckw/order/controller/KwoTransportDemandController.java

@@ -1,15 +1,20 @@
 package com.sckw.order.controller;
 
+import com.sckw.core.exception.BusinessException;
+import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.web.response.HttpResult;
-import com.sckw.order.model.vo.req.AddTransportDemandDraftParam;
-import com.sckw.order.model.vo.req.AddTransportDemandParam;
-import com.sckw.order.model.vo.req.UpdateTransportDemandParam;
+import com.sckw.excel.utils.ExcelUtil;
+import com.sckw.order.model.dto.TransportDemandExport;
+import com.sckw.order.model.vo.req.*;
 import com.sckw.order.serivce.KwoTransportDemandService;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @desc: 运需controller
  * @author: yzc
@@ -22,6 +27,13 @@ public class KwoTransportDemandController {
 
     private final KwoTransportDemandService kwoTransportDemandService;
 
+    /**
+     * @desc: 新增运需草稿
+     * @author: yzc
+     * @date: 2023-07-26 9:42
+     * @Param param:
+     * @return: com.sckw.core.web.response.HttpResult
+     */
     @PostMapping(value = "/addDraft", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult addDraft(@RequestBody @Validated AddTransportDemandDraftParam param) {
         kwoTransportDemandService.addDraft(param);
@@ -29,6 +41,13 @@ public class KwoTransportDemandController {
     }
 
 
+    /**
+     * @desc: 新增运需上架
+     * @author: yzc
+     * @date: 2023-07-26 9:42
+     * @Param param:
+     * @return: com.sckw.core.web.response.HttpResult
+     */
     @PostMapping(value = "/addShelves", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult addShelves(@RequestBody @Validated AddTransportDemandParam param) {
         kwoTransportDemandService.addShelves(param);
@@ -36,15 +55,115 @@ public class KwoTransportDemandController {
     }
 
 
+    /**
+     * @desc: 运需详情
+     * @author: yzc
+     * @date: 2023-07-26 9:43
+     * @Param id:
+     * @return: com.sckw.core.web.response.HttpResult
+     */
     @GetMapping("/detail")
     public HttpResult detail(@RequestParam Long id) {
         return HttpResult.ok(kwoTransportDemandService.detail(id));
     }
 
+    /**
+     * @desc: 运需修改
+     * @author: yzc
+     * @date: 2023-07-26 9:43
+     * @Param param:
+     * @return: com.sckw.core.web.response.HttpResult
+     */
     @PostMapping(value = "/update", produces = MediaType.APPLICATION_JSON_VALUE)
     public HttpResult update(@RequestBody @Validated UpdateTransportDemandParam param) {
         kwoTransportDemandService.update(param);
         return HttpResult.ok("运需修改成功!");
     }
 
+    /**
+     * @desc: 运需分页查询
+     * @author: yzc
+     * @date: 2023-07-26 10:05
+     * @Param param:
+     * @return: com.sckw.core.web.response.HttpResult
+     */
+    @PostMapping(value = "/select", produces = MediaType.APPLICATION_JSON_VALUE)
+    public HttpResult select(@RequestBody @Validated SelectTransportDemandParam param) {
+        return HttpResult.ok(kwoTransportDemandService.select(param));
+    }
+
+    /**
+     * @desc: 运需统计
+     * @author: yzc
+     * @date: 2023-07-26 10:09
+     * @Param param:
+     * @return: com.sckw.core.web.response.HttpResult
+     */
+    @PostMapping(value = "/statistic", produces = MediaType.APPLICATION_JSON_VALUE)
+    public HttpResult statistic(@RequestBody StatisticTransportDemandParam param) {
+        return HttpResult.ok(kwoTransportDemandService.statistic(param));
+    }
+
+    /**
+     * @desc: 运需导出
+     * @author: yzc
+     * @date: 2023-07-26 10:09
+     * @Param params:
+     * @Param response:
+     * @return: void
+     */
+    @PostMapping(value = "/export", produces = MediaType.APPLICATION_JSON_VALUE)
+    public void export(@RequestBody ExportTransportDemandParam param, HttpServletResponse response) {
+        List<TransportDemandExport> list = kwoTransportDemandService.export(param);
+        if (CollectionUtils.isEmpty(list)) {
+            throw new BusinessException("导出数据为空!");
+        }
+        ExcelUtil.downData(response, TransportDemandExport.class, list);
+    }
+
+    /**
+     * @desc: 运需上架
+     * @author: yzc
+     * @date: 2023-07-26 10:24
+     * @Param id:
+     * @return: com.sckw.core.web.response.HttpResult
+     */
+    @GetMapping("/putOnShelves")
+    public HttpResult putOnShelves(@RequestParam Long id) {
+        kwoTransportDemandService.putOnShelves(id);
+        return HttpResult.ok("上架成功");
+    }
+
+    /**
+     * @desc: 运需批量下架
+     * @author: yzc
+     * @date: 2023-07-26 10:25
+     * @Param ids:
+     * @return: com.sckw.core.web.response.HttpResult
+     */
+    @GetMapping("/batchTakeOffShelves")
+    public HttpResult batchTakeOffShelves(@RequestParam List<Long> ids) {
+        kwoTransportDemandService.batchTakeOffShelves(ids);
+        return HttpResult.ok("批量下架成功");
+    }
+
+    /**
+     * @desc: 运需批量删除
+     * @author: yzc
+     * @date: 2023-07-26 10:26
+     * @Param ids:
+     * @return: com.sckw.core.web.response.HttpResult
+     */
+    @GetMapping("/batchDelete")
+    public HttpResult batchDelete(@RequestParam List<Long> ids) {
+        kwoTransportDemandService.batchDelete(ids);
+        return HttpResult.ok("批量删除成功");
+    }
+
+    @PostMapping(value = "/demandSquaresList", produces = MediaType.APPLICATION_JSON_VALUE)
+    public HttpResult demandSquaresList(@RequestBody @Validated TransportDemandSquaresParam param) {
+        return HttpResult.ok(kwoTransportDemandService.demandSquaresList(param));
+    }
+
+
 }

+ 59 - 0
sckw-modules/sckw-order/src/main/java/com/sckw/order/model/dto/TransportDemandExport.java

@@ -0,0 +1,59 @@
+package com.sckw.order.model.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.sckw.excel.annotation.ExcelContext;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @desc: TODO
+ * @author: yzc
+ * @date: 2023-07-26 10:14
+ */
+@Data
+@Accessors(chain = true)
+@ExcelContext(fileName = "运需列表信息", sheetName = "运需列表信息")
+public class TransportDemandExport implements Serializable {
+    @Serial
+    private static final long serialVersionUID = -7951209824419422786L;
+
+    @ExcelProperty(value = "状态", index = 0)
+    private String statusLabel;
+
+    @ExcelProperty(value = "商品名称", index = 1)
+    private String name;
+
+    @ExcelProperty(value = "分类", index = 2)
+    private String goodsTypeLabel;
+
+    @ExcelProperty(value = "规格", index = 3)
+    private String spec;
+
+    @ExcelProperty(value = "运需单价", index = 4)
+    private String price;
+
+    @ExcelProperty(value = "总计划量", index = 5)
+    private String amount;
+
+    @ExcelProperty(value = "装货地址", index = 6)
+    private String loadAddress;
+
+    @ExcelProperty(value = "卸货地址", index = 7)
+    private String unloadAddress;
+
+    @ExcelProperty(value = "截止时间", index = 8)
+    private String deadline;
+
+    @ExcelProperty(value = "创建时间", index = 9)
+    private String createTime;
+
+    @ExcelProperty(value = "更新时间", index = 10)
+    private String updateTime;
+
+    @ExcelProperty(value = "备注", index = 11)
+    private String remark;
+
+}

+ 3 - 1
sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/AddTransportDemandDraftParam.java

@@ -1,5 +1,6 @@
 package com.sckw.order.model.vo.req;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.Pattern;
 import lombok.Getter;
 import lombok.Setter;
@@ -21,7 +22,7 @@ public class AddTransportDemandDraftParam {
     /**
      * 商品名称
      */
-    @Length(max = 50, message = "商品名称最多支持200字")
+    @Length(max = 50, message = "商品名称最多支持50字")
     private String name;
 
     /**
@@ -55,6 +56,7 @@ public class AddTransportDemandDraftParam {
     /**
      * 截止时间(yyyy-MM-dd)
      */
+    @JsonFormat(pattern="yyyy-MM-dd", timezone = "GMT+8")
     private LocalDate deadline;
 
     /**

+ 3 - 1
sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/AddTransportDemandParam.java

@@ -1,5 +1,6 @@
 package com.sckw.order.model.vo.req;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
@@ -22,7 +23,7 @@ public class AddTransportDemandParam {
     /**
      * 商品名称
      */
-    @Length(max = 50, message = "商品名称最多支持200字")
+    @Length(max = 50, message = "商品名称最多支持50字")
     @NotBlank(message = "商品名称不能为空")
     private String name;
 
@@ -59,6 +60,7 @@ public class AddTransportDemandParam {
     /**
      * 截止时间(yyyy-MM-dd)
      */
+    @JsonFormat(pattern="yyyy-MM-dd", timezone = "GMT+8")
     private LocalDate deadline;
 
     /**

+ 49 - 0
sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/ExportTransportDemandParam.java

@@ -0,0 +1,49 @@
+package com.sckw.order.model.vo.req;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.List;
+
+/**
+ * @desc: 运需导出请求参数
+ * @author: yzc
+ * @date: 2023-07-26 10:07
+ */
+@Getter
+@Setter
+@ToString
+public class ExportTransportDemandParam {
+
+    /**
+     * 关键词模糊匹配 商品名
+     */
+    private String keywords;
+
+    /**
+     * 商品类型集合
+     */
+    private List<String> goodsTypes;
+
+    /**
+     * 装货地区code
+     */
+    private Integer loadAreaCode;
+
+    /**
+     * 装货地区等级
+     */
+    private Integer loadAreaLevel;
+
+    /**
+     * 卸货地区code
+     */
+    private Integer unloadAreaCode;
+
+    /**
+     * 卸货地区等级
+     */
+    private Integer unloadAreaLevel;
+
+}

+ 63 - 0
sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/SelectTransportDemandParam.java

@@ -0,0 +1,63 @@
+package com.sckw.order.model.vo.req;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.core.model.page.PageRequest;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.Date;
+
+/**
+ * @desc: 运需分页查询请求参数
+ * @author: yzc
+ * @date: 2023-07-26 9:59
+ */
+@Getter
+@Setter
+@ToString
+public class SelectTransportDemandParam extends PageRequest {
+
+    /**
+     * 关键词模糊匹配 商品名
+     */
+    private String keywords;
+
+    /**
+     * 创建时间开始
+     */
+    @JsonFormat(pattern="yyyy-MM-dd", timezone = "GMT+8")
+    private Date startCreateTime;
+
+    /**
+     * 创建时间结束
+     */
+    @JsonFormat(pattern="yyyy-MM-dd", timezone = "GMT+8")
+    private Date endCreateTime;
+
+    /**
+     * 装货地区code
+     */
+    private Integer loadAreaCode;
+
+    /**
+     * 装货地区等级
+     */
+    private Integer loadAreaLevel;
+
+    /**
+     * 卸货地区code
+     */
+    private Integer unloadAreaCode;
+
+    /**
+     * 卸货地区等级
+     */
+    private Integer unloadAreaLevel;
+
+    /**
+     * 运需状态
+     */
+    private Integer status;
+
+}

+ 57 - 0
sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/StatisticTransportDemandParam.java

@@ -0,0 +1,57 @@
+package com.sckw.order.model.vo.req;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.Date;
+
+/**
+ * @desc: 运需统计请求参数
+ * @author: yzc
+ * @date: 2023-07-26 10:07
+ */
+@Getter
+@Setter
+@ToString
+public class StatisticTransportDemandParam {
+
+    /**
+     * 关键词模糊匹配 商品名
+     */
+    private String keywords;
+
+    /**
+     * 创建时间开始
+     */
+    @JsonFormat(pattern="yyyy-MM-dd", timezone = "GMT+8")
+    private Date startCreateTime;
+
+    /**
+     * 创建时间结束
+     */
+    @JsonFormat(pattern="yyyy-MM-dd", timezone = "GMT+8")
+    private Date endCreateTime;
+
+    /**
+     * 装货地区code
+     */
+    private Integer loadAreaCode;
+
+    /**
+     * 装货地区等级
+     */
+    private Integer loadAreaLevel;
+
+    /**
+     * 卸货地区code
+     */
+    private Integer unloadAreaCode;
+
+    /**
+     * 卸货地区等级
+     */
+    private Integer unloadAreaLevel;
+
+}

+ 20 - 0
sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/TransportDemandSquaresParam.java

@@ -0,0 +1,20 @@
+package com.sckw.order.model.vo.req;
+
+import com.sckw.core.model.page.PageRequest;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * @desc: TODO
+ * @author: yzc
+ * @date: 2023-07-26 10:27
+ */
+@Getter
+@Setter
+@ToString
+public class TransportDemandSquaresParam extends PageRequest {
+
+
+
+}

+ 99 - 0
sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/req/UpdateTransportDemandParam.java

@@ -1,8 +1,14 @@
 package com.sckw.order.model.vo.req;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import org.hibernate.validator.constraints.Length;
+
+import java.time.LocalDate;
 
 /**
  * @desc: 更新运需请求参数
@@ -13,4 +19,97 @@ import lombok.ToString;
 @Setter
 @ToString
 public class UpdateTransportDemandParam {
+
+    @NotNull(message = "运需id不能为空")
+    private Long id;
+
+    /**
+     * 商品名称
+     */
+    @Length(max = 50, message = "商品名称最多支持50字")
+    private String name;
+
+    /**
+     * 商品分类
+     */
+    private String goodsType;
+
+    /**
+     * 商品规格
+     */
+    @Length(max = 20, message = "商品规格最多支持20字")
+    private String spec;
+
+    /**
+     * 交易方式(预付款、货到付款、线下付款)
+     */
+    private String trading;
+
+    /**
+     * 运需单价
+     */
+    @Length(max = 20, message = "运需单价最多支持20字")
+    private String price;
+
+    /**
+     * 运输总量
+     */
+    @Length(max = 20, message = "运输总量最多支持20字")
+    private String amount;
+
+    /**
+     * 截止时间(yyyy-MM-dd)
+     */
+    @JsonFormat(pattern="yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate deadline;
+
+    /**
+     * 联系人姓名
+     */
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    @Pattern(regexp = "^1[3456789]\\d{9}$", message = "非法手机号格式")
+    private String phone;
+
+    /**
+     * 装货区域code
+     */
+    private Integer loadAreaCode;
+
+    /**
+     * 装货区域名称
+     */
+    private String loadAreaName;
+
+    /**
+     * 装货详细地址
+     */
+    @Length(max = 255, message = "装货详细地址最多支持255字")
+    private String loadDetailAddress;
+
+    /**
+     * 卸货区域code
+     */
+    private Integer unloadAreaCode;
+
+    /**
+     * 卸货区域名称
+     */
+    private String unloadAreaName;
+
+    /**
+     * 卸货详细地址
+     */
+    @Length(max = 255, message = "卸货详细地址最多支持255字")
+    private String unloadDetailAddress;
+
+    /**
+     * 备注
+     */
+    @Length(max = 200, message = "备注最多支持200字")
+    private String remark;
+
 }

+ 148 - 0
sckw-modules/sckw-order/src/main/java/com/sckw/order/model/vo/res/TransportDemandDetailRes.java

@@ -0,0 +1,148 @@
+package com.sckw.order.model.vo.res;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDate;
+import java.util.Date;
+
+/**
+ * @desc: 运需详情响应
+ * @author: yzc
+ * @date: 2023-07-26 9:48
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class TransportDemandDetailRes {
+
+    private Long id;
+
+    /**
+     * 商品名称
+     */
+    private String name;
+
+    /**
+     * 商品分类
+     */
+    private String goodsType;
+
+    /**
+     * 商品分类Label
+     */
+    private String goodsTypeLabel;
+
+    /**
+     * 商品规格
+     */
+    private String spec;
+
+    /**
+     * 交易方式(预付款、货到付款、线下付款)
+     */
+    private String trading;
+
+    /**
+     * 交易方式Label
+     */
+    private String tradingLabel;
+
+    /**
+     * 运需单价
+     */
+    private String price;
+
+    /**
+     * 运输总量
+     */
+    private String amount;
+
+    /**
+     * 截止时间(yyyy-MM-dd)
+     */
+    @JsonFormat(pattern="yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDate deadline;
+
+    /**
+     * 联系人姓名
+     */
+    private String contacts;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 装货区域code
+     */
+    private Integer loadAreaCode;
+
+    /**
+     * 装货区域名称
+     */
+    private String loadAreaName;
+
+    /**
+     * 装货详细地址
+     */
+    private String loadDetailAddress;
+
+    /**
+     * 卸货区域code
+     */
+    private Integer unloadAreaCode;
+
+    /**
+     * 卸货区域名称
+     */
+    private String unloadAreaName;
+
+    /**
+     * 卸货详细地址
+     */
+    private String unloadDetailAddress;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 状态label
+     */
+    private String statusLabel;
+
+    /**
+     * 创建人
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    private Long updateBy;
+
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+}

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

@@ -27,8 +27,8 @@ import com.sckw.order.model.vo.res.OrderDetailRes;
 import com.sckw.order.model.vo.res.UnitInfoDetailRes;
 import com.sckw.payment.api.dubbo.PayCenterDubboService;
 import com.sckw.payment.api.model.constant.ChannelEnum;
-import com.sckw.payment.api.model.dto.R;
 import com.sckw.payment.api.model.dto.WalletDto;
+import com.sckw.payment.api.model.dto.common.R;
 import com.sckw.product.api.dubbo.GoodsInfoService;
 import com.sckw.product.api.model.KwpGoods;
 import com.sckw.stream.model.SckwBusSum;

+ 119 - 5
sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTransportDemandService.java

@@ -1,13 +1,20 @@
 package com.sckw.order.serivce;
 
+import com.sckw.core.model.page.PageResult;
+import com.sckw.core.model.vo.TableStatisticRes;
+import com.sckw.core.utils.BeanUtils;
+import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.order.dao.KwoTransportDemandMapper;
-import com.sckw.order.model.vo.req.AddTransportDemandDraftParam;
-import com.sckw.order.model.vo.req.AddTransportDemandParam;
-import com.sckw.order.model.vo.req.UpdateTransportDemandParam;
+import com.sckw.order.model.KwoTransportDemand;
+import com.sckw.order.model.dto.TransportDemandExport;
+import com.sckw.order.model.vo.req.*;
+import com.sckw.order.model.vo.res.TransportDemandDetailRes;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @desc: 运需service
  * @author: yzc
@@ -21,19 +28,126 @@ public class KwoTransportDemandService {
     private final KwoTransportDemandMapper kwoTransportDemandMapper;
 
 
+    /**
+     * @desc: 添加草稿
+     * @author: yzc
+     * @date: 2023-07-26 10:32
+     * @Param param:
+     * @return: void
+     */
     public void addDraft(AddTransportDemandDraftParam param) {
-
+        KwoTransportDemand transportDemand = BeanUtils.copyProperties(param, KwoTransportDemand.class);
+        transportDemand.setEntId(LoginUserHolder.getEntId()).setStatus(0);
+        kwoTransportDemandMapper.insert(transportDemand);
     }
 
+    /**
+     * @desc: 添加上架
+     * @author: yzc
+     * @date: 2023-07-26 10:32
+     * @Param param:
+     * @return: void
+     */
     public void addShelves(AddTransportDemandParam param) {
 
     }
 
-    public String detail(Long id) {
+    /**
+     * @desc: 运需详情
+     * @author: yzc
+     * @date: 2023-07-26 10:32
+     * @Param id:
+     * @return: com.sckw.order.model.vo.res.TransportDemandDetailRes
+     */
+    public TransportDemandDetailRes detail(Long id) {
         return null;
     }
 
+    /**
+     * @desc: 运需修改
+     * @author: yzc
+     * @date: 2023-07-26 10:33
+     * @Param param:
+     * @return: void
+     */
     public void update(UpdateTransportDemandParam param) {
 
     }
+
+    /**
+     * @desc: 运需分页查询
+     * @author: yzc
+     * @date: 2023-07-26 10:33
+     * @Param param:
+     * @return: com.sckw.core.model.page.PageResult
+     */
+    public PageResult select(SelectTransportDemandParam param) {
+        return null;
+    }
+
+    /**
+     * @desc: 运需统计
+     * @author: yzc
+     * @date: 2023-07-26 10:33
+     * @Param param:
+     * @return: com.sckw.core.model.vo.TableStatisticRes
+     */
+    public TableStatisticRes statistic(StatisticTransportDemandParam param) {
+        return null;
+    }
+
+    /**
+     * @desc: 运需导出
+     * @author: yzc
+     * @date: 2023-07-26 10:33
+     * @Param param:
+     * @return: java.util.List<com.sckw.order.model.dto.TransportDemandExport>
+     */
+    public List<TransportDemandExport> export(ExportTransportDemandParam param) {
+        return null;
+    }
+
+    /**
+     * @desc: 运需上架
+     * @author: yzc
+     * @date: 2023-07-26 10:34
+     * @Param id:
+     * @return: void
+     */
+    public void putOnShelves(Long id) {
+
+    }
+
+    /**
+     * @desc: 运需批量下架
+     * @author: yzc
+     * @date: 2023-07-26 10:34
+     * @Param id:
+     * @return: void
+     */
+    public void batchTakeOffShelves(List<Long> ids) {
+
+    }
+
+    /**
+     * @desc: 运需批量删除
+     * @author: yzc
+     * @date: 2023-07-26 10:34
+     * @Param id:
+     * @return: void
+     */
+    public void batchDelete(List<Long> ids) {
+
+    }
+
+    /**
+     * @desc: 运需广场列表
+     * @author: yzc
+     * @date: 2023-07-26 10:34
+     * @Param param:
+     * @return: com.sckw.core.model.page.PageResult
+     */
+    public PageResult demandSquaresList(TransportDemandSquaresParam param) {
+        return null;
+    }
 }

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

@@ -293,7 +293,7 @@ public class KwpGoodsService {
      */
     private void judgeParameters(UpdateGoodsParam param) {
         if (StringUtils.isBlank(param.getName())) {
-            throw new BusinessException("商品名称不能为空!");
+            throw new BusinessException("商品名称不能为空!");
         }
         if (StringUtils.isBlank(param.getGoodsType())) {
             throw new BusinessException("商品类型不能为空!");