Merge branch 'pre' into dev

cweb/src/main/java/com/cweb/notify/TianQueController.java

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

open-api/src/main/java/com/api/controller/v1/NotifyController.java

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

open-api/src/main/java/com/api/controller/v1/TradeController.java

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

service/src/main/java/com/hfkj/openapi/v1/model/response/ResponseQueryTradeModel.java

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