|
|
@ -179,7 +179,7 @@ public class AliPayController { |
|
|
// public FResult<?> agreementPay(@RequestBody AliPayInOrderByAgreementDto inOrderByAgreementDto) {
|
|
|
// public FResult<?> agreementPay(@RequestBody AliPayInOrderByAgreementDto inOrderByAgreementDto) {
|
|
|
// //AliPayEntity aliPayEntity = aliPayService.getOne(new QueryWrapper<AliPayEntity>().eq("mobile", inOrderByAgreementDto.getMobile()).eq("type", 1).eq("status", 1).orderByDesc("order_time"));
|
|
|
// //AliPayEntity aliPayEntity = aliPayService.getOne(new QueryWrapper<AliPayEntity>().eq("mobile", inOrderByAgreementDto.getMobile()).eq("type", 1).eq("status", 1).orderByDesc("order_time"));
|
|
|
// inOrderByAgreementDto.setAuthCode("签约号");
|
|
|
// inOrderByAgreementDto.setAuthCode("签约号");
|
|
|
// inOrderByAgreementDto.setSubject("会员随心选");
|
|
|
// inOrderByAgreementDto.setSubject("惠点联合会员");
|
|
|
// inOrderByAgreementDto.setTotalAmount("19.90");
|
|
|
// inOrderByAgreementDto.setTotalAmount("19.90");
|
|
|
// String outTradeNo = OrderUtil.getOutTradeNo();
|
|
|
// String outTradeNo = OrderUtil.getOutTradeNo();
|
|
|
// inOrderByAgreementDto.setOutTradeNo(outTradeNo);
|
|
|
// inOrderByAgreementDto.setOutTradeNo(outTradeNo);
|
|
|
@ -335,7 +335,7 @@ public class AliPayController { |
|
|
//aliPaySigningOrderService.update(new AliPaySigningOrderEntity(), updateWrapper);
|
|
|
//aliPaySigningOrderService.update(new AliPaySigningOrderEntity(), updateWrapper);
|
|
|
AliPayInOrderByAgreementReq payInOrderByAgreementReq = new AliPayInOrderByAgreementReq(); |
|
|
AliPayInOrderByAgreementReq payInOrderByAgreementReq = new AliPayInOrderByAgreementReq(); |
|
|
payInOrderByAgreementReq.setAuthCode(agreementNo); |
|
|
payInOrderByAgreementReq.setAuthCode(agreementNo); |
|
|
payInOrderByAgreementReq.setSubject("会员随心选"); |
|
|
payInOrderByAgreementReq.setSubject("惠点联合会员"); |
|
|
String price = "19.9"; |
|
|
String price = "19.9"; |
|
|
payInOrderByAgreementReq.setTotalAmount(price); |
|
|
payInOrderByAgreementReq.setTotalAmount(price); |
|
|
String outTradeNo = OrderUtil.getOutTradeNo(); |
|
|
String outTradeNo = OrderUtil.getOutTradeNo(); |
|
|
@ -464,7 +464,7 @@ public class AliPayController { |
|
|
aliPayOrderEntity.setBusinessType(aliPaySigningOrderEntity.getBusinessType()); |
|
|
aliPayOrderEntity.setBusinessType(aliPaySigningOrderEntity.getBusinessType()); |
|
|
aliPayOrderEntity.setLinkId(aliPaySigningOrderEntity.getLinkId()); |
|
|
aliPayOrderEntity.setLinkId(aliPaySigningOrderEntity.getLinkId()); |
|
|
aliPayOrderEntity.setLinkName(aliPaySigningOrderEntity.getLinkName()); |
|
|
aliPayOrderEntity.setLinkName(aliPaySigningOrderEntity.getLinkName()); |
|
|
aliPayOrderEntity.setOrderName("会员随心选"); |
|
|
aliPayOrderEntity.setOrderName("惠点联合会员"); |
|
|
if ("TRADE_SUCCESS".equals(tradeStatus) || "TRADE_FINISHED".equals(tradeStatus)) { |
|
|
if ("TRADE_SUCCESS".equals(tradeStatus) || "TRADE_FINISHED".equals(tradeStatus)) { |
|
|
aliPayOrderEntity.setStatus(1); |
|
|
aliPayOrderEntity.setStatus(1); |
|
|
aliPayOrderService.save(aliPayOrderEntity); |
|
|
aliPayOrderService.save(aliPayOrderEntity); |
|
|
|