From f604df04d1f9fe90ee543a1772a3a8cdb50d3d66 Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期五, 08 八月 2025 15:19:07 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong --- UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java index 800a5a2..e586502 100644 --- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java +++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java @@ -1615,7 +1615,12 @@ //调用中台创建订单及拉起支付接口 TradeOrderCreateData tradeOrderCreateData = new TradeOrderCreateData(); tradeOrderCreateData.setTreatShopId(driver.getEmpId().toString()); - tradeOrderCreateData.setField1("{\"profitSharing\":\"1\",\"isPromote\":\"" + (orderTaxi.getPromotion() == 2 ? 1 : 0) + "\"}"); + //追缴单不要分账 + if(0 == orderTaxi.getRecoveryOrder()){ + tradeOrderCreateData.setField1("{\"profitSharing\":\"1\",\"isPromote\":\"" + (orderTaxi.getPromotion() == 2 ? 1 : 0) + "\"}"); + }else{ + tradeOrderCreateData.setField1("{\"profitSharing\":\"0\",\"isPromote\":\"0\"}"); + } tradeOrderCreateData.setCharge(new BigDecimal(orderMoney)); tradeOrderCreateData.setOrderId(orderTaxi.getTravelId()); tradeOrderCreateData.setOrderNo("TA" + orderTaxi.getId()); @@ -1629,6 +1634,11 @@ List<GoodsInfoRequest> goodsInfo = new ArrayList<>(); GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest(); goodsInfoRequest.setSubOpenId(userInfo.getAppletsOpenId()); + if(0 == orderTaxi.getRecoveryOrder()){ + goodsInfoRequest.setProfitSharing("1"); + }else{ + goodsInfoRequest.setProfitSharing("0"); + } goodsInfo.add(goodsInfoRequest); tradeOrderCreateData.setGoodsInfo(goodsInfo); TradeOrderCreate tradeOrderCreate = OrderUtil.tradeOrderCreate1(tradeOrderCreateData); @@ -1641,7 +1651,7 @@ }else{ //拉起支付 TradePayOff1Data tradePayOff1Data = new TradePayOff1Data(); - tradePayOff1Data.setPartnerPayId("PR" + orderTaxi.getId()); + tradePayOff1Data.setPartnerPayId(orderTaxi.getTravelId()); tradePayOff1Data.setTotalFee(Double.valueOf(orderMoney * 100).intValue() + ""); tradePayOff1Data.setRetUrl(path); tradePayOff1Data.setClientIp(ip); @@ -1649,6 +1659,11 @@ List<GoodsInfoRequest> goodsInfo = new ArrayList<>(); GoodsInfoRequest goodsInfoRequest = new GoodsInfoRequest(); goodsInfoRequest.setSubOpenId(userInfo.getAppletsOpenId()); + if(0 == orderTaxi.getRecoveryOrder()){ + goodsInfoRequest.setProfitSharing("1"); + }else{ + goodsInfoRequest.setProfitSharing("0"); + } goodsInfo.add(goodsInfoRequest); tradePayOff1Data.setGoodsInfo(goodsInfo); PayInfo payInfo = OrderUtil.tradePayOff1(tradePayOff1Data); -- Gitblit v1.7.1