From ed1924c658b489ba26f7dcfaccea8df6d3eee234 Mon Sep 17 00:00:00 2001 From: qyhdd Date: Mon, 28 Aug 2023 11:58:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E8=AE=A2=E5=8D=95=E5=8F=B7=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=EF=BC=8C=E6=9D=83=E7=9B=8A=E9=A2=86=E5=8F=96=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=94=A8=E6=88=B7=E6=98=AF=E5=90=A6=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cyjd/rights/controller/AliPayController.java | 1 + .../src/main/java/com/cyjd/rights/dto/AliPayInOrderDto.java | 3 ++- .../main/java/com/cyjd/rights/entity/AliPayOrderEntity.java | 2 ++ .../src/main/java/com/cyjd/rights/vo/AliPayOrderVo.java | 2 ++ .../cyjd/rights/business/service/impl/AliPayServiceImpl.java | 1 + .../cyjd/rights/business/service/impl/YunmeiServiceImpl.java | 2 +- .../src/main/resources/mapper/business/AliPayOrderMapper.xml | 5 ++++- .../src/main/resources/mapper/business/RefundOrderMapper.xml | 2 +- 8 files changed, 14 insertions(+), 4 deletions(-) diff --git a/rights-client-controller/src/main/java/com/cyjd/rights/controller/AliPayController.java b/rights-client-controller/src/main/java/com/cyjd/rights/controller/AliPayController.java index cce0f91..5b5e187 100644 --- a/rights-client-controller/src/main/java/com/cyjd/rights/controller/AliPayController.java +++ b/rights-client-controller/src/main/java/com/cyjd/rights/controller/AliPayController.java @@ -464,6 +464,7 @@ public class AliPayController { aliPayOrderEntity.setLinkName(aliPaySigningOrderEntity.getLinkName()); aliPayOrderEntity.setAliAccountName(aliPaySigningOrderEntity.getAliAccountName()); aliPayOrderEntity.setOrderName("惠点联合会员"); + aliPayOrderEntity.setTradeNo(tradeNo); if ("TRADE_SUCCESS".equals(tradeStatus) || "TRADE_FINISHED".equals(tradeStatus)) { aliPayOrderEntity.setStatus(1); aliPayOrderService.save(aliPayOrderEntity); diff --git a/rights-entity/src/main/java/com/cyjd/rights/dto/AliPayInOrderDto.java b/rights-entity/src/main/java/com/cyjd/rights/dto/AliPayInOrderDto.java index 83bb70d..b16dfd8 100644 --- a/rights-entity/src/main/java/com/cyjd/rights/dto/AliPayInOrderDto.java +++ b/rights-entity/src/main/java/com/cyjd/rights/dto/AliPayInOrderDto.java @@ -42,5 +42,6 @@ public class AliPayInOrderDto extends BasePageDto{ @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime endTime; - + @ApiModelProperty(value = "支付宝交易号") + private String tradeNo; } diff --git a/rights-entity/src/main/java/com/cyjd/rights/entity/AliPayOrderEntity.java b/rights-entity/src/main/java/com/cyjd/rights/entity/AliPayOrderEntity.java index 6ba3648..7fbf88d 100644 --- a/rights-entity/src/main/java/com/cyjd/rights/entity/AliPayOrderEntity.java +++ b/rights-entity/src/main/java/com/cyjd/rights/entity/AliPayOrderEntity.java @@ -48,4 +48,6 @@ public class AliPayOrderEntity { private String linkName; private String aliAccountName; //账户名称（公司拼音首字母+编号） + + private String tradeNo; //支付宝交易号。支付宝交易凭证号。 } diff --git a/rights-entity/src/main/java/com/cyjd/rights/vo/AliPayOrderVo.java b/rights-entity/src/main/java/com/cyjd/rights/vo/AliPayOrderVo.java index a224d0f..2871ce5 100644 --- a/rights-entity/src/main/java/com/cyjd/rights/vo/AliPayOrderVo.java +++ b/rights-entity/src/main/java/com/cyjd/rights/vo/AliPayOrderVo.java @@ -37,5 +37,7 @@ public class AliPayOrderVo { private String linkName; + private String tradeNo; //支付宝交易号。支付宝交易凭证号。 + } diff --git a/rights-server/src/main/java/com/cyjd/rights/business/service/impl/AliPayServiceImpl.java b/rights-server/src/main/java/com/cyjd/rights/business/service/impl/AliPayServiceImpl.java index eb7d55a..795ee2a 100644 --- a/rights-server/src/main/java/com/cyjd/rights/business/service/impl/AliPayServiceImpl.java +++ b/rights-server/src/main/java/com/cyjd/rights/business/service/impl/AliPayServiceImpl.java @@ -116,6 +116,7 @@ public class AliPayServiceImpl implements AliPayService { log.info("=========================="); //System.out.println(request.getBizContent()); response = alipayClient.certificateExecute(request); + //System.out.println(response.gets); if (response.isSuccess()) { //log.info("用户内部系统签约号{}：查询周期扣款签约结果,调用成功", externalAgreementNo); diff --git a/rights-server/src/main/java/com/cyjd/rights/business/service/impl/YunmeiServiceImpl.java b/rights-server/src/main/java/com/cyjd/rights/business/service/impl/YunmeiServiceImpl.java index 38b1195..1709d82 100644 --- a/rights-server/src/main/java/com/cyjd/rights/business/service/impl/YunmeiServiceImpl.java +++ b/rights-server/src/main/java/com/cyjd/rights/business/service/impl/YunmeiServiceImpl.java @@ -187,7 +187,7 @@ public class YunmeiServiceImpl implements YunmeiService { String reason = "暂无领取资格"; //判断用户是否退订 RefundOrderEntity refundOrder = refundOrderService.getOne(new QueryWrapper().eq("mobile", mobile)); - if (refundOrder==null){ + if (refundOrder!=null){ code = "10027"; reason = "黑名单用户或已退款"; resJSON.put("code", code); diff --git a/rights-server/src/main/resources/mapper/business/AliPayOrderMapper.xml b/rights-server/src/main/resources/mapper/business/AliPayOrderMapper.xml index 958e0ac..cf0903d 100644 --- a/rights-server/src/main/resources/mapper/business/AliPayOrderMapper.xml +++ b/rights-server/src/main/resources/mapper/business/AliPayOrderMapper.xml @@ -3,7 +3,7 @@ select id,mobile,refund_time,status,out_trade_no,out_request_no,refund_price,link_id