Compare commits

..

No commits in common. 'bafb6b15584f18b215366f9ca4cbd40b13534395' and '0f8aed49596e01c76aaa2aa1ee034f740c134a3e' have entirely different histories.

  1. 2
      cweb/src/main/java/com/cweb/notify/TianQueController.java
  2. 4
      open-api/src/main/java/com/api/controller/v1/NotifyController.java
  3. 2
      open-api/src/main/java/com/api/controller/v1/TradeController.java
  4. 5
      service/src/main/java/com/hfkj/openapi/v1/model/response/ResponseQueryTradeModel.java

@ -101,7 +101,7 @@ public class TianQueController {
tradeOrderService.paySuccess( tradeOrderService.paySuccess(
body.getString("ordNo"), body.getString("ordNo"),
body.getString("sxfUuid"), body.getString("uuid"),
PlatformTypeEnum.type5, PlatformTypeEnum.type5,
TradeOrderPayModeEnum.getNameByCode(body.getString("payType")), TradeOrderPayModeEnum.getNameByCode(body.getString("payType")),
body.getBigDecimal("totalOffstAmt"), body.getBigDecimal("totalOffstAmt"),

@ -89,7 +89,6 @@ public class NotifyController {
responseQueryTradeModel.setMerchantNo(tradeOrder.getMerNo()); responseQueryTradeModel.setMerchantNo(tradeOrder.getMerNo());
responseQueryTradeModel.setOutTradeNo(tradeOrder.getOutTradeNo()); responseQueryTradeModel.setOutTradeNo(tradeOrder.getOutTradeNo());
responseQueryTradeModel.setAccTradeNo(tradeOrder.getAccTradeNo()); responseQueryTradeModel.setAccTradeNo(tradeOrder.getAccTradeNo());
responseQueryTradeModel.setPlatformTradeNo(tradeOrder.getPlatformTradeNo());
responseQueryTradeModel.setUserId(tradeOrder.getPayUserId()); responseQueryTradeModel.setUserId(tradeOrder.getPayUserId());
responseQueryTradeModel.setPayMode(tradeOrder.getPayMode()); responseQueryTradeModel.setPayMode(tradeOrder.getPayMode());
responseQueryTradeModel.setTradeAmount(tradeOrder.getTradeAmount()); responseQueryTradeModel.setTradeAmount(tradeOrder.getTradeAmount());
@ -152,7 +151,7 @@ public class NotifyController {
} }
tradeOrderService.paySuccess( tradeOrderService.paySuccess(
body.getString("ordNo"), body.getString("ordNo"),
body.getString("sxfUuid"), body.getString("uuid"),
PlatformTypeEnum.type5, PlatformTypeEnum.type5,
TradeOrderPayModeEnum.getNameByCode(body.getString("payType")), TradeOrderPayModeEnum.getNameByCode(body.getString("payType")),
body.getBigDecimal("totalOffstAmt"), body.getBigDecimal("totalOffstAmt"),
@ -167,7 +166,6 @@ public class NotifyController {
responseQueryTradeModel.setMerchantNo(tradeOrder.getMerNo()); responseQueryTradeModel.setMerchantNo(tradeOrder.getMerNo());
responseQueryTradeModel.setOutTradeNo(tradeOrder.getOutTradeNo()); responseQueryTradeModel.setOutTradeNo(tradeOrder.getOutTradeNo());
responseQueryTradeModel.setAccTradeNo(tradeOrder.getAccTradeNo()); responseQueryTradeModel.setAccTradeNo(tradeOrder.getAccTradeNo());
responseQueryTradeModel.setPlatformTradeNo(tradeOrder.getPlatformTradeNo());
responseQueryTradeModel.setUserId(tradeOrder.getPayUserId()); responseQueryTradeModel.setUserId(tradeOrder.getPayUserId());
responseQueryTradeModel.setPayMode(tradeOrder.getPayMode()); responseQueryTradeModel.setPayMode(tradeOrder.getPayMode());
responseQueryTradeModel.setTradeAmount(tradeOrder.getTradeAmount()); responseQueryTradeModel.setTradeAmount(tradeOrder.getTradeAmount());

@ -116,7 +116,6 @@ public class TradeController {
tradeOrder.setAttach(body.getAttach()); tradeOrder.setAttach(body.getAttach());
tradeOrder.setSpecialField(body.getSpecialField()); tradeOrder.setSpecialField(body.getSpecialField());
tradeOrder.setRequestIp(RequestUtils.getIpAddress(request)); tradeOrder.setRequestIp(RequestUtils.getIpAddress(request));
tradeOrder.setRebateActivityPart(false);
// 创建交易订单 // 创建交易订单
Map<String, Object> returnParam = openApiTradeOrderService.createOrder(tradeOrder); Map<String, Object> returnParam = openApiTradeOrderService.createOrder(tradeOrder);
@ -152,7 +151,6 @@ public class TradeController {
responseQueryTradeModel.setMerchantNo(tradeOrder.getMerNo()); responseQueryTradeModel.setMerchantNo(tradeOrder.getMerNo());
responseQueryTradeModel.setOutTradeNo(tradeOrder.getOutTradeNo()); responseQueryTradeModel.setOutTradeNo(tradeOrder.getOutTradeNo());
responseQueryTradeModel.setAccTradeNo(tradeOrder.getAccTradeNo()); responseQueryTradeModel.setAccTradeNo(tradeOrder.getAccTradeNo());
responseQueryTradeModel.setPlatformTradeNo(tradeOrder.getPlatformTradeNo());
responseQueryTradeModel.setUserId(tradeOrder.getPayUserId()); responseQueryTradeModel.setUserId(tradeOrder.getPayUserId());
responseQueryTradeModel.setPayMode(tradeOrder.getPayMode()); responseQueryTradeModel.setPayMode(tradeOrder.getPayMode());
responseQueryTradeModel.setTradeAmount(tradeOrder.getTradeAmount()); responseQueryTradeModel.setTradeAmount(tradeOrder.getTradeAmount());

@ -31,11 +31,6 @@ public class ResponseQueryTradeModel {
*/ */
private String accTradeNo; private String accTradeNo;
/**
* 平台渠道交易单号
*/
private String platformTradeNo;
/** /**
* 用户标识 * 用户标识
*/ */

Loading…
Cancel
Save