payStatus

src/main/java/com/yunzhi/niucai/entity/TaOrder.java

@@ -1,15 +1,16 @@
 package com.yunzhi.niucai.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 订单主表 
@@ -51,9 +52,12 @@ public class TaOrder implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
-    @ApiModelProperty(value = "状态 1已支付,3支付中，0未支付")
+    @ApiModelProperty(value = "状态")
     private Integer status;
 
+    @ApiModelProperty(value = "支付状态 1已支付,3支付中，0未支付")
+    private Integer payStatus;
+
     @ApiModelProperty(value = "商户网站唯一订单号")
     private String outTradeNo;
 

src/main/java/com/yunzhi/niucai/service/impl/TaAlipayServiceImpl.java

@@ -74,7 +74,7 @@ public class TaAlipayServiceImpl extends ServiceImpl<TaAlipayMapper, TaAlipay> i
         }
 
         taOrder.setOutTradeNo(outTradeNo);
-        taOrder.setStatus(CommConstants.SRTATUS_PAYING);
+        taOrder.setPayStatus(CommConstants.SRTATUS_PAYING);
         return taOrderService.updateById(taOrder);
     }
 
@@ -90,12 +90,12 @@ public class TaAlipayServiceImpl extends ServiceImpl<TaAlipayMapper, TaAlipay> i
         taOrder.setUpdateDate(LocalDateTime.now());
         // 支付失败
         if (!tradeStatus.equals(CommConstants.TRADE_STATUS_SUCCESS)){
-            taOrder.setStatus(CommConstants.SRTATUS_UNPAYED);
+            taOrder.setPayStatus(CommConstants.SRTATUS_UNPAYED);
             taOrderService.updateById(taOrder);
             return;
         }
         //支付成功 更新为已支付状态
-        taOrder.setStatus(CommConstants.SRTATUS_EFFECTIVE);
+        taOrder.setPayStatus(CommConstants.SRTATUS_EFFECTIVE);
         taOrder.setTradeNo(tradeNo);
         taOrderService.updateById(taOrder);
     }

src/main/java/com/yunzhi/niucai/service/impl/TaWxpayServiceImpl.java

@@ -66,7 +66,7 @@ public class TaWxpayServiceImpl extends ServiceImpl<TaWxpayMapper, TaWxpay> impl
 
         // 更新状态
         taOrder.setOutTradeNo(outTradeNo);
-        taOrder.setStatus(CommConstants.SRTATUS_PAYING);
+        taOrder.setPayStatus(CommConstants.SRTATUS_PAYING);
         taOrderService.updateById(taOrder);
         return ResponseBean.success(result);
     }
@@ -83,12 +83,12 @@ public class TaWxpayServiceImpl extends ServiceImpl<TaWxpayMapper, TaWxpay> impl
         taOrder.setUpdateDate(LocalDateTime.now());
         // 支付失败
         if (!result.getResultCode().equals(CommConstants.WX_TRADE_STATUS_SUCCESS)){
-            taOrder.setStatus(CommConstants.SRTATUS_UNPAYED);
+            taOrder.setPayStatus(CommConstants.SRTATUS_UNPAYED);
             taOrderService.updateById(taOrder);
             return WxPayNotifyResponse.success("处理成功");
         }
         //支付成功 更新为已支付状态
-        taOrder.setStatus(CommConstants.SRTATUS_EFFECTIVE);
+        taOrder.setPayStatus(CommConstants.SRTATUS_EFFECTIVE);
         taOrder.setTradeNo(tradeNo);
         taOrderService.updateById(taOrder);
         return WxPayNotifyResponse.success("处理成功!");