Skip to content

G
gdtel-gztel-school-center
Commit 8c508632 by 罗承锋
Options

修改流程扭转

parent 87fbcbd4
Showing with 68 additions and 4 deletions
service-manager/src/main/java/com/winsun/controller/OrderController.java
...@@ -15,6 +15,7 @@ import com.winsun.auth.core.common.model.ResponseData; ...@@ -15,6 +15,7 @@ import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.auth.core.shiro.ShiroUser; import com.winsun.auth.core.shiro.ShiroUser;
import com.winsun.auth.core.util.IOUtils; import com.winsun.auth.core.util.IOUtils;
import com.winsun.bean.*; import com.winsun.bean.*;
import com.winsun.bean.Package;
import com.winsun.constant.FilePath; import com.winsun.constant.FilePath;
import com.winsun.constant.OrderType; import com.winsun.constant.OrderType;
import com.winsun.mapper.*; import com.winsun.mapper.*;
...@@ -114,6 +115,9 @@ public class OrderController extends BaseController { ...@@ -114,6 +115,9 @@ public class OrderController extends BaseController {
private ExportExcelMapper exportExcelMapper; private ExportExcelMapper exportExcelMapper;
@Autowired @Autowired
private PackageMapper packageMapper;
@Autowired
private HhrUserMapper hhrUserMapper; private HhrUserMapper hhrUserMapper;
@Autowired @Autowired
...@@ -156,12 +160,42 @@ public class OrderController extends BaseController { ...@@ -156,12 +160,42 @@ public class OrderController extends BaseController {
@Permission(menuname = "更新配送方式", value = "updateSendType", method = RequestMethod.POST) @Permission(menuname = "更新配送方式", value = "updateSendType", method = RequestMethod.POST)
public ResponseData<String> updateSendType(@RequestParam("id") String id, @RequestParam("sendType") String sendType) { public ResponseData<String> updateSendType(@RequestParam("id") String id, @RequestParam("sendType") String sendType) {
ShiroUser user = getShiroUser(); ShiroUser user = getShiroUser();
Order order = new Order(); Order order = new Order();
order.setSendType(sendType); order.setSendType(sendType);
order.setId(id); order.setId(id);
Order databaseOrder = orderMapper.selectById(id);
if(databaseOrder == null) {
return ResponseData.error("更新配送方式失败，未找到当前订单！");
}
if (StringUtils.isBlank(databaseOrder.getPackageId())) {
return ResponseData.error("更新配送方式失败，当前订单不是移动卡订单！");
}
Package packageInfo = packageMapper.selectById(databaseOrder.getPackageId());
// 查询产品
if (packageInfo == null) {
return ResponseData.error("更新配送方式失败，未找到当前订单套餐！");
}
// 小白卡是0，预制卡是1
if (packageInfo.getIsXbCard() == 0) {
// 小白卡修改为待配送状态
// 上门则改为待活体
order.setOrderStatus("待配送");
if ("送货上门".equals(sendType)) {
order.setOrderStatus("待活体");
}
}else if(packageInfo.getIsXbCard() == 1){
//预制卡 改为待选号
order.setOrderStatus("待选号");
}else{
return ResponseData.error("更新配送方式失败，套餐信息有误！");
}
Integer integer = orderMapper.updateById(order); Integer integer = orderMapper.updateById(order);
if (integer == 1) { if (integer == 1) {
appMapper.inserOrderHis(id, "更新配送方式成功!", new Date(), user.getName()); appMapper.inserOrderHis(id, "销售员已接单!", new Date(), user.getName());
} else { } else {
return ResponseData.error("更新配送方式失败！"); return ResponseData.error("更新配送方式失败！");
} }
...@@ -356,7 +390,7 @@ public class OrderController extends BaseController { ...@@ -356,7 +390,7 @@ public class OrderController extends BaseController {
@Permission(menuname = "修改为异常单", value = "setAbnormal", method = RequestMethod.POST) @Permission(menuname = "修改为异常单", value = "setAbnormal", method = RequestMethod.POST)
public ResponseData<String> abnormal(@RequestParam("orderId") String orderId,@RequestParam("errorMsg") String errorMsg) { public ResponseData<String> abnormal(@RequestParam("orderId") String orderId,@RequestParam("errorMsg") String errorMsg) {
ShiroUser user = getShiroUser(); ShiroUser user = getShiroUser();
if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "受理人员","楼长"))) { if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员","系统管理员","受理人员","楼长"))) {
return ResponseData.error("无数据权限"); return ResponseData.error("无数据权限");
} }
Wrapper wrapper = new EntityWrapper<>(); Wrapper wrapper = new EntityWrapper<>();
...@@ -1776,7 +1810,9 @@ public class OrderController extends BaseController { ...@@ -1776,7 +1810,9 @@ public class OrderController extends BaseController {
@Permission(menuname = "更新存量升级订单状态", value = "setUpgradeStatus", method = RequestMethod.POST) @Permission(menuname = "更新存量升级订单状态", value = "setUpgradeStatus", method = RequestMethod.POST)
public ResponseData setUpgradeStatus(@RequestParam("orderId")String orderId,@RequestParam("auditType")String auditType,@RequestParam("contentMsg")String contentMsg){ public ResponseData setUpgradeStatus(@RequestParam("orderId")String orderId,@RequestParam("auditType")String auditType,@RequestParam("contentMsg")String contentMsg){
ShiroUser user = getShiroUser(); ShiroUser user = getShiroUser();
if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "受理人员","楼长"))) { if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员","系统管理员","受理人员","楼长"))) {
}else{
return ResponseData.error("无数据权限"); return ResponseData.error("无数据权限");
} }
Order order = new Order(); Order order = new Order();
...@@ -1804,15 +1840,43 @@ public class OrderController extends BaseController { ...@@ -1804,15 +1840,43 @@ public class OrderController extends BaseController {
@RequestParam("kuaidiOrder")String kuaidiOrder){ @RequestParam("kuaidiOrder")String kuaidiOrder){
ShiroUser user = getShiroUser(); ShiroUser user = getShiroUser();
if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员","系统管理员", "县分管理员（订单）","受理人员","楼长"))) { if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员","系统管理员", "县分管理员（订单）","受理人员","楼长"))) {
}else{
return ResponseData.error("无数据权限"); return ResponseData.error("无数据权限");
} }
Order databaseOrder = orderMapper.selectById(orderId);
Order order = new Order(); Order order = new Order();
if(databaseOrder == null) {
return ResponseData.error("更新配送方式失败，未找到当前订单！");
}
if (StringUtils.isBlank(databaseOrder.getPackageId())) {
return ResponseData.error("更新配送方式失败，当前订单不是移动卡订单！");
}
Package packageInfo = packageMapper.selectById(databaseOrder.getPackageId());
// 查询产品
if (packageInfo == null) {
return ResponseData.error("更新配送方式失败，未找到当前订单套餐！");
}
// 小白卡是0，预制卡是1
if (packageInfo.getIsXbCard() == 0) {
// 小白卡修改为待活体
order.setOrderStatus("待活体");
}else if(packageInfo.getIsXbCard() == 1){
order.setOrderStatus("已完成");
if ("1".equals(databaseOrder.getUserType())) {
order.setOrderStatus("待受理");
}
}else{
return ResponseData.error("更新配送方式失败，套餐信息有误！");
}
Wrapper<Order> wrapper = new EntityWrapper<>(); Wrapper<Order> wrapper = new EntityWrapper<>();
wrapper.eq("id", orderId); wrapper.eq("id", orderId);
order.setCompany(company); order.setCompany(company);
order.setKuaidiOrder(kuaidiOrder); order.setKuaidiOrder(kuaidiOrder);
order.setUpdateTime(new Date()); order.setUpdateTime(new Date());
order.setOrderStatus("已发货");
appMapper.inserOrderHis(orderId, "快递公司："+company+"快递单号："+kuaidiOrder, new Date(), user.getName()); appMapper.inserOrderHis(orderId, "快递公司："+company+"快递单号："+kuaidiOrder, new Date(), user.getName());
orderMapper.update(order, wrapper); orderMapper.update(order, wrapper);
return ResponseData.success(); return ResponseData.success();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment