From 9fe7137ab580354c4d84f854e06ccbf6fc61fa5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Mon, 2 Jan 2023 00:01:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E4=B8=BA=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E4=BA=BA=E5=85=B3=E4=BA=8E=E6=89=98=E7=A6=8F=E8=B5=8F=E9=87=91?= =?UTF-8?q?=E7=9A=84=E5=88=A4=E6=96=AD,=E6=94=AF=E6=8C=81=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0=E8=B5=8F=E9=87=91=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xm/core/ctrl/XmTaskOrderController.java | 23 +++++++++++++++++++ .../xm/core/service/XmTaskOrderService.java | 12 +++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) 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); + } + } }