submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderHandleServiceImpl.java

@@ -142,7 +142,7 @@ public class OrderHandleServiceImpl extends ServiceImpl<OrderHandleMapper, Order
                     }
                     item.setHandleRemark(invoice.getHandleRemark());
                     item.setInvoiceMode(invoice.getInvoiceMode());
-                    item.setInvoiceStatus(invoice.getPeriodReason());
+                    item.setInvoiceReason(invoice.getPeriodReason());
                     item.setInvoiceUrl(invoices.stream().filter(x -> StringUtils.isNotBlank(x.getInvoiceImg())).map(OrderInvoice::getInvoiceImg).collect(Collectors.joining(",")));
                 }
             }
@@ -158,6 +158,8 @@ public class OrderHandleServiceImpl extends ServiceImpl<OrderHandleMapper, Order
                     item.setPayee(refund.getPayee());
                     item.setPayeeBank(refund.getPayeeBank());
                     item.setPayeeBankAccount(refund.getPayeeBankAccount());
+                    item.setRefundCheckReason(refund.getPeriodReason());
+                    item.setRefundApplyReason(refund.getApplyReason());
                 }
             }
         });
@@ -197,6 +199,8 @@ public class OrderHandleServiceImpl extends ServiceImpl<OrderHandleMapper, Order
                 vo.setRefundStatus(refund.getPeriodStatus());
                 vo.setRefundReason(refund.getApplyReason());
                 vo.setPeriodReason(refund.getPeriodReason());
+                vo.setRefundCheckReason(refund.getPeriodReason());
+                vo.setRefundApplyReason(refund.getApplyReason());
             }
         }
         return list;
@@ -602,6 +606,11 @@ public class OrderHandleServiceImpl extends ServiceImpl<OrderHandleMapper, Order
                 }
                 orderHandle.setRefundStatus(1);//已退款
                 updateById(orderHandle);
+                goodsRefundList.forEach(x -> {
+                    x.setPeriodStatus(1);//已退款
+                    x.setPeriodTime(DateUtils.getNowTime());
+                });
+                iOrderGoodsRefundService.updateBatchById(goodsRefundList);
                 //是否存在发票
                 List<OrderInvoiceOrder> list = iOrderInvoiceOrderService
                         .list(new LambdaQueryWrapper<OrderInvoiceOrder>().eq(OrderInvoiceOrder::getOrderSn, orderHandle.getHandleOrderSn()));
@@ -613,9 +622,22 @@ public class OrderHandleServiceImpl extends ServiceImpl<OrderHandleMapper, Order
                 break;
             case 2://不通过
                 orderHandle.setRefundStatus(2);//不通过
-                orderHandle.setCheckReason(bo.getCheckReason());
                 orderHandle.setUpdateTime(DateUtils.getNowTime());
                 updateById(orderHandle);
+                goodsRefundList.forEach(x -> {
+                    x.setPeriodReason(bo.getCheckReason());
+                    x.setPeriodStatus(2);//不通过
+                    x.setPeriodTime(DateUtils.getNowTime());
+                });
+                iOrderGoodsRefundService.updateBatchById(goodsRefundList);
+                orderList.forEach(item -> {
+                    item.setOrderRefundStatus(4);
+                });
+                iOrderService.updateBatchById(orderList);
+                orderGoodsList.forEach(item -> {
+                    item.setRefundStatus(3);
+                });
+                iOrderGoodsService.updateBatchById(orderGoodsList);
                 break;
             default:
                 break;

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderHandleGoodsVo.java

@@ -86,4 +86,9 @@ public class OrderHandleGoodsVo {
 	@ApiModelProperty("审核意见")
 	private String periodReason;
 
+	@ApiModelProperty("退款审核原因")
+	private String refundCheckReason;
+
+	@ApiModelProperty("退款申请原因")
+	private String refundApplyReason;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderHandleVo.java

@@ -148,4 +148,10 @@ public class OrderHandleVo {
 	@ApiModelProperty("收款人账号")
 	private String payeeBankAccount;
 
+	@ApiModelProperty("退款审核原因")
+	private String refundCheckReason;
+
+	@ApiModelProperty("退款申请原因")
+	private String refundApplyReason;
+
 }