合并代码

Pu Zhibing

5 天以前 8522e469e00e1cf6c0410165b0f76c806c13ca83

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java

@@ -184,7 +184,7 @@
    * @return
    */
   public static PayInfo tradePayOff1(TradePayOff1Data tradePayOff1Data) {
      tradePayOff1Data.setPartnerId("5400004");
      tradePayOff1Data.setPartnerId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "5401007" : "5400004");
      tradePayOff1Data.setTimeout("72H");
      tradePayOff1Data.setScene("TRAFFIC");
      tradePayOff1Data.setCurrency("RMB");
@@ -201,7 +201,7 @@
      
      
      TradeRequest request = new TradeRequest<TradePayOff1Data>();
      request.setSceneId("1911676727023968256");
      request.setSceneId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "1954795404533583872" : "1911676727023968256");
      request.setAppId(qianYunTongConfig.getAppkey());
      request.setConfigVersion(1);
      request.setRequestId(UUIDUtil.getRandomCode());
@@ -392,7 +392,7 @@
      tradeOrderCreateData.setTimeout("72H");
      tradeOrderCreateData.setOrderAppId("52270015");
      tradeOrderCreateData.setChannelSource("GRJYCXWXXCX");
      tradeOrderCreateData.setPayPartnerId("5400004");
      tradeOrderCreateData.setPayPartnerId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "5401007" : "5400004");
      tradeOrderCreateData.setCurrency("RMB");
      tradeOrderCreateData.setNeedLoginFlag("N");
      tradeOrderCreateData.setAccessMode("APP");
@@ -406,7 +406,7 @@
      
      
      TradeRequest request = new TradeRequest<TradeOrderCreateData>();
      request.setSceneId("1945688132719169536");
      request.setSceneId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "1954793280550756352" : "1945688132719169536");
      request.setAppId(qianYunTongConfig.getAppkey());
      request.setConfigVersion(1);
      request.setRequestId(UUIDUtil.getRandomCode());
@@ -458,7 +458,7 @@
      createOrderRequest.setChannelSource("GRJYCXWXXCX");
      
      TradeRequest request = new TradeRequest<CreateOrderRequest>();
      request.setSceneId("1948289607125864448");
      request.setSceneId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "1954792737421942784" : "1948289607125864448");
      request.setAppId(qianYunTongConfig.getAppkey());
      request.setConfigVersion(1);
      request.setRequestId(UUIDUtil.getRandomCode());
@@ -504,7 +504,7 @@
    * @return
    */
   public static PayInfo tradePayOff(TradePayOffData tradePayOffData) {
      tradePayOffData.setPartnerId("5400005");
      tradePayOffData.setPartnerId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "5401008" : "5400005");
      tradePayOffData.setTimeout("72H");
      tradePayOffData.setScene("TRAFFIC");
      tradePayOffData.setCurrency("RMB");
@@ -533,16 +533,16 @@
      goodsInfo1.setCustId("CB0000004686");
      goodsInfo1.setCustName("证联消费平台交易客户");
      goodsInfo1.setBusinessType("10408");
      goodsInfo1.setAgreementNo("00000000468618354161754464398681");
      goodsInfo1.setAgreementNo("prod".equals(qianYunTongConfig.getActiveProfile()) ? "00000402485377063581755054680461" : "00000000468618354161754464398681");
      goodsInfo1.setProfitSharing("1");
      goodsInfo.add(goodsInfo1);
      tradePayOffData.setGoodsInfo(goodsInfo);
      
      
      TradeRequest request = new TradeRequest<TradePayOffData>();
      request.setSceneId("1774717104844095488");
      request.setSceneId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "1954794605782913024" : "1774717104844095488");
      request.setAppId(qianYunTongConfig.getAppkey());
      request.setConfigVersion(2);
      request.setConfigVersion("prod".equals(qianYunTongConfig.getActiveProfile()) ? 1 : 2);
      request.setRequestId(UUIDUtil.getRandomCode());
      request.setData(tradePayOffData);
      //请求路径