订单操作历史增加orderSn

ruoyi-mall/src/main/java/com/cyl/h5/controller/H5OrderController.java

@@ -149,7 +149,7 @@ public class H5OrderController {
             return ResponseEntity.ok(service.orderPay(req));
         }catch (Exception e){
             log.error("支付方法异常", e);
-            throw new RuntimeException("支付失败");
+            throw new RuntimeException(e.getMessage());
         }finally {
             try{
                 redisService.unLock(redisKey,redisValue);

ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java

@@ -204,6 +204,7 @@ public class H5OrderService {
         // 保存订单操作记录
         OrderOperateHistory orderOperateHistory = new OrderOperateHistory();
         orderOperateHistory.setOrderId(orderId);
+        orderOperateHistory.setOrderSn(order.getOrderSn());
         orderOperateHistory.setOperateMan(member.getId() + "");
         orderOperateHistory.setOrderStatus(Constants.OrderStatus.NOTPAID);
         orderOperateHistory.setCreateTime(optTime);
@@ -374,6 +375,7 @@ public class H5OrderService {
         //创建订单操作记录
         OrderOperateHistory optHistory = new OrderOperateHistory();
         optHistory.setOrderId(order.getId());
+        optHistory.setOrderSn(order.getOrderSn());
         optHistory.setOperateMan("用户");
         optHistory.setOrderStatus(Constants.H5OrderStatus.COMPLETED);
         optHistory.setCreateTime(optDate);
@@ -419,6 +421,7 @@ public class H5OrderService {
             item.setUpdateBy(userId);
             OrderOperateHistory history = new OrderOperateHistory();
             history.setOrderId(item.getId());
+            history.setOrderSn(item.getOrderSn());
             history.setOperateMan("用户");
             history.setOrderStatus(Constants.H5OrderStatus.CLOSED);
             history.setCreateTime(optDate);
@@ -557,6 +560,7 @@ public class H5OrderService {
 
                 OrderOperateHistory optHistory = new OrderOperateHistory();
                 optHistory.setOrderId(order.getId());
+                optHistory.setOrderSn(order.getOrderSn());
                 optHistory.setOperateMan("系统");
                 optHistory.setOrderStatus(OrderStatus.COMPLETE.getType());
                 optHistory.setCreateTime(optDate);
@@ -649,6 +653,7 @@ public class H5OrderService {
         //创建订单操作记录
         OrderOperateHistory optHistory = new OrderOperateHistory();
         optHistory.setOrderId(order.getId());
+        optHistory.setOrderSn(order.getOrderSn());
         optHistory.setOperateMan("用户");
         optHistory.setOrderStatus(11);
         optHistory.setCreateTime(optDate);

ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderOperateHistory.java

@@ -24,6 +24,10 @@ public class OrderOperateHistory extends BaseAudit {
     @Excel(name = "订单id")
     private Long orderId;
 
+    @ApiModelProperty("订单号")
+    @Excel(name = "订单号")
+    private String orderSn;
+
     @ApiModelProperty("操作人：用户；系统；后台管理员")
     @Excel(name = "操作人：用户；系统；后台管理员")
     private String operateMan;

ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderOperateHistoryQuery.java

@@ -12,8 +12,8 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel(description="订单操作历史记录 查询 对象")
 @Data
 public class OrderOperateHistoryQuery {
-    @ApiModelProperty("订单id 精确匹配")
+    @ApiModelProperty("订单号 精确匹配")
-    private Long orderId;
+    private String orderSn;
 
     @ApiModelProperty("操作人：用户；系统；后台管理员 精确匹配")
     private String operateMan;

ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderOperateHistoryVO.java

@@ -15,6 +15,9 @@ public class OrderOperateHistoryVO extends BaseAudit {
    /** 订单id */
     @Excel(name = "订单id")
     private Long orderId;
+    /** 订单号 */
+    @Excel(name = "订单号")
+    private String orderSn;
    /** 操作人：用户；系统；后台管理员 */
     @Excel(name = "操作人：用户；系统；后台管理员")
     private String operateMan;

ruoyi-mall/src/main/java/com/cyl/manager/oms/service/AftersaleService.java

@@ -242,6 +242,7 @@ public class AftersaleService {
         //要创建的订单操作记录，status后续判断再设置
         OrderOperateHistory optHistory = new OrderOperateHistory();
         optHistory.setOrderId(order.getId());
+        optHistory.setOrderSn(order.getOrderSn());
         optHistory.setOperateMan("后台管理员");
         optHistory.setCreateTime(optDate);
         optHistory.setCreateBy(user.getUserId());

ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderOperateHistoryService.java

@@ -2,6 +2,8 @@ package com.cyl.manager.oms.service;
 
 import java.util.List;
 import java.time.LocalDateTime;
+
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
@@ -46,9 +48,9 @@ public class OrderOperateHistoryService extends ServiceImpl<OrderOperateHistoryM
             PageHelper.startPage(page.getPageNumber() + 1, page.getPageSize());
         }
         QueryWrapper<OrderOperateHistory> qw = new QueryWrapper<>();
-        Long orderId = query.getOrderId();
+        String orderSn = query.getOrderSn();
-        if (orderId != null) {
+        if (StrUtil.isNotBlank(orderSn)) {
-            qw.eq("order_id", orderId);
+            qw.eq("order_sn", orderSn);
         }
         String operateMan = query.getOperateMan();
         if (!StringUtils.isEmpty(operateMan)) {
@@ -62,6 +64,7 @@ public class OrderOperateHistoryService extends ServiceImpl<OrderOperateHistoryM
         if (!StringUtils.isEmpty(note)) {
             qw.eq("note", note);
         }
+        qw.orderByDesc("create_time");
         return orderOperateHistoryMapper.selectList(qw);
     }
 

ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java

@@ -328,7 +328,7 @@ public class OrderService {
         //创建新的发货记录
         this.createDeliveryHistory(request, userId, optDate);
         //创建订单操作记录
-        this.createOrderOptHistory(order.getId(), orderStatus, userId, optDate);
+        this.createOrderOptHistory(order.getId(), order.getOrderSn(), orderStatus, userId, optDate);
         return "发货成功";
     }
 
@@ -358,9 +358,10 @@ public class OrderService {
      * @param userId 操作人
      * @param optDate 操作时间
      */
-    private void createOrderOptHistory(Long orderId, Integer orderStatus, Long userId, LocalDateTime optDate){
+    private void createOrderOptHistory(Long orderId, String orderSn, Integer orderStatus, Long userId, LocalDateTime optDate){
         OrderOperateHistory optHistory = new OrderOperateHistory();
         optHistory.setOrderId(orderId);
+        optHistory.setOrderSn(orderSn);
         optHistory.setOperateMan(userId + "");
         optHistory.setOrderStatus(orderStatus);
         optHistory.setCreateTime(optDate);

ruoyi-mall/src/main/resources/mapper/oms/OrderOperateHistoryMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="OrderOperateHistory" id="OrderOperateHistoryResult">
         <result property="id" column="id"/>
         <result property="orderId" column="order_id"/>
+        <result property="orderSn" column="order_sn"/>
         <result property="operateMan" column="operate_man"/>
         <result property="orderStatus" column="order_status"/>
         <result property="note" column="note"/>