feat：“长隆微信支付添加退款原因和开发票“

src/main/java/com/szwl/controller/TWechatPayConfigController.java

@@ -431,6 +431,8 @@ public class TWechatPayConfigController {
         BigDecimal refusePrice = torder.getPrice().setScale(2, RoundingMode.HALF_DOWN);
         // 退款数量: refundNumber
         Integer refundNumber = torder.getProductNumber();
+        // 退款原因: refundReason
+        String refundReason = torder.getRefundReason();
         // 退款明细：note
         String note = torder.getNote();
         String[] refundDetails = note.split(",");
@@ -478,6 +480,7 @@ public class TWechatPayConfigController {
         System.out.println("退款参数"+refund.toString());
         if(refund.getStatus()==PROCESSING){
             order.setStatus(2);
+            order.setRefundReason(refundReason);
             orderService.updateById(order);
             // 修改订单明细
             for (TOrderDetails orderDetail : orderDetails) {
@@ -493,10 +496,6 @@ public class TWechatPayConfigController {
                     orderDetailsService.updateById(orderDetail);
                 }
             }
-//            if(refundReason != null){
-//                order.setRefundReason(refundReason);
-//                orderService.update(order);
-//            }
             return R.ok("申请退款已成功");
         }else {
             return R.fail(ResponseCodesEnum.B0001,"申请退款失败，请重试");

src/main/java/com/szwl/model/entity/TOrder.java

@@ -16,7 +16,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wuhs
- * @since 2023-05-18
+ * @since 2024-03-15
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -26,7 +26,6 @@ public class TOrder implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "订单唯一ID")
-//    @TableId(value = "id", type = IdType.AUTO)
     @TableId(value = "id", type = IdType.ASSIGN_ID)
     private Long id;
 
@@ -160,5 +159,11 @@ public class TOrder implements Serializable {
     @ApiModelProperty(value = "是否通知MQ，0：未通知，1：通知支付成功做糖，2：通知支付失败")
     private String isNotified;
 
+    @ApiModelProperty(value = "是否开发票，0为否，1为是，默认为0")
+    private Integer isInvoice;
+
+    @ApiModelProperty(value = "退款原因")
+    private String refundReason;
+
 
 }

src/main/java/com/szwl/service/impl/TOrderServiceImpl.java

@@ -235,8 +235,13 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 //                r4_refundAmount =r4_refundAmount.add(order.getRefundMarketingAmount());
 //            }
             BigDecimal refundAmount = order.getRefundAmount();
+            BigDecimal price = order.getPrice();
             if(refundAmount != null) {
-                order.setRefundAmount(refundAmount.add(r4_refundAmount));
+                if (price.compareTo(refundAmount) == 0) {
+                    order.setRefundAmount(refundAmount);
+                } else {
+                    order.setRefundAmount(refundAmount.add(r4_refundAmount));
+                }
             } else {
                 order.setRefundAmount(r4_refundAmount);
             }