From 67ac6f18da66cc5b703e1ec849e96bdac586d6d1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 10 五月 2023 18:16:26 +0800
Subject: [PATCH] BUG修改
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java
index 4cd62ee..25e4ecc 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java
@@ -56,6 +56,9 @@
@Autowired
private ITRegionService tRegionService;
+ @Autowired
+ private ITDriverService tDriverService;
+
/**
* 跳转到首页
@@ -155,7 +158,11 @@
int count = tAgentService.selectCount(new EntityWrapper<TAgent>().eq("provinceName", split1[0]).eq("cityName",split1[1]));
if(count>0){
return new SuccessTip(500,"该代理商已存在!");
+
}
+
+ tAgent.setPrincipal(tAgent.getPrincipal().replace(" ",""));
+
String[] split = tAgent.getAreaId().split("/");
// 查询省市
@@ -195,6 +202,18 @@
tAgent.setStatus(1);
}
tAgentService.updateById(tAgent);
+ // 冻结下面所有的司机
+ List<TDriver> list = tDriverService.selectList(new EntityWrapper<TDriver>()
+ .eq("agentId", id));
+ for (TDriver tDriver : list) {
+ if(1 == status){
+ tDriver.setStatus(2);
+ }
+ if(2 == status){
+ tDriver.setStatus(1);
+ }
+ }
+ tDriverService.updateBatchById(list);
return SUCCESS_TIP;
}
@@ -204,6 +223,7 @@
@RequestMapping(value = "/update")
@ResponseBody
public Object update(TAgent tAgent) {
+ tAgent.setPrincipal(tAgent.getPrincipal().replace(" ",""));
tAgentService.updateById(tAgent);
return SUCCESS_TIP;
}
@@ -249,7 +269,7 @@
DateFormat format = new SimpleDateFormat("yyyyMMdd");
String time1 = format.format(date);
String fileName = "Agent"+time1+".xls";
- String[] title = new String[] {"时间","姓名","联系电话","代理区域","订单数量",
+ String[] title = new String[] {"时间","姓名","联系电话","代理区域","客服电话","订单数量",
"有效订单","已发放优惠券","已使用优惠券","累计优惠券金额","司机充值","司机数","状态"};
EntityWrapper<TAgent> wrapper = tAgentService.getAgentWrapper(principal,principalPhone,createTime);
// 是否异常
@@ -265,20 +285,21 @@
values[i][1] = d.getPrincipal();
values[i][2] = d.getPrincipalPhone();
values[i][3] = d.getProvinceName()+d.getCityName();
- values[i][4] = String.valueOf(d.getOrderSum());
- values[i][5] = String.valueOf(d.getValidOrder());
- values[i][6] = String.valueOf(d.getIssuedCoupon());
- values[i][7] = String.valueOf(d.getUsedCoupon());
- values[i][8] = String.valueOf(d.getCouponPriceSum());
- values[i][9] = String.valueOf(d.getDriverRecharge() == null ? "0":d.getDriverRecharge());
- values[i][10] = String.valueOf(d.getDriverCount());
+ values[i][4] = StringUtils.hasLength(d.getServiceCalls())?d.getServiceCalls():"";
+ values[i][5] = String.valueOf(d.getOrderSum());
+ values[i][6] = String.valueOf(d.getValidOrder());
+ values[i][7] = String.valueOf(d.getIssuedCoupon());
+ values[i][8] = String.valueOf(d.getUsedCoupon());
+ values[i][9] = String.valueOf(d.getCouponPriceSum());
+ values[i][10] = String.valueOf(d.getDriverRecharge() == null ? "0":d.getDriverRecharge());
+ values[i][11] = String.valueOf(d.getDriverCount());
Integer status1 = d.getStatus();
if(1 == status1){
- values[i][11] = "正常";
+ values[i][12] = "正常";
}else if(2 == status1){
- values[i][11] = "冻结";
+ values[i][12] = "冻结";
}else {
- values[i][11] = "删除";
+ values[i][12] = "删除";
}
}
HSSFWorkbook wb = ExcelUtil.getHSSFWorkbook("Variance"+time1, title, values, null);
--
Gitblit v1.7.1