Merge remote-tracking branch 'origin/master'

puzhibing

2023-05-18 53562814add61acfdc02d6b25dae6324f6fd5f92

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java

@@ -81,30 +81,30 @@
     * @throws Exception
     */
    @Override
    public ResultUtil weChatPay(Integer orderId, Integer orderType, Integer type, Integer userType, Integer uid, String content) throws Exception {
    public ResultUtil weChatPay(Integer orderId, Integer orderType, Integer type, Integer userType, Integer uid, String content, Integer language) throws Exception {
        JSONObject jsonObject = JSON.parseObject(content);
        switch (type){
            case 1://订单完成支付
                switch (orderType){
                    case 1:
                        return orderPrivateCarService.payPrivateCarOrder(1, orderId, (null == jsonObject ? null : jsonObject.getIntValue("couponId")), 3);
                    case 2:
                        return orderTaxiService.payTaxiOrder(1, orderId, (null == jsonObject ? null : jsonObject.getIntValue("couponId")), 3);
                    case 3:
                        return orderCrossCityService.payCrossCityOrder(1, orderId, (null == jsonObject ? null : jsonObject.getIntValue("couponId")), 3);
                    case 4:
                        return orderLogisticsService.payLogisticsOrder(1, orderId, 3);
                    case 5:
                        return orderLogisticsService.payLogisticsOrder(1, orderId, 3);
                }
//                switch (orderType){
//                    case 1:
//                        return orderPrivateCarService.payPrivateCarOrder(1, orderId, (null == jsonObject ? null : jsonObject.getIntValue("couponId")), 3, 1);
//                    case 2:
//                        return orderTaxiService.payTaxiOrder(1, orderId, (null == jsonObject ? null : jsonObject.getIntValue("couponId")), 3);
//                    case 3:
//                        return orderCrossCityService.payCrossCityOrder(1, orderId, (null == jsonObject ? null : jsonObject.getIntValue("couponId")), 3);
//                    case 4:
//                        return orderLogisticsService.payLogisticsOrder(1, orderId, 3, 1);
//                    case 5:
//                        return orderLogisticsService.payLogisticsOrder(1, orderId, 3, 1);
//                }
            case 2://订单取消支付
                switch (orderType){
                    case 1:
                        return orderPrivateCarService.cancleOrderPrivateCar(orderId, 1, null == jsonObject ? null : jsonObject.getIntValue("cancelId"), 3);
//                        return orderPrivateCarService.cancleOrderPrivateCar(orderId, 1, null == jsonObject ? null : jsonObject.getIntValue("cancelId"), 3);
                    case 2:
                        return orderTaxiService.cancleOrderTaxi(orderId, 1, null == jsonObject ? null : jsonObject.getIntValue("cancelId"), 3);
                        return orderTaxiService.cancleOrderTaxi(orderId, 1, null == jsonObject ? null : jsonObject.getIntValue("cancelId"), 3, language);
                    case 3:
                        return orderCrossCityService.cancleOrderCrossCity(orderId, 1, null == jsonObject ? null : jsonObject.getIntValue("cancelId"), 3);
                        return orderCrossCityService.cancleOrderCrossCity(orderId, 1, null == jsonObject ? null : jsonObject.getIntValue("cancelId"), 3, language);
                }

            case 3://司机端改派支付
@@ -125,13 +125,13 @@
                return ResultUtil.success(jsonObject1.getString("msg"), jsonObject1.getString("data"));
            case 4://余额充值
                if(userType == 1){
                    return userInfoService.depositBalance(1, jsonObject.getDoubleValue("money"), uid, 3);
//                    return userInfoService.depositBalance(1, jsonObject.getDoubleValue("money"), uid, 3, 1);
                }
                if(userType == 2){

                }
            case 5://小件物流补差价
                return orderLogisticsService.payLogisticsOrder_(1, orderId, 3);
//                return orderLogisticsService.payLogisticsOrder_(1, orderId, 3);
        }
        return ResultUtil.success();
    }