andrew 4 gadus atpakaļ
vecāks
revīzija
a7ec01c174

+ 7
- 3
src/main/java/com/yunzhi/niucai/entity/TaOrder.java Parādīt failu

1
 package com.yunzhi.niucai.entity;
1
 package com.yunzhi.niucai.entity;
2
 
2
 
3
 import com.baomidou.mybatisplus.annotation.IdType;
3
 import com.baomidou.mybatisplus.annotation.IdType;
4
-import java.time.LocalDateTime;
5
 import com.baomidou.mybatisplus.annotation.TableId;
4
 import com.baomidou.mybatisplus.annotation.TableId;
6
-import java.io.Serializable;
7
 import io.swagger.annotations.ApiModel;
5
 import io.swagger.annotations.ApiModel;
8
 import io.swagger.annotations.ApiModelProperty;
6
 import io.swagger.annotations.ApiModelProperty;
9
 import lombok.Data;
7
 import lombok.Data;
10
 import lombok.EqualsAndHashCode;
8
 import lombok.EqualsAndHashCode;
11
 import lombok.experimental.Accessors;
9
 import lombok.experimental.Accessors;
12
 
10
 
11
+import java.io.Serializable;
12
+import java.time.LocalDateTime;
13
+
13
 /**
14
 /**
14
  * <p>
15
  * <p>
15
  * 订单主表 
16
  * 订单主表 
51
     @ApiModelProperty(value = "创建时间")
52
     @ApiModelProperty(value = "创建时间")
52
     private LocalDateTime createDate;
53
     private LocalDateTime createDate;
53
 
54
 
54
-    @ApiModelProperty(value = "状态 1已支付,3支付中,0未支付")
55
+    @ApiModelProperty(value = "状态")
55
     private Integer status;
56
     private Integer status;
56
 
57
 
58
+    @ApiModelProperty(value = "支付状态 1已支付,3支付中,0未支付")
59
+    private Integer payStatus;
60
+
57
     @ApiModelProperty(value = "商户网站唯一订单号")
61
     @ApiModelProperty(value = "商户网站唯一订单号")
58
     private String outTradeNo;
62
     private String outTradeNo;
59
 
63
 

+ 3
- 3
src/main/java/com/yunzhi/niucai/service/impl/TaAlipayServiceImpl.java Parādīt failu

74
         }
74
         }
75
 
75
 
76
         taOrder.setOutTradeNo(outTradeNo);
76
         taOrder.setOutTradeNo(outTradeNo);
77
-        taOrder.setStatus(CommConstants.SRTATUS_PAYING);
77
+        taOrder.setPayStatus(CommConstants.SRTATUS_PAYING);
78
         return taOrderService.updateById(taOrder);
78
         return taOrderService.updateById(taOrder);
79
     }
79
     }
80
 
80
 
90
         taOrder.setUpdateDate(LocalDateTime.now());
90
         taOrder.setUpdateDate(LocalDateTime.now());
91
         // 支付失败
91
         // 支付失败
92
         if (!tradeStatus.equals(CommConstants.TRADE_STATUS_SUCCESS)){
92
         if (!tradeStatus.equals(CommConstants.TRADE_STATUS_SUCCESS)){
93
-            taOrder.setStatus(CommConstants.SRTATUS_UNPAYED);
93
+            taOrder.setPayStatus(CommConstants.SRTATUS_UNPAYED);
94
             taOrderService.updateById(taOrder);
94
             taOrderService.updateById(taOrder);
95
             return;
95
             return;
96
         }
96
         }
97
         //支付成功 更新为已支付状态
97
         //支付成功 更新为已支付状态
98
-        taOrder.setStatus(CommConstants.SRTATUS_EFFECTIVE);
98
+        taOrder.setPayStatus(CommConstants.SRTATUS_EFFECTIVE);
99
         taOrder.setTradeNo(tradeNo);
99
         taOrder.setTradeNo(tradeNo);
100
         taOrderService.updateById(taOrder);
100
         taOrderService.updateById(taOrder);
101
     }
101
     }

+ 3
- 3
src/main/java/com/yunzhi/niucai/service/impl/TaWxpayServiceImpl.java Parādīt failu

66
 
66
 
67
         // 更新状态
67
         // 更新状态
68
         taOrder.setOutTradeNo(outTradeNo);
68
         taOrder.setOutTradeNo(outTradeNo);
69
-        taOrder.setStatus(CommConstants.SRTATUS_PAYING);
69
+        taOrder.setPayStatus(CommConstants.SRTATUS_PAYING);
70
         taOrderService.updateById(taOrder);
70
         taOrderService.updateById(taOrder);
71
         return ResponseBean.success(result);
71
         return ResponseBean.success(result);
72
     }
72
     }
83
         taOrder.setUpdateDate(LocalDateTime.now());
83
         taOrder.setUpdateDate(LocalDateTime.now());
84
         // 支付失败
84
         // 支付失败
85
         if (!result.getResultCode().equals(CommConstants.WX_TRADE_STATUS_SUCCESS)){
85
         if (!result.getResultCode().equals(CommConstants.WX_TRADE_STATUS_SUCCESS)){
86
-            taOrder.setStatus(CommConstants.SRTATUS_UNPAYED);
86
+            taOrder.setPayStatus(CommConstants.SRTATUS_UNPAYED);
87
             taOrderService.updateById(taOrder);
87
             taOrderService.updateById(taOrder);
88
             return WxPayNotifyResponse.success("处理成功");
88
             return WxPayNotifyResponse.success("处理成功");
89
         }
89
         }
90
         //支付成功 更新为已支付状态
90
         //支付成功 更新为已支付状态
91
-        taOrder.setStatus(CommConstants.SRTATUS_EFFECTIVE);
91
+        taOrder.setPayStatus(CommConstants.SRTATUS_EFFECTIVE);
92
         taOrder.setTradeNo(tradeNo);
92
         taOrder.setTradeNo(tradeNo);
93
         taOrderService.updateById(taOrder);
93
         taOrderService.updateById(taOrder);
94
         return WxPayNotifyResponse.success("处理成功!");
94
         return WxPayNotifyResponse.success("处理成功!");