取消支付, 通知微信支付取消

qmjszx-admin/src/main/java/beilv/web/controller/carinformation/CardAppController.java

@@ -130,7 +130,10 @@ public class CardAppController extends BaseController {
     public AjaxResult addVipCardLogCallBack(@RequestBody VipCardLog vipCardLog) {
         int i = vipCardLogService.updateVipCardLogByOrderId(vipCardLog);
         if(i>1){
-            return payController.cancelOrder(vipCardLog.getId());
+            if("payment_status_cancelled".equals(vipCardLog.getPaymentStatus())){
+                return payController.cancelOrder(vipCardLog.getId());
+            }
+            return toAjax(i);
         }else{
             return AjaxResult.error("取消订单失败!");
         }
@@ -145,7 +148,10 @@ public class CardAppController extends BaseController {
     public AjaxResult addOrderLogCallBack(@RequestBody VipCardLog vipCardLog) {
         int i = vipCardLogService.updateVipCardLogByOrderId(vipCardLog);
         if(i>1){
-            return payController.cancelOrder(vipCardLog.getId());
+            if("payment_status_cancelled".equals(vipCardLog.getPaymentStatus())){
+                return payController.cancelOrder(vipCardLog.getId());
+            }
+            return toAjax(i);
         }else{
             return AjaxResult.error("取消订单失败!");
         }