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 2844b93..8497a6d 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 @@ -39,10 +39,7 @@ import javax.annotation.PostConstruct; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.time.LocalDateTime; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @author :WXC @@ -144,6 +141,9 @@ public class AliPayController { aliPaySigningOrderEntity.setOrderName("优爱腾三方权益业务"); aliPaySigningOrderEntity.setPrice(price); aliPaySigningOrderEntity.setBusinessType(1); + if (signUpDto.getSendApiData()!=null&&!Objects.equals(signUpDto.getSendApiData(), "")) { + aliPaySigningOrderEntity.setSendApiData(signUpDto.getSendApiData()); + } if (StringUtils.isBlank(signUrl)) { aliPaySigningOrderEntity.setStatus(0); aliPaySigningOrderService.save(aliPaySigningOrderEntity); @@ -469,13 +469,17 @@ public class AliPayController { aliPayOrderEntity.setStatus(1); aliPayOrderService.save(aliPayOrderEntity); log.info("支付订单保存成功"+aliPayOrderEntity); - //回传 - if (1161==aliPaySigningOrderEntity.getLinkId()){ - //查看是否发送 - if (sendSuccessMobileService.ifSendDataByType(aliPaySigningOrderEntity.getLinkId().toString())) { + //查看是否发送 + if (sendSuccessMobileService.ifSendDataByType(aliPaySigningOrderEntity.getLinkId().toString())) { + //回传 1161张敏渠道 + if (1161==aliPaySigningOrderEntity.getLinkId()){ //回传成功数据 sendSuccessMobileService.sendSuccessMobile(aliPaySigningOrderEntity.getMobile(),"zm"); } + //回传 1160推啊渠道 + if (1160==aliPaySigningOrderEntity.getLinkId()){ + sendSuccessMobileService.sendSuccessMobile(aliPaySigningOrderEntity.getSendApiData(),"tuia"); + } } // if (b){ // log.info("支付订单保存成功"+aliPayEntity.getOrderId()+"=====status:"+aliPayEntity.getStatus()); diff --git a/rights-entity/src/main/java/com/cyjd/rights/dto/AliPaySignUpDto.java b/rights-entity/src/main/java/com/cyjd/rights/dto/AliPaySignUpDto.java index b0c13fc..6ec37f5 100644 --- a/rights-entity/src/main/java/com/cyjd/rights/dto/AliPaySignUpDto.java +++ b/rights-entity/src/main/java/com/cyjd/rights/dto/AliPaySignUpDto.java @@ -44,6 +44,6 @@ public class AliPaySignUpDto { private Integer linkId; - + private String sendApiData; } diff --git a/rights-entity/src/main/java/com/cyjd/rights/entity/AliPaySigningOrderEntity.java b/rights-entity/src/main/java/com/cyjd/rights/entity/AliPaySigningOrderEntity.java index 4e04424..412c5aa 100644 --- a/rights-entity/src/main/java/com/cyjd/rights/entity/AliPaySigningOrderEntity.java +++ b/rights-entity/src/main/java/com/cyjd/rights/entity/AliPaySigningOrderEntity.java @@ -57,6 +57,9 @@ public class AliPaySigningOrderEntity { * 下次续费时间 */ private LocalDateTime nextPayTime; - + /** + * 回传成功数据 + */ + private String sendApiData; } 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 072f7c6..5bc95e6 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 @@ -11,6 +11,7 @@ import lombok.extern.java.Log; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.net.URL; import java.time.LocalDateTime; import java.util.HashMap; @@ -29,7 +30,11 @@ public class SendSuccessMobileServiceImpl implements SendSuccessMobileService { params.put("mobile",mobile); params.put("date", LocalDateTime.now()); HttpUtils.sendPostJSON(baseUrl, JSON.toJSONString(params)); + } else if ("tuia".equals(channelName)) { + String url="https://activity.tuia.cn/log/effect/v2?a_oId="+mobile+"&advertKey=75FEC8A0D38E22BE3B9695460D1A2BB6&subType=3"; + HttpUtils.sendGet(url); } + } @Override