配送售后退货退款海博库存没加回去处理

yami-shop-api/src/main/java/com/yami/shop/api/controller/OrderRefundController.java

@@ -244,25 +244,10 @@ public class OrderRefundController {
         }
 
         //生成退款记录
-        //生成申请退款记录
-        OrderRefundRecord orderRefundRecord = new OrderRefundRecord();
-        orderRefundRecord.setOrderRefundId(orderRefund.getRefundId());
-        orderRefundRecord.setInstructions(newOrderRefund.getBuyerReason());
-        orderRefundRecord.setCreateTime(new Date());
-        orderRefundRecord.setUpdateTime(new Date());
-        orderRefundRecord.setAuditStatus(1);
-        orderRefundRecord.setSort(1);
-        orderRefundRecordMapper.insert(orderRefundRecord);
+        addOrderRefundRecord(orderRefund.getRefundId(), 1, 1, newOrderRefund.getBuyerReason());
 
         //生成待商家审核记录
-        OrderRefundRecord orderRefundRecord1 = new OrderRefundRecord();
-        orderRefundRecord1.setOrderRefundId(orderRefund.getRefundId());
-        orderRefundRecord1.setInstructions("你的服务单已申请成功，待商家审核");
-        orderRefundRecord1.setCreateTime(new Date());
-        orderRefundRecord1.setUpdateTime(new Date());
-        orderRefundRecord1.setAuditStatus(2);
-        orderRefundRecord1.setSort(2);
-        orderRefundRecordMapper.insert(orderRefundRecord1);
+        addOrderRefundRecord(orderRefund.getRefundId(), 2, 2, "的服务单已申请成功，待商家审核");
 
         orderRefundService.removeById(refundId);
         orderRefundSkuMapper.delete(new LambdaQueryWrapper<OrderRefundSku>().eq(OrderRefundSku::getOrderRefundId, refundId));
@@ -420,25 +405,10 @@ public class OrderRefundController {
         }
 
         //生成退款记录
-        //生成申请退款记录
-        OrderRefundRecord orderRefundRecord = new OrderRefundRecord();
-        orderRefundRecord.setOrderRefundId(orderRefund.getRefundId());
-        orderRefundRecord.setInstructions(newOrderRefund.getBuyerReason());
-        orderRefundRecord.setCreateTime(new Date());
-        orderRefundRecord.setUpdateTime(new Date());
-        orderRefundRecord.setAuditStatus(1);
-        orderRefundRecord.setSort(1);
-        orderRefundRecordMapper.insert(orderRefundRecord);
+        addOrderRefundRecord(orderRefund.getRefundId(), 1, 1, newOrderRefund.getBuyerReason());
 
         //生成待商家审核记录
-        OrderRefundRecord orderRefundRecord1 = new OrderRefundRecord();
-        orderRefundRecord1.setOrderRefundId(orderRefund.getRefundId());
-        orderRefundRecord1.setInstructions("你的服务单已申请成功，待商家审核");
-        orderRefundRecord1.setCreateTime(new Date());
-        orderRefundRecord1.setUpdateTime(new Date());
-        orderRefundRecord1.setAuditStatus(2);
-        orderRefundRecord1.setSort(2);
-        orderRefundRecordMapper.insert(orderRefundRecord1);
+        addOrderRefundRecord(orderRefund.getRefundId(), 2, 2, "的服务单已申请成功，待商家审核");
 
         //创建海博退款单
         log.info("创建海博退款单，生成海博退款单信息{}", orderRefund);
@@ -687,15 +657,8 @@ public class OrderRefundController {
         }
         orderRefundService.changeStatus(refundSn, 40);
 
-        OrderRefundRecord orderRefundRecord = new OrderRefundRecord();
-        orderRefundRecord.setOrderRefundId(orderRefund.getRefundId());
-        orderRefundRecord.setInstructions("用户主动撤回申请，退货退款关闭。");
-        Date date = new Date();
-        orderRefundRecord.setCreateTime(date);
-        orderRefundRecord.setUpdateTime(date);
-        orderRefundRecord.setAuditStatus(4);
-        orderRefundRecord.setSort(4);
-        orderRefundRecordMapper.insert(orderRefundRecord);
+        addOrderRefundRecord(orderRefund.getRefundId(), 4, 4, "用户主动撤回申请，退货退款关闭。");
+
         return ResponseEntity.ok("撤销成功");
     }
 
@@ -894,4 +857,16 @@ public class OrderRefundController {
             }
         }
     }
+
+    private void addOrderRefundRecord(Long refundId, Integer auditStatus, Integer sort, String instructions) {
+        OrderRefundRecord orderRefundRecord = new OrderRefundRecord();
+        orderRefundRecord.setOrderRefundId(refundId);
+        orderRefundRecord.setInstructions(instructions);
+        Date date = new Date();
+        orderRefundRecord.setCreateTime(date);
+        orderRefundRecord.setUpdateTime(date);
+        orderRefundRecord.setAuditStatus(auditStatus);
+        orderRefundRecord.setSort(sort);
+        orderRefundRecordMapper.insert(orderRefundRecord);
+    }
 }

yami-shop-api/src/main/java/com/yami/shop/api/controller/RefundDeliveryController.java

@@ -102,7 +102,7 @@ public class RefundDeliveryController {
             throw new GlobalException("该退款单不存在");
         }
 
-        if (orderRefund.getReturnMoneySts() == null || orderRefund.getReturnMoneySts() == 60) {
+        if (orderRefund.getReturnMoneySts() != 60) {
             throw new GlobalException("该退款单状态不对不能提交");
         }
 

yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderRefundRecord.java

@@ -27,7 +27,7 @@ public class OrderRefundRecord {
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
 
-    @ApiModelProperty(value = "审核状态（1-申请原因，2-商家待审核，3-申请已通过,4-用户撤回申请， 5-用户待发货，7-待商家收货，10-审核通过，20-驳回，30-退款成功）")
+    @ApiModelProperty(value = "审核状态（1-申请原因，2-商家待审核，3-申请已通过,4-用户撤回申请， 5-用户待发货，7-待商家收货，10-审核通过，20-驳回，25-已收货，30-退款成功）")
     private Integer auditStatus;
 
     @ApiModelProperty(value = "排序")

yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderRefundServiceImpl.java

@@ -1113,7 +1113,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
                 orderService.updateById(orderByOrderNumber);
 
                 //生成待商家审核记录
-                addOrderRefundRecord(orderRefund.getRefundId(), 20, 3, "reason");
+                addOrderRefundRecord(orderRefund.getRefundId(), 20, 3, reason);
             } else {
                 //审核通过
                 orderRefund.setApplyType(applyDeal);
@@ -1179,9 +1179,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
 
             //推送商家审核状态后 同步退款单状态
             changeStatus(orderRefund.getRefundSn(), orderRefund.getReturnMoneySts());
-            //生成待商家审核记录
-//            addOrderRefundRecord(orderRefund.getRefundId(), 7, 5, "商家收到商品井确认不影响二次销售后，将会为您处理退款");
-        } catch (Exception e) {
+          } catch (Exception e) {
             log.error("海博退款订单查询异常：{}", e);
             HBR.error("未知异常");
         }

yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderServiceImpl.java

@@ -959,6 +959,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 .eq(OrderRefund::getReturnMoneySts, 70)
                 .eq(OrderRefund::getHandler, Boolean.FALSE)
         );
+        //生成待商家审核记录
+        addOrderRefundRecord(orderRefund.getRefundId(), 25, 6, "平台已退款到微信账户中");
+        addOrderRefundRecord(orderRefund.getRefundId(), 30, 10, "商家已同意收货，正在为你处理退款。");
+
+
         if (ObjectUtils.isNotEmpty(orderRefund)) {
             //退款的金额
             BigDecimal refundActual = BigDecimal.ZERO;
@@ -1228,19 +1233,21 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             log.info("退款单修改状态和积分{}",orderRefund);
             orderRefundMapper.updateById(orderRefund);
 
-            //生成待商家审核记录
-            OrderRefundRecord orderRefundRecord = new OrderRefundRecord();
-            orderRefundRecord.setOrderRefundId(orderRefund.getRefundId());
-            orderRefundRecord.setInstructions("商家收到商品并确认不影响二次销售后，将会为您处理退款");
-            Date date = new Date();
-            orderRefundRecord.setCreateTime(date);
-            orderRefundRecord.setUpdateTime(date);
-            orderRefundRecord.setAuditStatus(5);
-            orderRefundRecord.setSort(4);
-            orderRefundRecordMapper.insert(orderRefundRecord);
         }
     }
 
+    private void addOrderRefundRecord(Long refundId, Integer auditStatus, Integer sort, String instructions) {
+        OrderRefundRecord orderRefundRecord = new OrderRefundRecord();
+        orderRefundRecord.setOrderRefundId(refundId);
+        orderRefundRecord.setInstructions(instructions);
+        Date date = new Date();
+        orderRefundRecord.setCreateTime(date);
+        orderRefundRecord.setUpdateTime(date);
+        orderRefundRecord.setAuditStatus(auditStatus);
+        orderRefundRecord.setSort(sort);
+        orderRefundRecordMapper.insert(orderRefundRecord);
+    }
+
     @Override
     public OrderRefundAmountDTO computeOrderRefundAmount(String orderNumber, List<OrderRefundAmountParam> suk) {
         BigDecimal orderRefundAmount = BigDecimal.ZERO;