ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
@@ -729,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; } @@ -740,14 +740,7 @@ 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(); @@ -798,7 +791,7 @@ } // 司机提现 for (TPubWithdrawal tPubWithdrawal : driver) { if(payType!=null && payType == 1){ if(payType!=null && payType == 2){ break; } WaterVO waterVO = new WaterVO(); @@ -819,7 +812,7 @@ } // 用户提现 for (TPubWithdrawal tPubWithdrawal : user) { if(payType!=null && payType == 1){ if(payType!=null && payType == 2){ break; } WaterVO waterVO = new WaterVO(); @@ -1349,14 +1342,7 @@ 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(); @@ -1407,7 +1393,7 @@ } // 司机提现 for (TPubWithdrawal tPubWithdrawal : driver) { if(payType!=null && payType == 1){ if(payType!=null && payType == 2){ break; } WaterVO waterVO = new WaterVO(); @@ -1428,7 +1414,7 @@ } // 用户提现 for (TPubWithdrawal tPubWithdrawal : user) { if(payType!=null && payType == 1){ if(payType!=null && payType == 2){ break; } WaterVO waterVO = new WaterVO(); ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
@@ -901,6 +901,8 @@ return useMoneyVO; } @Autowired private ISysRedPacketRecordService sysRedPacketRecordService; /** * 发放补贴统计 */ @@ -1147,10 +1149,11 @@ if (tUser!=null){ grantVO.setName(tUser.getNickName()); } if (userRedPacketRecord.getRedPacketActivityId() == null){ if (userRedPacketRecord.getIsGrant() == 1){ // 后台发放的红包 grantVO.setRemark("后台指定派发"); grantVO.setRemark("指定发放"); } UserActivityRedenvelope userActivityRedenvelope = userActivityRedenvelopeService.selectById(userRedPacketRecord.getRedPacketActivityId()); if (userActivityRedenvelope!=null){ ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
@@ -597,7 +597,7 @@ if(orderPrivateCar.getIsplatPay()==2){ return "error"; } //添加已收入明细 //添加已收入明细 TCompany company = companyService.selectById(orderPrivateCar.getCompanyId()); Double taxi = company.getSpeMoney().doubleValue(); BigDecimal d = null;//企业收入 @@ -619,6 +619,9 @@ driver.setBalance((null != driver.getBalance() ? driver.getBalance() : BigDecimal.ZERO).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN)); driverService.updateById(driver); orderPrivateCar.setIsplatPay(2); orderPrivateCar.setPayManner(1); orderPrivateCar.setState(8); orderPrivateCar.setPayMoney(orderPrivateCar.getOrderMoney()); tOrderPrivateCarService.updateAllColumnById(orderPrivateCar); return SUCCESS_TIP; } ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/grant.js
@@ -24,7 +24,7 @@ {title: '发放时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle'}, {title: '补贴类型', field: 'type', visible: true, align: 'center', valign: 'middle'}, {title: '金额', field: 'amount', visible: true, align: 'center', valign: 'middle'}, {title: '领取用户id', field: 'name', visible: true, align: 'center', valign: 'middle',}, {title: '领取用户昵称', field: 'name', visible: true, align: 'center', valign: 'middle',}, {title: '备注', field: 'remark', visible: true, align: 'center', valign: 'middle',}, ]; };
