diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java index f59ede60..8a698107 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java @@ -490,6 +490,29 @@ public class XmTaskOrderController { } } + @ApiOperation( value = "订单支付取消判断",notes=" ") + @ApiResponses({ + @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") + }) + @RequestMapping(value="/payCancel",method=RequestMethod.POST) + public Map payCancel(@RequestBody XmTaskOrder order) { + Map m = new HashMap<>(); + try { + Tips tips=new Tips("操作成功"); + if(!StringUtils.hasText(order.getId())) { + return failed("data-0","订单Id不能为空"); + } + this.xmTaskOrderService.payCancel(order.getId(),order.getPayId(), order.getRemark()); + m.put("tips", tips); + return m; + }catch (BizException e) { + logger.error("",e); + return failed("data-0",e.getMessage()); + } catch (Exception e) { + logger.error("",e); + return failed("data-0", "付款取消操作失败"); + } + } @ApiOperation( value = "修改订单的第三方流水号",notes=" ") @ApiResponses({ @ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}") diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskOrderService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskOrderService.java index df6e7378..e2222149 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskOrderService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskOrderService.java @@ -127,7 +127,17 @@ public class XmTaskOrderService extends BaseService { xmRecordService.addXmTaskRecord(taskOrderDb.getProjectId(),taskOrderDb.getTaskId(),"营销活动","成功缴纳活动费用金额【"+taskOrderDb.getFinalFee()+"】,实际到账金额【"+payAt+"】。参加的活动为【"+marketNames.stream().collect(Collectors.joining(","))+"】"); } } - + public void payCancel(String orderId, String payId, String remark) { + XmTaskOrder orderDb = this.selectOneById(orderId); + if(StringUtils.isEmpty(orderDb.getPayId()) ||orderDb.getPayId().equals(payId)){ + XmTaskOrder orderUpdate=new XmTaskOrder(); + orderUpdate.setId(orderId); + orderUpdate.setRemark(remark); + orderUpdate.setPayStatus("2"); + orderUpdate.setLtime(new Date()); + super.updateSomeFieldByPk(orderUpdate); + } + } }