Skip to content

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

优化预制卡后台下单

parent 60ea2405
Showing with 80 additions and 74 deletions
service-manager/src/main/java/com/winsun/controller/OrderController.java
......@@ -243,6 +243,9 @@ public class OrderController extends BaseController {
String hehuoren_id = order.getHehuorenId();
String business_number = order.getBusinessNumber();
String business_iccid = order.getBusinessIccid();
if (StringUtils.isBlank(business_iccid)) {
business_iccid = businessNumber;
}
HhrUser hhrUser = hhrUserMapper.selectById(hehuoren_id);
Map<String, Object> map1 = new HashMap<>();
......@@ -391,7 +394,7 @@ public class OrderController extends BaseController {
@Permission(menuname = "修改为异常单", value = "setAbnormal", method = RequestMethod.POST)
public ResponseData<String> abnormal(@RequestParam("orderId") String orderId,@RequestParam("errorMsg") String errorMsg) {
ShiroUser user = getShiroUser();
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员","系统管理员","受理人员","楼长"))) {
if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员","系统管理员","县分管理员（订单）","受理人员"))) {
return ResponseData.error("无数据权限");
}
Wrapper wrapper = new EntityWrapper<>();
......@@ -1226,83 +1229,86 @@ public class OrderController extends BaseController {
try {
// 更新订单
Integer num = orderMapper.updateById(dataOrder);
if (num > 0) {
executorService.execute(new Runnable() {
public void run() {
String id = dataOrder.getId();
Order orderData = orderMapper.selectById(dataOrder.getId());
String hehuoren_id = orderData.getHehuorenId();
String business_number = orderData.getBusinessNumber();
String business_iccid = orderData.getBusinessIccid();
Map<String, Object> partnerById = orderMapper.findPartnerById(hehuoren_id);
String name = orderData.getHehuorenName();
Map<String, Object> map1 = new HashMap<>();
int ysm = Integer.parseInt(partnerById.get("ysm").toString());
Map<String, Object> ysmById = orderMapper.findYsmById(ysm);
map1.put("ysmUser",ysmById.get("user_name"));
map1.put("sign",ysmById.get("sign"));
map1.put("idCardUrl1", orderData.getIdCardz());
map1.put("idCardUrl2", orderData.getIdCardf());
map1.put("idCardUrl3", orderData.getIdCardzs());
map1.put("idCardUrl4", orderData.getStudenCard());
map1.put("cardType", orderData.getKapin());
if(orderData.getPackageId().equals("49")){
map1.put("userName", orderData.getParentName());
}else{
map1.put("userName", orderData.getCustomerName());
}
map1.put("linkPhone", orderData.getContactNumber());
map1.put("idCard", orderData.getIdCard());
map1.put("orderPhone", business_number);
map1.put("iccId", business_iccid);
String site = orderData.getSite();
String[] split = site.split(" ");
map1.put("sheng",split[0]);
map1.put("shi",split[1]);
map1.put("xian",split[2]);
map1.put("address",orderData.getAddress());
String result="";
result = sendOrder(map1);
JSONObject resultDataJson = JSONObject.fromObject(result);
String orderNum = resultDataJson.getString("orderNumber");
Order order = new Order();
order.setId(id);
order.setUpdateTime(new Date());
if (Is.isNoEmpty(orderNum)) {
order.setSendType("快递");
order.setOrderStatus("审核中");
order.setOrderId(orderNum);
}else{
order.setOrderStatus("异常单");
String msg = resultDataJson.getString("msg");
order.setMsg(msg);
try {
orderMapper.inserOrderHis(id,"审核失败",new Date(),"智能平台审核");
} catch (Exception e) {
e.printStackTrace();
}
}
try {
Wrapper<Order> wrapper = new EntityWrapper<>();
wrapper.eq("id", order.getId());
orderMapper.update(order, wrapper);
} catch (Exception e) {
e.printStackTrace();
}
}
});
}
number+=num;
} catch (Exception e) {
e.printStackTrace();
}
executorService.execute(new Runnable() {
public void run() {
String id = dataOrder.getId();
Order orderData = orderMapper.selectById(dataOrder.getId());
String hehuoren_id = orderData.getHehuorenId();
String business_number = orderData.getBusinessNumber();
String business_iccid = orderData.getBusinessIccid();
Map<String, Object> partnerById = orderMapper.findPartnerById(hehuoren_id);
String name = orderData.getHehuorenName();
Map<String, Object> map1 = new HashMap<>();
int ysm = Integer.parseInt(partnerById.get("ysm").toString());
Map<String, Object> ysmById = orderMapper.findYsmById(ysm);
map1.put("ysmUser",ysmById.get("user_name"));
map1.put("sign",ysmById.get("sign"));
map1.put("idCardUrl1", orderData.getIdCardz());
map1.put("idCardUrl2", orderData.getIdCardf());
map1.put("idCardUrl3", orderData.getIdCardzs());
map1.put("idCardUrl4", orderData.getStudenCard());
map1.put("cardType", orderData.getKapin());
if(orderData.getPackageId().equals("49")){
map1.put("userName", orderData.getParentName());
}else{
map1.put("userName", orderData.getCustomerName());
}
map1.put("linkPhone", orderData.getContactNumber());
map1.put("idCard", orderData.getIdCard());
map1.put("orderPhone", business_number);
map1.put("iccId", business_iccid);
String site = orderData.getSite();
String[] split = site.split(" ");
map1.put("sheng",split[0]);
map1.put("shi",split[1]);
map1.put("xian",split[2]);
map1.put("address",orderData.getAddress());
String result="";
result = sendOrder(map1);
JSONObject resultDataJson = JSONObject.fromObject(result);
String orderNum = resultDataJson.getString("orderNumber");
Order order = new Order();
order.setId(id);
order.setUpdateTime(new Date());
if (Is.isNoEmpty(orderNum)) {
order.setSendType("快递");
order.setOrderStatus("审核中");
order.setOrderId(orderNum);
}else{
order.setOrderStatus("异常单");
String msg = resultDataJson.getString("msg");
order.setMsg(msg);
try {
orderMapper.inserOrderHis(id,"审核失败",new Date(),"智能平台审核");
} catch (Exception e) {
e.printStackTrace();
}
}
try {
Wrapper<Order> wrapper = new EntityWrapper<>();
wrapper.eq("id", order.getId());
orderMapper.update(order, wrapper);
} catch (Exception e) {
e.printStackTrace();
}
}
});
try {
// 新增订单流转记录
......
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