订单模块调整

tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/api/order/dto/TradeOrderRespDTO.java

@@ -18,7 +18,7 @@ public class TradeOrderRespDTO {
     private Long id;
 
     //订单流水号
-    private String no;
+    private String orderNum;
 
     //订单类型
     private Integer type; // 参见 TradeOrderTypeEnum 枚举

tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/enums/aftersale/AfterSaleStatusEnum.java

@@ -20,40 +20,15 @@ import static cn.hutool.core.util.ArrayUtil.firstMatch;
 @Getter
 public enum AfterSaleStatusEnum implements ArrayValuable<Integer> {
 
-    /**
+    APPLY(10,"等待审核", ""), // 有赞的状态提示：退款申请待商家处理
-     * 【申请售后】
+    SELLER_AGREE(20, "审核通过", ""), // 有赞的状态提示：请退货并填写物流信息
-     */
+    BUYER_DELIVERY(30,"已完成", ""), // 有赞的状态提示：退货退款申请待商家处理
-    APPLY(10,"申请中", "会员申请退款"), // 有赞的状态提示：退款申请待商家处理
+    WAIT_REFUND(40, "已取消", ""), // 有赞的状态提示：无（有赞无该状态）
-    /**
+    COMPLETE(50, "已拒绝", ""), // 有赞的状态提示：退款成功
-     * 卖家通过售后；【商品待退货】
+
-     */
-    SELLER_AGREE(20, "卖家通过", "商家同意退款"), // 有赞的状态提示：请退货并填写物流信息
-    /**
-     * 买家已退货，等待卖家收货；【商家待收货】
-     */
-    BUYER_DELIVERY(30,"待卖家收货", "会员填写退货物流信息"), // 有赞的状态提示：退货退款申请待商家处理
-    /**
-     * 卖家已收货，等待平台退款；等待退款【等待退款】
-     */
-    WAIT_REFUND(40, "等待平台退款", "商家收货"), // 有赞的状态提示：无（有赞无该状态）
-    /**
-     * 完成退款【退款成功】
-     */
-    COMPLETE(50, "完成", "商家确认退款"), // 有赞的状态提示：退款成功
-    /**
-     * 【买家取消】
-     */
-    BUYER_CANCEL(61, "买家取消售后", "会员取消退款"), // 有赞的状态提示：退款关闭
-    /**
-     * 卖家拒绝售后；商家拒绝【商家拒绝】
-     */
-    SELLER_DISAGREE(62,"卖家拒绝", "商家拒绝退款"), // 有赞的状态提示：商家不同意退款申请
-    /**
-     * 卖家拒绝收货，终止售后；【商家拒收货】
-     */
-    SELLER_REFUSE(63,"卖家拒绝收货", "商家拒绝收货"), // 有赞的状态提示：商家拒绝收货，不同意退款
     ;
 
+
     public static final Integer[] ARRAYS = Arrays.stream(values()).map(AfterSaleStatusEnum::getStatus).toArray(Integer[]::new);
 
     /**

tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/aftersale/AfterSaleController.java

@@ -61,9 +61,9 @@ public class AfterSaleController {
         return success(AfterSaleConvert.INSTANCE.convertPage(pageResult, null));
     }
 
-    @GetMapping("/get-detail")
     // 获得售后订单详情
     // 售后编号 - 必填 - 示例: 1
+    @GetMapping("/get-detail")
     @PreAuthorize("@ss.hasPermission('trade:after-sale:query')")
     public CommonResult<AfterSaleDetailRespVO> getOrderDetail(@RequestParam("id") Long id) {
         // 查询订单

tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/dal/mysql/order/TradeOrderMapper.java

@@ -33,6 +33,7 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
         return selectPage(reqVO, new LambdaQueryWrapperX<TradeOrderDO>()
                 .likeIfPresent(TradeOrderDO::getMerchantName, reqVO.getMerchantName())
                 .eqIfPresent(TradeOrderDO::getOrderTerminal, reqVO.getOrderTerminal())
+                .eqIfPresent(TradeOrderDO::getOrderStatus, reqVO.getOrderStatus())
                 .eqIfPresent(TradeOrderDO::getFinanceStatus, reqVO.getFinanceStatus())
                 .eqIfPresent(TradeOrderDO::getAfterSaleStatus, reqVO.getAfterSaleStatus())
                 .betweenIfPresent(TradeOrderDO::getCreateTime, reqVO.getCreateTime())

tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/aftersale/AfterSaleServiceImpl.java

@@ -205,7 +205,7 @@ public class AfterSaleServiceImpl implements AfterSaleService {
         AfterSaleDO afterSale = validateAfterSaleAuditable(auditReqVO.getId());
 
         // 更新售后单的状态
-        Integer newStatus = AfterSaleStatusEnum.SELLER_DISAGREE.getStatus();
+        Integer newStatus = AfterSaleStatusEnum.APPLY.getStatus();
         updateAfterSaleStatus(afterSale.getId(), AfterSaleStatusEnum.APPLY.getStatus(), new AfterSaleDO()
                 .setStatus(newStatus).setAuditUserId(userId).setAuditTime(LocalDateTime.now())
                 .setAuditReason(auditReqVO.getAuditReason()));
@@ -305,12 +305,12 @@ public class AfterSaleServiceImpl implements AfterSaleService {
 
         // 更新售后单的状态
         updateAfterSaleStatus(afterSale.getId(), AfterSaleStatusEnum.BUYER_DELIVERY.getStatus(), new AfterSaleDO()
-                .setStatus(AfterSaleStatusEnum.SELLER_REFUSE.getStatus()).setReceiveTime(LocalDateTime.now())
+                .setStatus(AfterSaleStatusEnum.APPLY.getStatus()).setReceiveTime(LocalDateTime.now())
                 .setReceiveReason(refuseReqVO.getRefuseMemo()));
 
         // 记录售后日志
         AfterSaleLogUtils.setAfterSaleInfo(afterSale.getId(), afterSale.getStatus(),
-                AfterSaleStatusEnum.SELLER_REFUSE.getStatus(),
+                AfterSaleStatusEnum.APPLY.getStatus(),
                 MapUtil.of("reason", refuseReqVO.getRefuseMemo()));
 
         // TODO 发送售后消息
@@ -398,11 +398,11 @@ public class AfterSaleServiceImpl implements AfterSaleService {
 
         // 更新售后单的状态为【已取消】
         updateAfterSaleStatus(afterSale.getId(), afterSale.getStatus(), new AfterSaleDO()
-                .setStatus(AfterSaleStatusEnum.BUYER_CANCEL.getStatus()));
+                .setStatus(AfterSaleStatusEnum.APPLY.getStatus()));
 
         // 记录售后日志
         AfterSaleLogUtils.setAfterSaleInfo(afterSale.getId(), afterSale.getStatus(),
-                AfterSaleStatusEnum.BUYER_CANCEL.getStatus());
+                AfterSaleStatusEnum.APPLY.getStatus());
 
         // TODO 发送售后消息