From de9d3974b9068ffc0893f62d33b50e3864603c80 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 06 九月 2024 17:38:56 +0800 Subject: [PATCH] 2.0bug修改 --- ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 101 +++++++++++++++++++++++++------------------------- 1 files changed, 50 insertions(+), 51 deletions(-) diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java index 8ad5472..6182e87 100644 --- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java +++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java @@ -12,6 +12,8 @@ import com.stylefeng.guns.modular.system.vo.PlatformVO; import com.stylefeng.guns.modular.system.vo.WaterMoneyVO; import com.stylefeng.guns.modular.system.vo.WaterVO; +import io.swagger.models.auth.In; +import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -529,6 +531,9 @@ Wrapper<OrderCancel> orderCancelEntityWrapper = new EntityWrapper<>(); // 用户取消订单记录 List<OrderCancel> orderCancels = new ArrayList<>(); + List<Integer> integers = new ArrayList<>(); + integers.add(1); + integers.add(2); if (time == 5 && !StringUtils.hasLength(insertTime)){ // 余额充值wrapper orderType = new EntityWrapper<TPubTransactionDetails>() @@ -555,6 +560,10 @@ // 司机手动结算金额 orderType1 = new EntityWrapper<SettlementDetail>() .in("orderType", Arrays.asList(1, 4)); + // 用户取消订单费用 + orderCancelEntityWrapper.eq("state", 2) + .eq("userType", 1).in("payType",integers) + ; }else{ orderType = new EntityWrapper<TPubTransactionDetails>() .eq("orderType", 5) @@ -587,15 +596,14 @@ // 用户取消订单费用 orderCancelEntityWrapper.eq("state", 2) .eq("userType", 1) + .in("payType",integers) .between("insertTime", start, end); } - - if (type != null){ switch (type){ case 1: // 只查询用户订单 - tOrderPrivateCars = orderPrivateCarService.selectList(tOrderPrivateCarEntityWrapper); + tOrderPrivateCars = orderPrivateCarService.selectList(tOrderPrivateCarEntityWrapper); tOrderLogistics = orderLogisticsService.selectList(tOrderLogisticsEntityWrapper); // 用户取消订单费用 orderCancelEntityWrapper.eq("state", 2) @@ -666,9 +674,9 @@ if (tOrderPrivateCar != null){ waterVO.setCode(tOrderPrivateCar.getOrderNum()); String string = tOrderPrivateCar.getPayMoney().toString(); - waterVO.setMoney(new BigDecimal(string)); + waterVO.setMoney(new BigDecimal(string)+""); }else{ - waterVO.setMoney(new BigDecimal("0")); + waterVO.setMoney(new BigDecimal("0")+""); } TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId()); if (user1!=null){ @@ -694,8 +702,8 @@ // 小件物流 waterVO.setCode(tOrderLogistic.getOrderNum()); String string = tOrderLogistic.getPayMoney().toString(); - waterVO.setMoney(new BigDecimal(string)); - waterVO.setMoney(new BigDecimal("0")); + waterVO.setMoney(new BigDecimal(string)+""); + waterVO.setMoney(new BigDecimal("0")+""); TUser user2 = appUserService.selectById(tOrderLogistic.getUserId()); if (user2!=null){ waterVO.setName(user2.getNickName()); @@ -721,7 +729,7 @@ WaterVO waterVO = new WaterVO(); switch (orderCancel.getOrderType()){ case 1: - TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(orderCancel); + TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(orderCancel.getOrderId()); if (tOrderPrivateCar == null){ continue; } @@ -732,18 +740,11 @@ continue; } } - switch (tOrderPrivateCar.getPayType()){ - case 1: - waterVO.setPayType("手机支付"); - break; - case 2: - waterVO.setPayType("银行卡支付"); - break; - } + waterVO.setPayType("手机支付"); // 专车 waterVO.setCode(tOrderPrivateCar.getOrderNum()); String string = orderCancel.getMoney().toString(); - waterVO.setMoney(new BigDecimal(string)); + waterVO.setMoney(new BigDecimal(string)+""); TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId()); if (user1!=null){ waterVO.setName(user1.getNickName()); @@ -766,7 +767,7 @@ // 小件物流 waterVO1.setCode(tOrderLogistics1.getOrderNum()); String string1 = orderCancel.getMoney().toString(); - waterVO1.setMoney(new BigDecimal(string1)); + waterVO1.setMoney(new BigDecimal(string1)+""); TUser user2 = appUserService.selectById(tOrderLogistics1.getUserId()); if (user2!=null){ waterVO1.setName(user2.getNickName()); @@ -790,7 +791,7 @@ } // 司机提现 for (TPubWithdrawal tPubWithdrawal : driver) { - if(payType!=null && payType == 1){ + if(payType!=null && payType == 2){ break; } WaterVO waterVO = new WaterVO(); @@ -802,8 +803,8 @@ waterVO.setPhone(tDriver.getPhone()); } - waterVO.setMoney(tPubWithdrawal.getMoney()); - waterVO.setPayType("银行卡支付"); + waterVO.setMoney("-"+tPubWithdrawal.getMoney()); + waterVO.setPayType("手机支付"); waterVO.setType("司机提现"); waterVO.setRemark(tPubWithdrawal.getRemark()); res.add(waterVO); @@ -811,7 +812,7 @@ } // 用户提现 for (TPubWithdrawal tPubWithdrawal : user) { - if(payType!=null && payType == 1){ + if(payType!=null && payType == 2){ break; } WaterVO waterVO = new WaterVO(); @@ -824,8 +825,8 @@ waterVO.setName(user2.getNickName()); waterVO.setPhone(user2.getPhone()); } - waterVO.setMoney(tPubWithdrawal.getMoney()); - waterVO.setPayType("银行卡支付"); + waterVO.setMoney("-"+tPubWithdrawal.getMoney()); + waterVO.setPayType("手机支付"); waterVO.setType("用户提现"); waterVO.setRemark(tPubWithdrawal.getRemark()); res.add(waterVO); @@ -864,7 +865,7 @@ } } - waterVO.setMoney(new BigDecimal(paymentRecord.getAmount().toString())); + waterVO.setMoney(new BigDecimal(paymentRecord.getAmount().toString())+""); }else{ continue; } @@ -937,7 +938,7 @@ if (income.getOrderMoney() != null){ String string = income.getPrice().toString(); BigDecimal bigDecimal1 = new BigDecimal(string); - platformVO.setMoney(bigDecimal1); + platformVO.setMoney(bigDecimal1+""); }else{ continue; } @@ -995,7 +996,7 @@ platformVO.setPhone(tDriver1.getPhone()); } platformVO.setRemark(tOrderLogistics1.getRemark()); - platformVO.setMoney(new BigDecimal(income.getPrice())); + platformVO.setMoney(new BigDecimal(income.getPrice())+""); if (income.getCreateTime()!=null){ platformVO.setInsertTime(format.format(income.getCreateTime())); } @@ -1136,6 +1137,9 @@ Wrapper<OrderCancel> orderCancelEntityWrapper = new EntityWrapper<>(); // 司机手动结算金额 Wrapper<SettlementDetail> orderType1 = new EntityWrapper<SettlementDetail>(); + List<Integer> integers = new ArrayList<>(); + integers.add(1); + integers.add(2); if (time == 5 && !StringUtils.hasLength(insertTime)){ // 余额充值wrapper orderType = new EntityWrapper<TPubTransactionDetails>() @@ -1165,6 +1169,7 @@ .in("orderType", Arrays.asList(1, 4)); // 用户取消订单费用 orderCancelEntityWrapper.eq("state", 2) + .in("payType",integers) .eq("userType", 1); }else{ orderType = new EntityWrapper<TPubTransactionDetails>() @@ -1199,6 +1204,7 @@ // 用户取消订单费用 orderCancelEntityWrapper.eq("state", 2) .eq("userType", 1) + .in("payType",integers) .between("insertTime", start, end); } @@ -1273,7 +1279,7 @@ // 专车 waterVO.setCode(tOrderPrivateCar.getOrderNum()); String string = tOrderPrivateCar.getPayMoney().toString(); - waterVO.setMoney(new BigDecimal(string)); + waterVO.setMoney(new BigDecimal(string)+""); TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId()); if (user1!=null){ waterVO.setName(user1.getNickName()); @@ -1298,8 +1304,8 @@ // 小件物流 waterVO.setCode(tOrderLogistic.getOrderNum()); String string = tOrderLogistic.getPayMoney().toString(); - waterVO.setMoney(new BigDecimal(string)); - waterVO.setMoney(new BigDecimal("0")); + waterVO.setMoney(new BigDecimal(string)+""); + waterVO.setMoney(new BigDecimal("0")+""); TUser user2 = appUserService.selectById(tOrderLogistic.getUserId()); if (user2!=null){ waterVO.setName(user2.getNickName()); @@ -1325,7 +1331,7 @@ WaterVO waterVO = new WaterVO(); switch (orderCancel.getOrderType()){ case 1: - TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(orderCancel); + TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(orderCancel.getOrderId()); if (tOrderPrivateCar == null){ continue; } @@ -1336,18 +1342,11 @@ continue; } } - switch (tOrderPrivateCar.getPayType()){ - case 1: - waterVO.setPayType("手机支付"); - break; - case 2: - waterVO.setPayType("银行卡支付"); - break; - } + waterVO.setPayType("手机支付"); // 专车 waterVO.setCode(tOrderPrivateCar.getOrderNum()); String string = orderCancel.getMoney().toString(); - waterVO.setMoney(new BigDecimal(string)); + waterVO.setMoney(new BigDecimal(string)+""); TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId()); if (user1!=null){ waterVO.setName(user1.getNickName()); @@ -1357,7 +1356,7 @@ res.add(waterVO); userConsume = userConsume.add(new BigDecimal(orderCancel.getMoney().toString())); break; - case 2: + case 4: TOrderLogistics tOrderLogistics1 = orderLogisticsService.selectById(orderCancel.getOrderId()); if (payType!=null){ if (!Objects.equals(tOrderLogistics1.getPayType(), payType)){ @@ -1370,7 +1369,7 @@ // 小件物流 waterVO1.setCode(tOrderLogistics1.getOrderNum()); String string1 = orderCancel.getMoney().toString(); - waterVO1.setMoney(new BigDecimal(string1)); + waterVO1.setMoney(new BigDecimal(string1)+""); TUser user2 = appUserService.selectById(tOrderLogistics1.getUserId()); if (user2!=null){ waterVO1.setName(user2.getNickName()); @@ -1394,7 +1393,7 @@ } // 司机提现 for (TPubWithdrawal tPubWithdrawal : driver) { - if(payType!=null && payType == 1){ + if(payType!=null && payType == 2){ break; } WaterVO waterVO = new WaterVO(); @@ -1406,8 +1405,8 @@ waterVO.setPhone(tDriver.getPhone()); } - waterVO.setMoney(tPubWithdrawal.getMoney()); - waterVO.setPayType("银行卡支付"); + waterVO.setMoney("-"+tPubWithdrawal.getMoney()); + waterVO.setPayType("手机支付"); waterVO.setType("司机提现"); waterVO.setRemark(tPubWithdrawal.getRemark()); res.add(waterVO); @@ -1415,7 +1414,7 @@ } // 用户提现 for (TPubWithdrawal tPubWithdrawal : user) { - if(payType!=null && payType == 1){ + if(payType!=null && payType == 2){ break; } WaterVO waterVO = new WaterVO(); @@ -1426,8 +1425,8 @@ waterVO.setName(user2.getNickName()); waterVO.setPhone(user2.getPhone()); } - waterVO.setMoney(tPubWithdrawal.getMoney()); - waterVO.setPayType("银行卡支付"); + waterVO.setMoney("-"+tPubWithdrawal.getMoney()); + waterVO.setPayType("手机支付"); waterVO.setType("用户提现"); waterVO.setRemark(tPubWithdrawal.getRemark()); res.add(waterVO); @@ -1470,7 +1469,7 @@ } } - waterVO.setMoney(new BigDecimal(paymentRecord.getAmount().toString())); + waterVO.setMoney(new BigDecimal(paymentRecord.getAmount().toString())+""); }else{ continue; } @@ -1541,7 +1540,7 @@ if (income.getPrice() != null){ String string = income.getPrice().toString(); BigDecimal bigDecimal1 = new BigDecimal(string); - platformVO.setMoney(bigDecimal1); + platformVO.setMoney(bigDecimal1+""); }else{ continue; } @@ -1623,7 +1622,7 @@ } platformVO.setRemark(tOrderLogistics1.getRemark()); - platformVO.setMoney(BigDecimal.valueOf(income.getPrice())); + platformVO.setMoney(BigDecimal.valueOf(income.getPrice())+""); if (income.getCreateTime()!=null){ platformVO.setInsertTime(format.format(income.getCreateTime())); } -- Gitblit v1.7.1