提交订单记录留言

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserDeliverOrderController.java

@@ -225,7 +225,7 @@ public class UserDeliverOrderController extends BaseApiController {
     if (null == orderSettleVO.getAddr()) {
       return AjaxResult.error("请填写收货地址");
     }
-    String orderId = userDeliverOrderService.submitOrder(userId, orderSettleVO);
+    String orderId = userDeliverOrderService.submitOrder(userId,order.getMemo(), orderSettleVO);
     JSONObject jsonObject = new JSONObject();
     jsonObject.put("orderId", orderId);
     if (orderSettleVO.getPayAmt() > 0) {

mp-service/src/main/java/com/qs/mp/user/service/IUserDeliverOrderService.java

@@ -32,7 +32,7 @@ public interface IUserDeliverOrderService extends IService<UserDeliverOrder> {
 	 * @param orderSettleVO
 	 * @return
 	 */
-	String submitOrder(Long userId, DeliverOrderSettleVO orderSettleVO);
+	String submitOrder(Long userId,String memo, DeliverOrderSettleVO orderSettleVO);
 
 	/**
 	 * 取消订单

mp-service/src/main/java/com/qs/mp/user/service/impl/UserDeliverOrderServiceImpl.java

@@ -67,7 +67,7 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
 
   @Override
   @Transactional
-  public String submitOrder(Long userId, DeliverOrderSettleVO orderSettleVO) {
+  public String submitOrder(Long userId, String memo, DeliverOrderSettleVO orderSettleVO) {
     UserDeliverOrder userDeliverOrder = new UserDeliverOrder();
     userDeliverOrder.setOrderId(bizIdGenerator.newIdWithUidSharding(String.valueOf(userId)));
     userDeliverOrder.setUserId(userId);
@@ -81,7 +81,7 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
     userDeliverOrder.setOrderNum(orderSettleVO.getPrizeList().stream().mapToInt(UserPrizeStorage::getGoodsNum).sum());
     userDeliverOrder.setPayAmt(orderSettleVO.getPayAmt());
     userDeliverOrder.setFreightAmt(orderSettleVO.getFreightAmt());
-    userDeliverOrder.setMemo(null);
+    userDeliverOrder.setMemo(memo);
     if (orderSettleVO.getPayAmt() > 0) {
       userDeliverOrder.setStatus(DeliverOrderStatusEnum.NOT_PAY);
     } else {