修改bug

Pu Zhibing

21 小时以前 f72ae151cc12b219cb5f39eea3ec0ea089a6ef2a

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

@@ -181,9 +181,10 @@
    * 拉起支付
    *
    * @param tradePayOff1Data
    * @param recoveryOrder
    * @return
    */
   public static PayInfo tradePayOff1(TradePayOff1Data tradePayOff1Data) {
   public static PayInfo tradePayOff1(TradePayOff1Data tradePayOff1Data, Integer recoveryOrder) {
      tradePayOff1Data.setPartnerId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "5401007" : "5400004");
      tradePayOff1Data.setTimeout("72H");
      tradePayOff1Data.setScene("TRAFFIC");
@@ -191,8 +192,12 @@
      tradePayOff1Data.setNeedLoginFlag("N");
      tradePayOff1Data.setAccessMode("APP");
      tradePayOff1Data.getGoodsInfo().forEach(goodsInfoRequest -> {
         goodsInfoRequest.setId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "9811000039358999" : "981100006005901");
         goodsInfoRequest.setSubAppId("wxcc3c9058e2b294db");
         if(0 == recoveryOrder){
            goodsInfoRequest.setId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "9811000039358999" : "981100006005901");
         }else{
            goodsInfoRequest.setId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "981100006228370" : "981100006005901");
         }
         goodsInfoRequest.setSubAppId(qianYunTongConfig.getAppId());
         
         goodsInfoRequest.setAreaInfo("520100");
         goodsInfoRequest.setPayType("0");
@@ -386,7 +391,7 @@
    * @param tradeOrderCreateData
    * @return
    */
   public static TradeOrderCreate tradeOrderCreate1(TradeOrderCreateData tradeOrderCreateData) {
   public static TradeOrderCreate tradeOrderCreate1(TradeOrderCreateData tradeOrderCreateData, Integer recoveryOrder) {
      tradeOrderCreateData.setScene("TRAFFIC");
      tradeOrderCreateData.setPartnerId("522700");
      tradeOrderCreateData.setTimeout("72H");
@@ -397,8 +402,12 @@
      tradeOrderCreateData.setNeedLoginFlag("N");
      tradeOrderCreateData.setAccessMode("APP");
      tradeOrderCreateData.getGoodsInfo().forEach(goodsInfoRequest -> {
         goodsInfoRequest.setId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "9811000039358999" : "981100006005901");
         goodsInfoRequest.setSubAppId("wxcc3c9058e2b294db");
         if(0 == recoveryOrder){
            goodsInfoRequest.setId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "9811000039358999" : "981100006005901");
         }else{
            goodsInfoRequest.setId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "981100006228370" : "981100006005901");
         }
         goodsInfoRequest.setSubAppId(qianYunTongConfig.getAppId());
         goodsInfoRequest.setAreaInfo("520100");
         goodsInfoRequest.setPayType("0");
         goodsInfoRequest.setBusinessType("10408");
@@ -529,9 +538,9 @@
      tradePayOffData.setPaymentInfos(paymentInfoRequests);
      List<GoodsInfo> goodsInfo = new ArrayList<>();
      GoodsInfo goodsInfo1 = new GoodsInfo();
      goodsInfo1.setMerchantCode("B00000905");
      goodsInfo1.setCustId("CB0000004686");
      goodsInfo1.setCustName("证联消费平台交易客户");
      goodsInfo1.setMerchantCode("prod".equals(qianYunTongConfig.getActiveProfile()) ? "B00001404" : "B00000905");
      goodsInfo1.setCustId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "CB0000004853" : "CB0000004686");
      goodsInfo1.setCustName("prod".equals(qianYunTongConfig.getActiveProfile()) ? "黔南云码通数字产业运营有限公司" : "证联消费平台交易客户");
      goodsInfo1.setBusinessType("10408");
      goodsInfo1.setAgreementNo("prod".equals(qianYunTongConfig.getActiveProfile()) ? "00000402485377063581755054680461" : "00000000468618354161754464398681");
      goodsInfo1.setProfitSharing("1");
@@ -587,7 +596,7 @@
    * @return
    */
   public static GetPaymentInfo paymentInfo(GetPaymentInfoDataRequest getPaymentInfoDataRequest) {
      getPaymentInfoDataRequest.setPartnerId("5400004");
      getPaymentInfoDataRequest.setPartnerId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "5401007" : "5400004");
      
      GetPaymentInfoRequest request = new GetPaymentInfoRequest();
      request.setRequstType("POST");