修改bug

Pu Zhibing

2025-04-18 f17933a034b526eaec27c7bfe6759b1579bc1216

 DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java

@@ -134,7 +134,7 @@
        if(null != reassign.getPayType()){
            if(reassign.getPayType() == 1){//微信支付
                reassign.setState(1);
                ResultUtil resultUtil1 = payMoneyUtil.weixinpay("改派订单",reassign.getId()+"",reassign.getId() + "_" + reassign.getOrderType(),aDouble+"","/base/wxReassign","APP");
                ResultUtil resultUtil1 = payMoneyUtil.weixinpay("改派订单",reassign.getId()+"",reassign.getId() + "_" + reassign.getOrderType(),aDouble+"","/base/wxReassign","APP", "");
                //Map<String, String> map = icbcPayUtil.placeAnOrder(reassign.getId() + "_" + reassign.getOrderType(), 9, 5, uid.toString(), "改派订单", aDouble, callbackPath + "/base/wxReassign", "", type, driver.getAppletsOpenId());
                if(resultUtil1.getCode()==200){
                    paymentRecordService.saveData(1, null, null, reassign.getOrderId(), reassign.getOrderType(), 1, aDouble, null, 1);//添加预支付数据
@@ -145,7 +145,7 @@
            }
            if(reassign.getPayType() == 2){//支付宝
                reassign.setState(1);
                ResultUtil resultUtil1 = payMoneyUtil.alipay("改派订单","改派订单",reassign.getId() + "_" + reassign.getOrderType(),aDouble+"","/base/aliReassign");
                ResultUtil resultUtil1 = payMoneyUtil.alipay("改派订单","改派订单",reassign.getId() + "_" + reassign.getOrderType(),aDouble+"","/base/aliReassign", "");
                //Map<String, String> map = icbcPayUtil.placeAnOrder(reassign.getId() + "_" + reassign.getOrderType(), 10, 5, uid.toString(), "改派订单", aDouble, callbackPath + "/base/aliReassign", "", 2, "");
                if(resultUtil1.getCode()==200){
                    paymentRecordService.saveData(1, null, null, reassign.getOrderId(), reassign.getOrderType(), 2, aDouble, null, 1);//添加预支付数据
@@ -226,9 +226,9 @@
                map.put("orderId", reassign.getOrderId().toString());
                map.put("orderType", reassign.getOrderType().toString());
                List<Dispatch> dispatches = dispatchMapper.queryDispatchs(driver.getFranchiseeId() == null ? driver.getCompanyId() : driver.getFranchiseeId(), 1);
                for(Dispatch dispatch : dispatches){
                    jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
                }
//                for(Dispatch dispatch : dispatches){
//                    jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
//                }
            }
        }
        return resultUtil;
@@ -293,7 +293,7 @@
        if(null != reassign.getPayType()){
            if(reassign.getPayType() == 1){//微信支付
                String[] split1 = ids.split(",");
                resultUtil = payMoneyUtil.weixinpay("改派订单",ids+"",ids + "_3",totalMoney+"","/base/wxReassign","APP");
                resultUtil = payMoneyUtil.weixinpay("改派订单",ids+"",ids + "_3",totalMoney+"","/base/wxReassign","APP", "");
                //Map<String, String> map = icbcPayUtil.placeAnOrder(ids + "_3", 9, 5, uid.toString(), "改派订单", totalMoney, callbackPath + "/base/wxReassign", "", type, driver.getAppletsOpenId());
                if(resultUtil.getCode()==200){
                    for(String id : split1){
@@ -306,7 +306,7 @@
            }
            if(reassign.getPayType() == 2){//支付宝
                String[] split1 = ids.split(",");
                resultUtil = payMoneyUtil.alipay("改派订单","v",ids + "_3",totalMoney+"","/base/aliReassign");
                resultUtil = payMoneyUtil.alipay("改派订单","v",ids + "_3",totalMoney+"","/base/aliReassign", "");
                //Map<String, String> map = icbcPayUtil.placeAnOrder(ids + "_3", 10, 5, uid.toString(), "改派订单", totalMoney, callbackPath + "/base/aliReassign", "", 2, "");
                if(resultUtil.getCode()==200){
                    for(String id : split1){
@@ -351,9 +351,9 @@
                map.put("orderId", reassign.getOrderId().toString());
                map.put("orderType", reassign.getOrderType().toString());
                List<Dispatch> dispatches = dispatchMapper.queryDispatchs(driver.getFranchiseeId() == null ? driver.getCompanyId() : driver.getFranchiseeId(), 1);
                for(Dispatch dispatch : dispatches){
                    jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
                }
//                for(Dispatch dispatch : dispatches){
//                    jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
//                }
            }
        }
        return resultUtil;
@@ -406,9 +406,9 @@
                        map.put("orderId", reassign.getOrderId().toString());
                        map.put("orderType", reassign.getOrderType().toString());
                        List<Dispatch> dispatches = dispatchMapper.queryDispatchs(driver.getFranchiseeId() == null ? driver.getCompanyId() : driver.getFranchiseeId(), 1);
                        for(Dispatch dispatch : dispatches){
                            jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
                        }
//                        for(Dispatch dispatch : dispatches){
//                            jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
//                        }
                    }
                    query.setState(2);
                    query.setCode(order_id);
@@ -498,9 +498,9 @@
                map.put("orderId", reassign.getOrderId().toString());
                map.put("orderType", reassign.getOrderType().toString());
                List<Dispatch> dispatches = dispatchMapper.queryDispatchs(driver.getFranchiseeId() == null ? driver.getCompanyId() : driver.getFranchiseeId(), 1);
                for(Dispatch dispatch : dispatches){
                    jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
                }
//                for(Dispatch dispatch : dispatches){
//                    jgPushUtil.push(2,"有新的改派订单需要处理，请及时处理！", "订单改派", map, "DISPATCH" + dispatch.getId());
//                }
            }else{
                System.err.println("预支付数据异常（orderId = "  + id + ")");
            }