Merge remote-tracking branch 'origin/master'

Pu Zhibing

2 天以前 de6605cf7988050e0d1c6261325c4e2e9f097788

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/qianyuntong/OrderUtil.java

@@ -74,7 +74,7 @@
//      List<GoodsInfoRequest> goodsInfo = new ArrayList<>();
//      GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest();
//      goodsInfoRequest.setId("981100006005901");
//      goodsInfoRequest.setSubAppId("wxcc3c9058e2b294db");
//      goodsInfoRequest.setSubAppId("wx1f52be0fdb1d2875");
//      goodsInfoRequest.setSubOpenId("oVLur61wBKJEO7QPR1dsmzS5TSfs");
//      goodsInfoRequest.setProfitSharing("1");
//      goodsInfoRequest.setAreaInfo("520100");
@@ -108,7 +108,7 @@
//      List<GoodsInfoRequest> goodsInfo = new ArrayList<>();
//      GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest();
//      goodsInfoRequest.setId("981100006005901");
//      goodsInfoRequest.setSubAppId("wxcc3c9058e2b294db");
//      goodsInfoRequest.setSubAppId("wx1f52be0fdb1d2875");
//      goodsInfoRequest.setSubOpenId("oVLur61wBKJEO7QPR1dsmzS5TSfs");
//      goodsInfoRequest.setProfitSharing("1");
//      goodsInfoRequest.setAreaInfo("520100");
@@ -191,7 +191,7 @@
      tradePayOff1Data.setAccessMode("APP");
      tradePayOff1Data.getGoodsInfo().forEach(goodsInfoRequest -> {
         goodsInfoRequest.setId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "9811000039358999" : "981100006005901");
         goodsInfoRequest.setSubAppId("wxcc3c9058e2b294db");
         goodsInfoRequest.setSubAppId("wx1f52be0fdb1d2875");
         
         goodsInfoRequest.setAreaInfo("520100");
         goodsInfoRequest.setPayType("0");
@@ -397,7 +397,7 @@
      tradeOrderCreateData.setAccessMode("APP");
      tradeOrderCreateData.getGoodsInfo().forEach(goodsInfoRequest -> {
         goodsInfoRequest.setId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "9811000039358999" : "981100006005901");
         goodsInfoRequest.setSubAppId("wxcc3c9058e2b294db");
         goodsInfoRequest.setSubAppId("wx1f52be0fdb1d2875");
         goodsInfoRequest.setAreaInfo("520100");
         goodsInfoRequest.setPayType("0");
         goodsInfoRequest.setBusinessType("10408");