|
|
|
@ -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());
|
|
|
|
|