From aba1baff88d0a04a39523177d20a91ba88aeb7eb Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 23 八月 2024 09:12:23 +0800
Subject: [PATCH] 2.0bug修改
---
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/platform/watter.html | 35 ++++----
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java | 4 +
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/grant.html | 19 ++--
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java | 5 +
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java | 5
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java | 25 ++++-
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/vo/WaterVO.java | 2
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java | 16 +++
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/use.html | 28 +++---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml | 7 +
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/tUser.js | 3
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 54 ++++++------
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/grant.js | 2
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java | 6 +
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/water.js | 6
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityMapper.xml | 3
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserCouponRecordService.java | 4 +
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserCouponRecordMapper.java | 4 +
18 files changed, 136 insertions(+), 92 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 084c83d..255fcd7 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
@@ -603,7 +603,7 @@
switch (type){
case 1:
// 只查询用户订单
- tOrderPrivateCars = orderPrivateCarService.selectList(tOrderPrivateCarEntityWrapper);
+ tOrderPrivateCars = orderPrivateCarService.selectList(tOrderPrivateCarEntityWrapper);
tOrderLogistics = orderLogisticsService.selectList(tOrderLogisticsEntityWrapper);
// 用户取消订单费用
orderCancelEntityWrapper.eq("state", 2)
@@ -674,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){
@@ -702,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());
@@ -751,7 +751,7 @@
// 专车
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());
@@ -774,7 +774,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());
@@ -810,8 +810,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);
@@ -832,8 +832,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);
@@ -872,7 +872,7 @@
}
}
- waterVO.setMoney(new BigDecimal(paymentRecord.getAmount().toString()));
+ waterVO.setMoney(new BigDecimal(paymentRecord.getAmount().toString())+"");
}else{
continue;
}
@@ -945,7 +945,7 @@
if (income.getOrderMoney() != null){
String string = income.getPrice().toString();
BigDecimal bigDecimal1 = new BigDecimal(string);
- platformVO.setMoney(bigDecimal1);
+ platformVO.setMoney(bigDecimal1+"");
}else{
continue;
}
@@ -1003,7 +1003,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()));
}
@@ -1286,7 +1286,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());
@@ -1311,8 +1311,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());
@@ -1338,7 +1338,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;
}
@@ -1360,7 +1360,7 @@
// 专车
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());
@@ -1383,7 +1383,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());
@@ -1419,8 +1419,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);
@@ -1439,8 +1439,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);
@@ -1483,7 +1483,7 @@
}
}
- waterVO.setMoney(new BigDecimal(paymentRecord.getAmount().toString()));
+ waterVO.setMoney(new BigDecimal(paymentRecord.getAmount().toString())+"");
}else{
continue;
}
@@ -1554,7 +1554,7 @@
if (income.getPrice() != null){
String string = income.getPrice().toString();
BigDecimal bigDecimal1 = new BigDecimal(string);
- platformVO.setMoney(bigDecimal1);
+ platformVO.setMoney(bigDecimal1+"");
}else{
continue;
}
@@ -1636,7 +1636,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()));
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
index 2680120..2a82173 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java
@@ -1147,6 +1147,10 @@
if (tUser!=null){
grantVO.setName(tUser.getNickName());
}
+ if (userRedPacketRecord.getRedPacketActivityId() == null){
+ // 后台发放的红包
+ grantVO.setRemark("后台指定派发");
+ }
UserActivityRedenvelope userActivityRedenvelope =
userActivityRedenvelopeService.selectById(userRedPacketRecord.getRedPacketActivityId());
if (userActivityRedenvelope!=null){
@@ -1320,6 +1324,7 @@
;
// 红包领取记录wrapper
between3 = new EntityWrapper<UserRedPacketRecord>()
+ .ne("state",0)
;
// 司机奖励
between4 = new EntityWrapper<DriverActivityHistory>()
@@ -1343,6 +1348,7 @@
.between("insertTime", start, end);
// 红包领取记录wrapper
between3 = new EntityWrapper<UserRedPacketRecord>()
+ .ne("state",0)
.between("insertTime", start, end);
// 司机奖励
between4 = new EntityWrapper<DriverActivityHistory>()
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java
index 1de9759..eeec482 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java
@@ -167,6 +167,8 @@
userRedPacketRecord.setCompanyId(1);
userRedPacketRecord.setState(1);
userRedPacketRecord.setOrderId(null);
+ // 标记为后台发放的红包
+ userRedPacketRecord.setIsGrant(1);
userRedPacketRecord.setRedPacketActivityId(redId);
// userRedPacketRecord.setOrderType(3);
userRedPacketRecord.setUserId(Integer.valueOf(s));
@@ -179,9 +181,6 @@
}catch (Exception e){
e.printStackTrace();
}
-
-
-
}
}
return ResultUtil.success("指派成功",null,"当前红包为随机红包，可能有部分用户无法领取");
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java
index adab99c..a2599a2 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java
@@ -21,6 +21,7 @@
import com.stylefeng.guns.core.log.LogObjectHolder;
import org.springframework.web.bind.annotation.RequestParam;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
@@ -151,9 +152,20 @@
map.put("userActivityInviteUseMoney",0);
}
if(SinataUtil.isNotEmpty(userActivityDiscount1)){
+ // 专车
Map<String,Object> resultMap = userCouponRecordService.getDiscountStatic(startTimes,endTimes,userActivityDiscount1.getId());
- map.put("userActivityDiscount1Money",resultMap.get("money"));
- map.put("userActivityDiscount1Number",resultMap.get("number"));
+ BigDecimal bigDecimal = new BigDecimal(resultMap.get("money").toString());
+ String string = resultMap.get("number").toString();
+ Integer i = Integer.valueOf(string);
+ // 小件物流
+ Map<String,Object> resultMap1 = userCouponRecordService.getDiscountStatic1(startTimes,endTimes,userActivityDiscount1.getId());
+ BigDecimal bigDecimal1 = new BigDecimal(resultMap1.get("money").toString());
+ String string1 = resultMap1.get("number").toString();
+ Integer i1 = Integer.valueOf(string1);
+ BigDecimal add = bigDecimal.add(bigDecimal1);
+ i +=i1;
+ map.put("userActivityDiscount1Money",add);
+ map.put("userActivityDiscount1Number",i);
}else{
map.put("userActivityDiscount1Money",0);
map.put("userActivityDiscount1Number",0);
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
index b7741c2..abeb22e 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
@@ -210,8 +210,7 @@
return SUCCESS_TIP;
}
- @Resource
- private ITUserService userService;
+
@RequestMapping(value = "/frozenOrder")
@ResponseBody
public Object frozenOrder(@RequestParam Integer tOrderPrivateCarId) throws Exception {
@@ -219,9 +218,23 @@
//添加已收入明细
TDriver tDriver = driverService.selectById(orderPrivateCar.getDriverId());
+ orderPrivateCar = this.setMoney(orderPrivateCar, 0D, 0D);//计算费用
+
+ //添加已收入明细
+ TCompany company = companyService.selectById(orderPrivateCar.getCompanyId());
+ Double taxi = company.getSpeMoney().doubleValue();
Integer language =tDriver.getLanguage();
BigDecimal d = null;//企业收入
BigDecimal c = null;//司机收入
+ if(company.getIsSpeFixedOrProportional() == 2){//固定
+ d = new BigDecimal(taxi);
+ c = orderPrivateCar.getOrderMoney().subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ }
+ if(company.getIsSpeFixedOrProportional() == 1){//比例
+ Double price = orderPrivateCar.getStartMoney().doubleValue() + orderPrivateCar.getMileageMoney().doubleValue() + orderPrivateCar.getWaitMoney().doubleValue()+ orderPrivateCar.getDurationMoney().doubleValue() + orderPrivateCar.getLongDistanceMoney().doubleValue();
+ d = new BigDecimal(price).multiply(new BigDecimal(taxi).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ c = orderPrivateCar.getOrderMoney().subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ }
if(orderPrivateCar.getIsFrozen()==1){
TDriver driver = driverService.selectById(orderPrivateCar.getDriverId());
driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).subtract(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -256,14 +269,14 @@
orderPrivateCar1.setState(8);
orderPrivateCar1.setIsFree(2);
//添加已收入明细
- TCompany company = companyService.selectById(orderPrivateCar1.getCompanyId());
- BigDecimal speMoney = company.getSpeMoney();
+ TCompany tCompany = companyService.selectById(orderPrivateCar1.getCompanyId());
+ BigDecimal speMoney = tCompany.getSpeMoney();
- if(company.getIsSpeFixedOrProportional() == 2){//固定
+ if(tCompany.getIsSpeFixedOrProportional() == 2){//固定
d = speMoney;
c = orderPrivateCar1.getOrderMoney().subtract(d);//只有出行金额参与抽成，其余归属司机
}
- if(company.getIsSpeFixedOrProportional() == 1){//比例
+ if(tCompany.getIsSpeFixedOrProportional() == 1){//比例
BigDecimal price = orderPrivateCar1.getStartMoney().add(orderPrivateCar1.getMileageMoney()).add(new BigDecimal(orderPrivateCar1.getWaitMoney())).add(orderPrivateCar1.getDurationMoney()).add(orderPrivateCar1.getLongDistanceMoney());
d = price.multiply(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN));
c = orderPrivateCar1.getOrderMoney().subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserCouponRecordMapper.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserCouponRecordMapper.java
index 80b3ba2..2b88d46 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserCouponRecordMapper.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserCouponRecordMapper.java
@@ -54,6 +54,10 @@
@Param("beginTime") String beginTime,
@Param("endTime") String endTime,
@Param("activityId") Integer activityId);
+ Map<String,Object> getDiscountStatic1(
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("activityId") Integer activityId);
List<Map<String,Object>> getBlanceList(@Param("page") Page<Map<String, Object>> page,
@Param("beginTime") String beginTime,
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityMapper.xml
index aed94e3..afbd627 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityMapper.xml
@@ -41,7 +41,8 @@
bb.id and aa.activityType = 3) where aa.state = 2 and bb.userActivityId = a.id) +
(select count(aa.id) from t_user_coupon_record aa left join t_user_activity_balance bb on (aa.couponActivityId =
bb.id and aa.activityType = 4) where aa.state = 2 and bb.userActivityId = a.id) +
- (select count(id) from t_order_private_car where state in (7,8,9) and activityId = a.id) +
+ (select count(aa.id) from t_order_private_car aa left join t_user_activity_discount1 bb on(aa.activityId = bb.id) where aa.state in (7,8,9) and bb.userActivityId = a.id ) +
+ (select count(aa.id) from t_order_logistics aa left join t_user_activity_discount1 bb on(aa.activityId = bb.id) where aa.state in (7,8,9)and bb.userActivityId = a.id ) +
(select count(id) from t_order_taxi where state in (7,8,9) and activityId = a.id) +
(select count(id) from t_order_cross_city where state in (6,8,9) and activityId = a.id)
) as number
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml
index be2da9b..6c77f9b 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml
@@ -74,7 +74,7 @@
SELECT
c.id,
c.money,
- c.expirationTime,
+ c.endTime as expirationTime,
c.insertTime,
c.companyId,
c.state,
@@ -161,7 +161,10 @@
</if>
</select>
<select id="getDiscountStatic" resultType="map">
- SELECT IFNULL(SUM(discountMoney),0) money,COUNT(id) number FROM t_order_taxi WHERE activityId=#{activityId}
+ SELECT IFNULL(SUM(discountMoney),0) money,COUNT(id) number FROM t_order_private_car WHERE activityId=#{activityId}
+ </select>
+ <select id="getDiscountStatic1" resultType="map">
+ SELECT IFNULL(SUM(discountMoney),0) money,COUNT(id) number FROM t_order_logistics WHERE activityId=#{activityId}
</select>
<select id="getRegStatic" resultType="map">
SELECT
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java
index 865773d..1403d69 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java
@@ -44,6 +44,11 @@
@TableField("companyId")
private Integer companyId;
/**
+ * 是否为后台发放的红包 0否1是
+ */
+ @TableField("isGrant")
+ private Integer isGrant;
+ /**
* 状态（0=临时，1=未使用，2=已使用，3=已过期）
*/
@TableField("state")
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserCouponRecordService.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserCouponRecordService.java
index d739e27..bc3172f 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserCouponRecordService.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserCouponRecordService.java
@@ -83,6 +83,10 @@
String beginTime,
String endTime,
Integer activityId);
+ Map<String,Object> getDiscountStatic1(
+ String beginTime,
+ String endTime,
+ Integer activityId);
/**
* 获取充值记录
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java
index 8dd09b3..00efcc8 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java
@@ -64,6 +64,10 @@
public Map<String, Object> getDiscountStatic(String beginTime, String endTime, Integer activityId) {
return this.baseMapper.getDiscountStatic(beginTime,endTime,activityId);
}
+ @Override
+ public Map<String, Object> getDiscountStatic1(String beginTime, String endTime, Integer activityId) {
+ return this.baseMapper.getDiscountStatic1(beginTime,endTime,activityId);
+ }
@Override
public List<Map<String, Object>> getBlanceList(Page<Map<String, Object>> page, String beginTime, String endTime, Integer activityId) {
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/vo/WaterVO.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/vo/WaterVO.java
index db7af90..4adcfb7 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/vo/WaterVO.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/vo/WaterVO.java
@@ -18,7 +18,7 @@
@ApiModelProperty(value = "支付方手机号")
private String phone;
@ApiModelProperty(value = "支付金额")
- private BigDecimal money;
+ private String money;
@ApiModelProperty(value = "支付方式")
private String payType;
@ApiModelProperty(value = "流水项目")
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/platform/watter.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/platform/watter.html
index 9b9b9e8..b16fbcf 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/platform/watter.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/platform/watter.html
@@ -4,11 +4,10 @@
display: flex; /* 使用 Flex 布局 */
margin-left: 50px;
margin-top: 30px;
- width: 2200px;
}
.rectangle1 {
width: 250px; /* 设置框的宽度 */
- height: 160px; /* 自适应高度 */
+ height: 150px; /* 自适应高度 */
background-color: #cecece; /* 设置底色为灰色 */
border-radius: 30px; /* 设置圆角半径为10px */
display: flex; /* 使用 Flex 布局 */
@@ -18,8 +17,8 @@
margin-right: 40px; /* 设置矩形框之间的间距 */
}
.rectangle2 {
- width: 150px; /* 设置框的宽度 */
- height: 130px; /* 自适应高度 */
+ width: 190px; /* 设置框的宽度 */
+ height: 110px; /* 自适应高度 */
background-color: #cecece; /* 设置底色为灰色 */
border-radius: 30px; /* 设置圆角半径为10px */
display: flex; /* 使用 Flex 布局 */
@@ -31,8 +30,8 @@
margin-top: 15px;
}
.rectangle3 {
- width: 150px; /* 设置框的宽度 */
- height: 130px; /* 自适应高度 */
+ width: 190px; /* 设置框的宽度 */
+ height: 110px; /* 自适应高度 */
background-color: #cecece; /* 设置底色为灰色 */
border-radius: 30px; /* 设置圆角半径为10px */
display: flex; /* 使用 Flex 布局 */
@@ -99,42 +98,42 @@
<#button name="重置" icon="fa-trash" clickFun="TUser.resetSearch()" space="true"/>
</div>
</div>
+
<div class="container">
<div class="rectangle1">
<h1 id="num1">0</h1>
<br>
- <h2 id="text1">第三方流水余额合计</h2>
-
+ <h2 style="text-align: center" id="text1">第三方流水余额合计</h2>
</div>
<img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/dengyu.png">
<div class="rectangle2">
- <h1 id="num2">0</h1>
+ <h2 id="num2">0</h2>
<br>
- <h2 id="text2">用户订单消费</h2>
+ <h3 style="text-align: center" id="text2">用户订单消费</h3>
</div>
<img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jiahao.png">
<div class="rectangle3">
- <h1 id="num3">0</h1>
+ <h2 id="num3">0</h2>
<br>
- <h2 id="text3">用户充值总额</h2>
+ <h3 style="text-align: center" id="text3">用户充值总额</h3>
</div>
<img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jiahao.png">
<div class="rectangle3">
- <h1 id="num4">0</h1>
+ <h2 id="num4">0</h2>
<br>
- <h2 id="text4">司机结算总额</h2>
+ <h3 style="text-align: center" id="text4">司机结算总额</h3>
</div>
<img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jianhao.png">
<div class="rectangle3">
- <h1 id="num5">0</h1>
+ <h2 id="num5">0</h2>
<br>
- <h2 id="text5">司机提现总额</h2>
+ <h3 style="text-align: center" id="text5">司机提现总额</h3>
</div>
<img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jianhao.png">
<div class="rectangle3">
- <h1 id="num6">0</h1>
+ <h2 id="num6">0</h2>
<br>
- <h2 id="text6">用户提现总额</h2>
+ <h3 style="text-align: center" id="text6">用户提现总额</h3>
</div>
</div>
<#table id="TUserTable"/>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/grant.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/grant.html
index dff9e66..3dbeb8f 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/grant.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/grant.html
@@ -4,7 +4,6 @@
display: flex; /* 使用 Flex 布局 */
margin-left: 50px;
margin-top: 30px;
- width: 2200px;
}
.rectangle1 {
width: 250px; /* 设置框的宽度 */
@@ -95,32 +94,32 @@
<div class="rectangle1">
<h1 id="num1">0</h1>
<br>
- <h2 id="text1">已发放补贴总额</h2>
+ <h2 style="text-align: center" id="text1">已发放补贴总额</h2>
</div>
<img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/dengyu.png">
<div class="rectangle2">
- <h1 id="num2">0</h1>
+ <h2 id="num2">0</h2>
<br>
- <h2 id="text2">已使用折扣总额(用户端)</h2>
+ <h3 style="text-align: center" id="text2">已使用折扣总额(用户端)</h3>
</div>
<img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jiahao.png">
<div class="rectangle3">
- <h1 id="num3">0</h1>
+ <h2 id="num3">0</h2>
<br>
- <h2 id="text3">已领取红包总额(用户端)</h2>
+ <h3 style="text-align: center" id="text3">已领取红包总额(用户端)</h3>
</div>
<img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jiahao.png">
<div class="rectangle3">
- <h1 id="num4">0</h1>
+ <h2 id="num4">0</h2>
<br>
- <h2 id="text4">已领取优惠券总额(用户端)</h2>
+ <h3 style="text-align: center" id="text4">已领取优惠券总额(用户端)</h3>
</div>
<img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jiahao.png">
<div class="rectangle3">
- <h1 id="num5">0</h1>
+ <h2 id="num5">0</h2>
<br>
- <h2 id="text5">已领取司机奖励(司机端)</h2>
+ <h3 style="text-align: center" id="text5">已领取司机奖励(司机端)</h3>
</div>
</div>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/use.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/use.html
index dab690b..5e5e6c2 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/use.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/subsidy/use.html
@@ -4,10 +4,9 @@
display: flex; /* 使用 Flex 布局 */
margin-left: 50px;
margin-top: 30px;
- width: 2200px;
}
.rectangle1 {
- width: 250px; /* 设置框的宽度 */
+ width: 200px; /* 设置框的宽度 */
height: 160px; /* 自适应高度 */
background-color: #cecece; /* 设置底色为灰色 */
border-radius: 30px; /* 设置圆角半径为10px */
@@ -18,7 +17,7 @@
margin-right: 40px; /* 设置矩形框之间的间距 */
}
.rectangle2 {
- width: 200px; /* 设置框的宽度 */
+ width: 170px; /* 设置框的宽度 */
height: 130px; /* 自适应高度 */
background-color: #cecece; /* 设置底色为灰色 */
border-radius: 30px; /* 设置圆角半径为10px */
@@ -31,7 +30,7 @@
margin-top: 15px;
}
.rectangle3 {
- width: 200px; /* 设置框的宽度 */
+ width: 170px; /* 设置框的宽度 */
height: 130px; /* 自适应高度 */
background-color: #cecece; /* 设置底色为灰色 */
border-radius: 30px; /* 设置圆角半径为10px */
@@ -44,7 +43,7 @@
margin-top: 15px;
}
.rectangle4 {
- width: 250px; /* 设置框的宽度 */
+ width: 170px; /* 设置框的宽度 */
height: 170px; /* 自适应高度 */
background-color: #cecece; /* 设置底色为灰色 */
border-radius: 30px; /* 设置圆角半径为10px */
@@ -108,32 +107,31 @@
<div class="rectangle1">
<h1 id="num1">0</h1>
<br>
- <h2 id="text1">已使用补贴总额</h2>
-
+ <h2 style="text-align: center" id="text1">已使用补贴总额</h2>
</div>
<img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/dengyu.png">
<div class="rectangle2">
- <h1 id="num2">0</h1>
+ <h3 id="num2">0</h3>
<br>
- <h2 id="text2">已使用折扣总额(用户端)</h2>
+ <h4 style="text-align: center" id="text2">已使用折扣总额(用户端)</h4>
</div>
<img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jiahao.png">
<div class="rectangle3">
- <h1 id="num3">0</h1>
+ <h3 id="num3">0</h3>
<br>
- <h2 id="text3">已使用红包总额(用户端)</h2>
+ <h4 style="text-align: center" id="text3">已使用红包总额(用户端)</h4>
</div>
<img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jiahao.png">
<div class="rectangle3">
- <h1 id="num4">0</h1>
+ <h3 id="num4">0</h3>
<br>
- <h2 id="text4">已使用优惠券总额(用户端)</h2>
+ <h4 style="text-align: center" id="text4">已使用优惠券总额(用户端)</h4>
</div>
<img style="margin-top: 70px" width="25px" height="25px" src="${ctxPath}/static/img/jiahao.png">
<div class="rectangle4">
- <h1 id="num5">0</h1>
+ <h3 id="num5">0</h3>
<br>
- <h2 id="text5">已使用司机奖励合计</h2>
+ <h4 style="text-align: center" id="text5">已使用司机奖励合计</h4>
<br>
<div style="display: flex">
<span>已提现</span> <span id="num6">0</span>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/water.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/water.js
index 622b38f..45623f6 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/water.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/water.js
@@ -21,10 +21,10 @@
TUser.initColumn = function () {
return [
{field: 'selectItem', radio: true},
- {title: '付款时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle'},
+ {title: '交易时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle'},
{title: '订单号', field: 'code', visible: true, align: 'center', valign: 'middle'},
- {title: '支付方', field: 'name', visible: true, align: 'center', valign: 'middle'},
- {title: '支付方手机号', field: 'phone', visible: true, align: 'center', valign: 'middle',
+ {title: '交易方', field: 'name', visible: true, align: 'center', valign: 'middle'},
+ {title: '交易手机号', field: 'phone', visible: true, align: 'center', valign: 'middle',
},
{title: '支付金额', field: 'money', visible: true, align: 'center', valign: 'middle',
formatter: function (value, row) {
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/grant.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/grant.js
index 96c0a91..372ecf8 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/grant.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/grant.js
@@ -21,7 +21,7 @@
TUser.initColumn = function () {
return [
{field: 'selectItem', radio: true},
- {title: '使用时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle'},
+ {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',},
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/tUser.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/tUser.js
index bafd08f..f065724 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/tUser.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/tUser.js
@@ -261,11 +261,8 @@
console.log(ids)
console.log(window.parent.SysRedPacketRecord.seItem.id)
// TUser.close();
-
var ajax = new $ax(Feng.ctxPath + "/sysRedPacketRecord/direct", function(data){
-
if (data.code!=500){
-
Feng.success(data.msg);
TUser.close();
}else {
--
Gitblit v1.7.1