zoujiajian 3 лет назад
Родитель
Сommit
28868dca61

+ 5 - 0
netflix-dao/src/main/java/com/cyksj/model/entity/OrderDon.java

@@ -52,6 +52,11 @@ public class OrderDon extends BaseEntity implements Serializable {
      */
     private BigDecimal refundMoney;
 
+    /**
+     * 退款原因
+     */
+    private String refundDesc;
+
     /**
      * 优惠金额
      */

+ 3 - 0
netflix-dao/src/main/java/com/cyksj/model/manage/views/OrderDonView.java

@@ -119,6 +119,9 @@ public class OrderDonView {
     @DbField("o.refund_money")
     private BigDecimal refundMoney;
 
+    @DbField("o.refund_desc")
+    private String refundDesc;
+
     @DbField("o.status")
     private OrderDon.Status status;
 

+ 5 - 0
netflix-dao/src/main/java/com/cyksj/model/request/WxOrderRefundReq.java

@@ -23,4 +23,9 @@ public class WxOrderRefundReq {
 	 */
 	@NotNull(message = "退款金额不为空")
 	private BigDecimal refundMoney;
+
+	/**
+	 * 退款原因
+	 */
+	private String refundDesc;
 }

+ 5 - 0
netflix-dao/src/main/java/com/cyksj/model/request/ZfbOrderRefundReq.java

@@ -23,4 +23,9 @@ public class ZfbOrderRefundReq {
 	 */
 	@NotNull(message = "退款金额不为空")
 	private BigDecimal refundMoney;
+
+	/**
+	 * 退款原因
+	 */
+	private String refundDesc;
 }

+ 3 - 1
netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -962,6 +962,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		//修改订单状态
 		orderDon.setStatus(OrderDon.Status.refund);
 		orderDon.setRefundMoney(wxOrderRefundReq.getRefundMoney());
+		orderDon.setRefundDesc(wxOrderRefundReq.getRefundDesc());
 		if (orderDon.getIsDistribute()) {
 			distributeWaitingSendPointsMapper.updateOrderStatus(orderDon.getId(), DistributeWaitingSendPoints.Status.close);
 		}
@@ -1045,6 +1046,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			if (orderDon.getIsDistribute()) {
 				distributeWaitingSendPointsMapper.updateOrderStatus(orderDon.getId(), DistributeWaitingSendPoints.Status.close);
 			}
+			orderDon.setRefundDesc(zfbOrderRefundReq.getRefundDesc());
 			orderDonMapper.updateById(orderDon);
 			//记录退款信息
 			THREAD_POOL_TASK_EXECUTOR.execute(()->{
@@ -1218,7 +1220,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			refund.setOrderId(orderDon.getId());
 			refund.setOutRefundNo(outRefundNo);
 			refund.setTotalFee(orderDon.getMoney());
-			refund.setRefundDesc("订单退款");
+			refund.setRefundDesc(orderDon.getRefundDesc());
 			//退款金额
 			refund.setRefundFee(orderDon.getRefundMoney());
 			refund.setUserId(orderDon.getUserId());