update

liujie

2025-11-28 df2040a2292de1e88b6c4d1f0ba7d9a62209d8cb

 UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaxiCardServiceImpl.java

@@ -10,7 +10,7 @@
import com.stylefeng.guns.modular.system.dao.TaxiCardMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.DouGongPayUtil;
import com.stylefeng.guns.modular.huifu.biz.DouGongPayUtil;
import com.stylefeng.guns.modular.system.util.GDMapGeocodingUtil;
import com.stylefeng.guns.modular.system.util.PayMoneyUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
@@ -313,6 +313,8 @@
        return taxiCardWapper;
    }

    @Autowired
    private DouGongPayUtil douGongPayUtil;
    @Override
    public ResultUtil payTaxiCard(Integer uid, Integer id, Integer payType, Integer type) throws Exception {
        UserInfo userInfo = userInfoService.selectById(uid);
@@ -356,12 +358,12 @@
        if(payType == 1){//微信支付
            String app = type == 1 ? "APP" : "JSAPI";
//            resultUtil = payMoneyUtil.weixinpay("购买出行卡", "", ToolUtil.getRandomString(10), taxiCard.getSellingPrice().toString(),  "/base/wxPayTaxiCardPaymentSpread", app, userInfo.getAppletsOpenId());
            resultUtil = DouGongPayUtil.wxPayOrder(taxiCard.getSellingPrice().toString(), userInfo.getAppletsOpenId(), "购买出行卡", 1, String.valueOf(id), 3);
            resultUtil = douGongPayUtil.wxPayOrder(taxiCard.getSellingPrice().toString(), userInfo.getAppletsOpenId(), "购买出行卡", 1, String.valueOf(taxiCardPayment.getId()), 3);
            paymentRecordService.saveData(4, taxiCardPayment.getUserId(), 1, taxiCardPayment.getId(), null, 1, taxiCard.getSellingPrice(), "", 1);//添加预支付数据
        }
        if(payType == 2){//支付宝支付
//            resultUtil = payMoneyUtil.alipay("购买出行卡", "购买出行卡", "", ToolUtil.getRandomString(10), taxiCard.getSellingPrice().toString(), "/base/aliPayTaxiCardPaymentSpread");
            resultUtil = DouGongPayUtil.aliPayOrder(taxiCard.getSellingPrice().toString(), userInfo.getAppletsOpenId(), "购买出行卡", 1, String.valueOf(id), 3);
            resultUtil = DouGongPayUtil.aliPayOrder(taxiCard.getSellingPrice().toString(), userInfo.getAppletsOpenId(), "购买出行卡", 1, String.valueOf(taxiCardPayment.getId()), 3);
            paymentRecordService.saveData(4, taxiCardPayment.getUserId(), 1, taxiCardPayment.getId(), null, 2, taxiCard.getSellingPrice(), "", 1);//添加预支付数据
        }
        if(payType == 3){//余额支付
@@ -468,7 +470,7 @@


            //添加已收入明细
            incomeService.saveData(1, taxiCardPayment.getCompanyId(), 5, taxiCardPayment.getId(), null,  taxiCardPayment.getPayMoney());
            incomeService.saveData(1, taxiCardPayment.getCompanyId(), 5, taxiCardPayment.getId(), null,  taxiCardPayment.getPayMoney(),null);
            systemNoticeService.addSystemNotice(1, "您已使用余额成功完成出行卡支付，谢谢使用！", uid, 1);
        }
        if(payType==4){
@@ -585,7 +587,7 @@
            }

            //添加已收入明细
            incomeService.saveData(1, taxiCardPayment.getCompanyId(), 5, taxiCardPayment.getId(), null,  taxiCardPayment.getPayMoney());
            incomeService.saveData(1, taxiCardPayment.getCompanyId(), 5, taxiCardPayment.getId(), null,  taxiCardPayment.getPayMoney(),null);
            systemNoticeService.addSystemNotice(1, "您已使用" + (taxiCardPayment.getPayType() == 1 ? "微信" : (taxiCardPayment.getPayType()==2?"支付宝":"云闪付")) + "成功完成出行卡支付，谢谢使用！", taxiCardPayment.getUserId(), 1);
            System.out.println("wxdck  okok");
        }catch (Exception e){