From 08f7494ee498fc7a00de9233d9181e3dc2a0857c Mon Sep 17 00:00:00 2001 From: qyhdd Date: Tue, 15 Aug 2023 10:51:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=A4=E9=87=91=E5=9B=9E=E4=BC=A0=EF=BC=8C?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rights/controller/AliPayController.java | 5 +++ .../com/cyjd/rights/dto/AliPayInOrderDto.java | 3 ++ .../cyjd/rights/dto/AliPaySignOrderDto.java | 5 +++ .../com/cyjd/rights/dto/RightsOrderDto.java | 3 ++ .../com/cyjd/rights/vo/AliPayOrderVo.java | 6 ++- .../cyjd/rights/vo/AliPaySigningOrderVo.java | 3 ++ .../com/cyjd/rights/vo/RightsOrderVo.java | 2 + .../impl/SendSuccessMobileServiceImpl.java | 15 +++++++ .../mapper/business/AliPayOrderMapper.xml | 41 ++++++++++--------- .../business/AliPaySigningOrderMapper.xml | 41 ++++++++++--------- .../mapper/business/RightsOrderMapper.xml | 2 +- 11 files changed, 85 insertions(+), 41 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 d08ac30..4768728 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 @@ -480,6 +480,11 @@ public class AliPayController { if (1160==aliPaySigningOrderEntity.getLinkId()){ sendSuccessMobileService.sendSuccessMobile(aliPaySigningOrderEntity.getSendApiData(),"tuia",outTradeNo); } + + //回传 1162赤金渠道 + if (1162==aliPaySigningOrderEntity.getLinkId()){ + sendSuccessMobileService.sendSuccessMobile(aliPaySigningOrderEntity.getSendApiData(),"cj",outTradeNo); + } } // if (b){ // log.info("支付订单保存成功"+aliPayEntity.getOrderId()+"=====status:"+aliPayEntity.getStatus()); 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 712e25d..afd457e 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 @@ -1,5 +1,6 @@ package com.cyjd.rights.dto; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -34,9 +35,11 @@ public class AliPayInOrderDto extends BasePageDto{ private String status; @ApiModelProperty(value = "查询开始时间") + @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime beginTime; @ApiModelProperty(value = "查询结束时间") + @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime endTime; diff --git a/rights-entity/src/main/java/com/cyjd/rights/dto/AliPaySignOrderDto.java b/rights-entity/src/main/java/com/cyjd/rights/dto/AliPaySignOrderDto.java index ab59b78..b77e5fa 100644 --- a/rights-entity/src/main/java/com/cyjd/rights/dto/AliPaySignOrderDto.java +++ b/rights-entity/src/main/java/com/cyjd/rights/dto/AliPaySignOrderDto.java @@ -1,5 +1,6 @@ package com.cyjd.rights.dto; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -34,14 +35,18 @@ public class AliPaySignOrderDto extends BasePageDto{ private String status; @ApiModelProperty(value = "查询订单时间（开始）") + @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime beginTime; @ApiModelProperty(value = "查询订单时间（结束）") + @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime endTime; @ApiModelProperty(value = "查询下次支付的时间（开始）") + @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime beginSearchNextPayTime; @ApiModelProperty(value = "查询下次支付的时间（结束）") + @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime endSearchNextPayTime; } diff --git a/rights-entity/src/main/java/com/cyjd/rights/dto/RightsOrderDto.java b/rights-entity/src/main/java/com/cyjd/rights/dto/RightsOrderDto.java index 7528e9b..4dc6c0d 100644 --- a/rights-entity/src/main/java/com/cyjd/rights/dto/RightsOrderDto.java +++ b/rights-entity/src/main/java/com/cyjd/rights/dto/RightsOrderDto.java @@ -1,5 +1,6 @@ package com.cyjd.rights.dto; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -26,9 +27,11 @@ public class RightsOrderDto extends BasePageDto{ private String status; @ApiModelProperty(value = "查询开始时间") + @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime beginTime; @ApiModelProperty(value = "查询结束时间") + @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime endTime; @ApiModelProperty(value = "购买的产品编码") 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 c4bf121..a224d0f 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 @@ -1,8 +1,10 @@ package com.cyjd.rights.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; @@ -13,7 +15,7 @@ public class AliPayOrderVo { private Integer id; private String mobile; - + @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime orderTime;//订单创建时间 private Integer status;//1 成功 0失败 2支付接口返回成功未收到回调 @@ -25,7 +27,7 @@ public class AliPayOrderVo { private String otherOrderId; //businessType为1时存的签约号 private String aliUserId;//用户支付宝唯一id - + @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime unsubTime; //退订时间 private Integer businessType; //1 权益类业务 diff --git a/rights-entity/src/main/java/com/cyjd/rights/vo/AliPaySigningOrderVo.java b/rights-entity/src/main/java/com/cyjd/rights/vo/AliPaySigningOrderVo.java index 715b7e2..b6fd046 100644 --- a/rights-entity/src/main/java/com/cyjd/rights/vo/AliPaySigningOrderVo.java +++ b/rights-entity/src/main/java/com/cyjd/rights/vo/AliPaySigningOrderVo.java @@ -1,5 +1,6 @@ package com.cyjd.rights.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -14,6 +15,7 @@ public class AliPaySigningOrderVo { private String mobile; + @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime orderTime;//订单创建时间 private Integer status;//1 成功 0失败 2发起签约成功 @@ -26,6 +28,7 @@ public class AliPaySigningOrderVo { private String aliUserId;//用户支付宝唯一id + @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime unsubTime; //退订时间 private Integer businessType; //1 权益类业务 diff --git a/rights-entity/src/main/java/com/cyjd/rights/vo/RightsOrderVo.java b/rights-entity/src/main/java/com/cyjd/rights/vo/RightsOrderVo.java index 19f0154..20146fd 100644 --- a/rights-entity/src/main/java/com/cyjd/rights/vo/RightsOrderVo.java +++ b/rights-entity/src/main/java/com/cyjd/rights/vo/RightsOrderVo.java @@ -1,5 +1,6 @@ package com.cyjd.rights.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -14,6 +15,7 @@ public class RightsOrderVo { private String mobile; + @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime orderTime;//订单创建时间 private Integer status;//1 成功 0失败 2支付接口返回成功未收到回调 diff --git a/rights-server/src/main/java/com/cyjd/rights/business/service/impl/SendSuccessMobileServiceImpl.java b/rights-server/src/main/java/com/cyjd/rights/business/service/impl/SendSuccessMobileServiceImpl.java index 06fff17..0f30b79 100644 --- a/rights-server/src/main/java/com/cyjd/rights/business/service/impl/SendSuccessMobileServiceImpl.java +++ b/rights-server/src/main/java/com/cyjd/rights/business/service/impl/SendSuccessMobileServiceImpl.java @@ -33,6 +33,21 @@ public class SendSuccessMobileServiceImpl implements SendSuccessMobileService { } else if ("tuia".equals(channelName)) { String url="https://activity.tuia.cn/log/effect/v2?a_oId="+mobile+"&advertKey=75FEC8A0D38E22BE3B9695460D1A2BB6&subType=3"; HttpUtils.sendGet(url); + } else if ("cj".equals(channelName)){ + String url="https://analytics.oceanengine.com/api/v2/conversion"; + long time = System.currentTimeMillis(); + HashMap params = new HashMap<>(); + params.put("event_type","form"); + HashMap context = new HashMap<>(); + HashMap callback = new HashMap<>(); + callback.put("callback",mobile); + context.put("ad",callback); + params.put("context",context); + params.put("timestamp",time); + System.out.println(params); + String res = HttpUtils.sendPostJSON(url, JSON.toJSONString(params)); + System.out.println(res+"====================================================="); + log.info("clikckId"+mobile+"回传结果："+res); } //设置一个签约号只能回传一次 redisUtil.set("sendSuccessMobile"+outTradeNo,1,172800); diff --git a/rights-server/src/main/resources/mapper/business/AliPayOrderMapper.xml b/rights-server/src/main/resources/mapper/business/AliPayOrderMapper.xml index 24bddec..6fc7b0f 100644 --- a/rights-server/src/main/resources/mapper/business/AliPayOrderMapper.xml +++ b/rights-server/src/main/resources/mapper/business/AliPayOrderMapper.xml @@ -6,25 +6,28 @@ id,mobile,order_time,status,sign_code,price,other_order_id,ali_user_id,unsub_time,business_type,link_id from tb_ali_pay_order - 1=1 - - and other_order_id = #{outTradeNo} - - - and link_id = #{linkId} - - - and link_name = #{linkName} - - - and status = #{status} - - - and order_time > #{beginTime} - - - and order_time < #{beginTime} - + 1=1 + + and other_order_id = #{outTradeNo} + + + and link_id = #{linkId} + + + and link_name = #{linkName} + + + and status = #{status} + + + and mobile = #{mobile} + + + and order_time > #{beginTime} + + + and order_time < #{endTime} + diff --git a/rights-server/src/main/resources/mapper/business/AliPaySigningOrderMapper.xml b/rights-server/src/main/resources/mapper/business/AliPaySigningOrderMapper.xml index 0ce437f..a5e9fe1 100644 --- a/rights-server/src/main/resources/mapper/business/AliPaySigningOrderMapper.xml +++ b/rights-server/src/main/resources/mapper/business/AliPaySigningOrderMapper.xml @@ -6,25 +6,28 @@ id,mobile,order_time,status,sign_code,price,other_order_id,ali_user_id,unsub_time,business_type,link_id,next_pay_time from tb_ali_pay_signing_order - 1=1 - - and other_order_id = #{outTradeNo} - - - and link_id = #{linkId} - - - and link_name = #{linkName} - - - and status = #{status} - - - and order_time > #{beginTime} - - - and order_time < #{endTime} - + 1=1 + + and other_order_id = #{outTradeNo} + + + and link_id = #{linkId} + + + and link_name = #{linkName} + + + and status = #{status} + + + and mobile = #{mobile} + + + and order_time > #{beginTime} + + + and order_time < #{endTime} + and next_pay_time > #{beginSearchNextPayTime} diff --git a/rights-server/src/main/resources/mapper/business/RightsOrderMapper.xml b/rights-server/src/main/resources/mapper/business/RightsOrderMapper.xml index 6baa082..89dd3e2 100644 --- a/rights-server/src/main/resources/mapper/business/RightsOrderMapper.xml +++ b/rights-server/src/main/resources/mapper/business/RightsOrderMapper.xml @@ -20,7 +20,7 @@ and order_time > #{beginTime} - and order_time < #{beginTime} + and order_time < #{endTime}