|
|
@@ -128,7 +128,13 @@ public class CardAppController extends BaseController {
|
|
|
@PostMapping("/addVipCardLogCallBack")
|
|
|
@ResponseBody
|
|
|
public AjaxResult addVipCardLogCallBack(@RequestBody VipCardLog vipCardLog) {
|
|
|
- return toAjax(vipCardLogService.updateVipCardLogByOrderId(vipCardLog));
|
|
|
+ int i = vipCardLogService.updateVipCardLogByOrderId(vipCardLog);
|
|
|
+ if(i>1){
|
|
|
+ return payController.cancelOrder(vipCardLog.getId());
|
|
|
+ }else{
|
|
|
+ return AjaxResult.error("取消订单失败!");
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -137,7 +143,12 @@ public class CardAppController extends BaseController {
|
|
|
@PostMapping("/addOrderLogCallBack")
|
|
|
@ResponseBody
|
|
|
public AjaxResult addOrderLogCallBack(@RequestBody VipCardLog vipCardLog) {
|
|
|
- return toAjax(vipCardLogService.updateVipCardLogByOrderId(vipCardLog));
|
|
|
+ int i = vipCardLogService.updateVipCardLogByOrderId(vipCardLog);
|
|
|
+ if(i>1){
|
|
|
+ return payController.cancelOrder(vipCardLog.getId());
|
|
|
+ }else{
|
|
|
+ return AjaxResult.error("取消订单失败!");
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/**
|