java/QianYunTong.git

			@@ -2204,7 +2204,12 @@
			//调用中台创建订单及拉起支付接口
			TradeOrderCreateData tradeOrderCreateData = new TradeOrderCreateData();
			tradeOrderCreateData.setTreatShopId(driver.getEmpId().toString());
			tradeOrderCreateData.setField1("{\"profitSharing\":\"1\",\"isPromote\":\"" + (orderPrivateCar.getPromotion() == 2 ? 1 : 0) + "\"}");
			//追缴单不要分账
			if(0 == orderPrivateCar.getRecoveryOrder()){
			tradeOrderCreateData.setField1("{\"profitSharing\":\"1\",\"isPromote\":\"" + (orderPrivateCar.getPromotion() == 2 ? 1 : 0) + "\"}");
			}else{
			tradeOrderCreateData.setField1("{\"profitSharing\":\"0\",\"isPromote\":\"0\"}");
			}
			tradeOrderCreateData.setCharge(new BigDecimal(orderMoney));
			tradeOrderCreateData.setOrderId(orderPrivateCar.getTravelId());
			tradeOrderCreateData.setOrderNo("PR" + orderPrivateCar.getId());
			@@ -2218,6 +2223,11 @@
			List<GoodsInfoRequest> goodsInfo = new ArrayList<>();
			GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest();
			goodsInfoRequest.setSubOpenId(userInfo.getAppletsOpenId());
			if(0 == orderPrivateCar.getRecoveryOrder()){
			goodsInfoRequest.setProfitSharing("1");
			}else{
			goodsInfoRequest.setProfitSharing("0");
			}
			goodsInfo.add(goodsInfoRequest);
			tradeOrderCreateData.setGoodsInfo(goodsInfo);
			TradeOrderCreate tradeOrderCreate = OrderUtil.tradeOrderCreate1(tradeOrderCreateData);
			@@ -2238,6 +2248,11 @@
			List<GoodsInfoRequest> goodsInfo = new ArrayList<>();
			GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest();
			goodsInfoRequest.setSubOpenId(userInfo.getAppletsOpenId());
			if(0 == orderPrivateCar.getRecoveryOrder()){
			goodsInfoRequest.setProfitSharing("1");
			}else{
			goodsInfoRequest.setProfitSharing("0");
			}
			goodsInfo.add(goodsInfoRequest);
			tradePayOff1Data.setGoodsInfo(goodsInfo);
			PayInfo payInfo = OrderUtil.tradePayOff1(tradePayOff1Data);