From 4227179c564e01fd98975ea0c94b28e034bece07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=9B=BD=E4=BA=AC?= <565321099@qq.com>
Date: Tue, 24 Jun 2025 19:55:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=B7=A5=E5=8D=95=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zbkj/common/request/TradeOrderRespDTO.java   | 16 ----------------
 .../service/impl/StoreOrderServiceImpl.java      |  2 ++
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/crmeb-common/src/main/java/com/zbkj/common/request/TradeOrderRespDTO.java b/crmeb-common/src/main/java/com/zbkj/common/request/TradeOrderRespDTO.java
index 9bf09db..0e2558f 100644
--- a/crmeb-common/src/main/java/com/zbkj/common/request/TradeOrderRespDTO.java
+++ b/crmeb-common/src/main/java/com/zbkj/common/request/TradeOrderRespDTO.java
@@ -22,19 +22,15 @@ public class TradeOrderRespDTO {
     private String channelCode;
     private String channelName;
     @ApiModelProperty("业务归属部门code")
-    @NotBlank(message = "业务归属部门code不能为空")
     private String deptCode;
     @ApiModelProperty("业务员")
-    @NotBlank(message = "业务员不能为空")
     private String businessMan;
     @ApiModelProperty("平台单号")
     private String platformCode;
 
     @ApiModelProperty("下单商户/会员")
-    @NotBlank(message = "下单商户或购物会员号不能为空")
     private String buyVip;
     @ApiModelProperty("下单时间")
-    @NotBlank(message = "下单时间不能为空")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime orderTime;
 
@@ -45,43 +41,31 @@ public class TradeOrderRespDTO {
     private String proofPath;
     @ApiModelProperty("凭证名称")
     private String proofName;
-    @Size(max = 100, message = "买家备注长度不能超过100字")
     @ApiModelProperty("买家备注")
     private String userRemark;
-    @Size(max = 100, message = "卖家备注长度不能超过100字")
     @ApiModelProperty("卖家备注")
     private String salerRemark;
     @ApiModelProperty("发货仓库code")
-    @NotBlank(message = "发货仓库code不能为空")
     private String warehouseCode;
-    @NotNull(message = "订单商品不能为空")
     @ApiModelProperty("订单商品")
     private List<TradeOrderDetailRespDTO> item;
-    @NotBlank(message = "收货人名称不能为空")
     @ApiModelProperty("收货人")
     private String receiverName;
-    @NotBlank(message = "收货人手机号不能为空")
     @ApiModelProperty("收货人手机号")
     private String receiverPhone;
-    @NotBlank(message = "收货人地址不能为空")
     @ApiModelProperty("收货人地址")
     private String receiverAddress;
     @ApiModelProperty("收货人城市")
-    @NotBlank(message = "收货人城市不能为空")
     private String receiverCity;
     @ApiModelProperty("收货人区县")
-    @NotBlank(message = "收货人区县不能为空")
     private String receiverDistrict;
     @ApiModelProperty("收货人省份")
-    @NotBlank(message = "收货人省份不能为空")
     private String receiverProvince;
 
 
     @ApiModelProperty("发票抬头")
-    @NotBlank(message = "发票抬头不能为空")
     private String invoiceTitle;
     @ApiModelProperty("收票人")
-    @NotBlank(message = "收票人不能为空")
     private String receiver;
 
     @ApiModelProperty("纳税人标识号")
diff --git a/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreOrderServiceImpl.java b/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreOrderServiceImpl.java
index d07c97f..33ba74e 100644
--- a/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreOrderServiceImpl.java
+++ b/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreOrderServiceImpl.java
@@ -1879,9 +1879,11 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderDao, StoreOrder
         storeOrder.setProTotalPrice(totalPrice);
         storeOrder.setHasSync(1);
         storeOrder.setOutTradeNo("wx"+orderNo);
+        storeOrder.setMark(request.getUserRemark()==null?"":request.getUserRemark());
         dao.insert(storeOrder);
 
         storeOrderInfos.forEach(info -> info.setOrderId(storeOrder.getId()));
+        storeOrderInfoService.saveOrderInfos(storeOrderInfos);
         // 生成订单日志
         storeOrderStatusService.createLog(storeOrder.getId(), Constants.ORDER_STATUS_CACHE_CREATE_ORDER, "订单生成");
         return true;