Skip to content

G
gdtel-gztel-school-center
Commit 25622c3b by 陈浩建
Options

升级套餐

parent bbf379a0
Showing with 78 additions and 5 deletions
old-user/src/main/java/com/winsun/controller/PackageUpgradeController.java
...@@ -472,4 +472,62 @@ public class PackageUpgradeController extends BaseController { ...@@ -472,4 +472,62 @@ public class PackageUpgradeController extends BaseController {
} }
} }
} }
@RequestMapping(value = "addPackageOrder",method = RequestMethod.POST)
public ResponseData<String> addPackageOrder(@RequestParam("partner")String partner,
@RequestParam("customerName")String customerName,
@RequestParam("contactNumber")String contactNumber, // 联系号码
@RequestParam("businessNumber")String businessNumber, // 办理号码
@RequestParam("kapin")String kapin,
@RequestParam("idCard")String idCard,
@RequestParam("oldPackage")String oldPackage,
@RequestParam("signUrl")String signUrl){
Wrapper<Order> wrapper = new EntityWrapper<>();
wrapper.eq(StringUtils.isNotBlank(businessNumber),"business_number",businessNumber);
wrapper.eq(StringUtils.isNotBlank(kapin),"kapin",kapin);
List<Order> orders = orderMapper.selectList(wrapper);
if(orders!=null && orders.size()>0){
return ResponseData.error("5G升级订单已存在，请不要重复申请！");
}
Order order = new Order();
Integer integer = 0;
//合伙人字段
List<Map<String,Object>> partnerInfo = userMapper.findPartnerById(partner);
String uuid = UUID.randomUUID().toString().replaceAll("-", "");
uuid = uuid.substring(1, 12);
Date data = new Date();
SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");//设置日期格式
String orderNumber = "YRYM" + df.format(new Date()) + uuid;
order.setId(uuid);
order.setOrderNumber(orderNumber);
order.setCustomerName(customerName);
order.setContactNumber(contactNumber);
order.setKapin(kapin);
order.setIdCard(idCard);
order.setOrderStatus("待受理");
order.setUserType("1"); // 老客户办理
order.setNowPackage(oldPackage);
order.setBusinessPackage("5G加装包");
order.setHehuorenId(partner);
if(!partnerInfo.isEmpty()) {
order.setHehuorenArea(partnerInfo.get(0).get("area").toString());
order.setHehuorenName(partnerInfo.get(0).get("name").toString());
order.setHehuorenSchool(partnerInfo.get(0).get("school").toString());
order.setHehuorenPhone(partnerInfo.get(0).get("account").toString());
}
order.setCreateTime(data);
order.setUpdateTime(data);
order.setSignImg(PicturesUtil.uploadPictures(signUrl, orderNumber, "signImg"));
try{
integer = orderMapper.insert(order);
}catch (Exception e){
e.printStackTrace();
}
if(integer == 1){
appMapper.inserOrderHis(uuid, "5G加装包升级成功", data, customerName);
return ResponseData.success("5G加装包升级成功");
}
return ResponseData.error("5G升级订单失败，请重试！");
}
} }
service-manager/src/main/java/com/winsun/controller/OrderController.java
...@@ -440,8 +440,11 @@ public class OrderController extends BaseController { ...@@ -440,8 +440,11 @@ public class OrderController extends BaseController {
@RequestParam(name = "businessNumber", required = false) String businessNumber, @RequestParam(name = "contactNumber", required = false) String contactNumber, @RequestParam(name = "businessNumber", required = false) String businessNumber, @RequestParam(name = "contactNumber", required = false) String contactNumber,
@RequestParam(name = "hehuorenSchool", required = false) String hehuorenSchool, @RequestParam(name = "hehuorenName", required = false) String hehuorenName, @RequestParam(name = "hehuorenSchool", required = false) String hehuorenSchool, @RequestParam(name = "hehuorenName", required = false) String hehuorenName,
@RequestParam(name = "orderStatus", required = false) String orderStatus,@RequestParam(name = "hehuorenArea", required = false) String hehuorenArea, @RequestParam(name = "orderStatus", required = false) String orderStatus,@RequestParam(name = "hehuorenArea", required = false) String hehuorenArea,
@RequestParam(name = "customerName", required = false) String customerName, @RequestParam(name = "pageNo", required = false) int pageNo, @RequestParam(name = "customerName", required = false) String customerName,
@RequestParam(name = "orderId", required = false)String orderId,@RequestParam(name = "xbOrderId", required = false) String xbOrderId, @RequestParam(name = "orderId", required = false)String orderId,
@RequestParam(name = "xbOrderId", required = false) String xbOrderId,
@RequestParam(name = "businessPackage", required = false) String businessPackage,
@RequestParam(name = "pageNo", required = false) int pageNo,
@RequestParam(name = "pageSize", required = false) int pageSize) { @RequestParam(name = "pageSize", required = false) int pageSize) {
Map<String,Object> map = new HashMap<>(); Map<String,Object> map = new HashMap<>();
...@@ -476,6 +479,7 @@ public class OrderController extends BaseController { ...@@ -476,6 +479,7 @@ public class OrderController extends BaseController {
wrapper.eq(StringUtils.isNotBlank(contactNumber), "contact_number", contactNumber); wrapper.eq(StringUtils.isNotBlank(contactNumber), "contact_number", contactNumber);
wrapper.like(StringUtils.isNotBlank(hehuorenSchool), "hehuoren_school", hehuorenSchool); wrapper.like(StringUtils.isNotBlank(hehuorenSchool), "hehuoren_school", hehuorenSchool);
wrapper.like(StringUtils.isNotBlank(hehuorenName), "hehuoren_name", hehuorenName, SqlLike.DEFAULT); wrapper.like(StringUtils.isNotBlank(hehuorenName), "hehuoren_name", hehuorenName, SqlLike.DEFAULT);
wrapper.like(StringUtils.isNotBlank(businessPackage), "business_package", businessPackage, SqlLike.DEFAULT);
if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "快递公司"))) { if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "快递公司"))) {
wrapper.eq("hehuoren_area", "本部"); wrapper.eq("hehuoren_area", "本部");
}else{ }else{
...@@ -677,7 +681,8 @@ public class OrderController extends BaseController { ...@@ -677,7 +681,8 @@ public class OrderController extends BaseController {
@RequestParam(name = "businessNumber", required = false) String businessNumber, @RequestParam(name = "contactNumber", required = false) String contactNumber, @RequestParam(name = "businessNumber", required = false) String businessNumber, @RequestParam(name = "contactNumber", required = false) String contactNumber,
@RequestParam(name = "hehuorenSchool", required = false) String hehuorenSchool, @RequestParam(name = "hehuorenName", required = false) String hehuorenName, @RequestParam(name = "hehuorenSchool", required = false) String hehuorenSchool, @RequestParam(name = "hehuorenName", required = false) String hehuorenName,
@RequestParam(name = "orderStatus", required = false) String orderStatus, @RequestParam(name = "orderStatus", required = false) String orderStatus,
@RequestParam(name = "customerName", required = false) String customerName) { @RequestParam(name = "customerName", required = false) String customerName,
@RequestParam(name = "businessPackage", required = false) String businessPackage) {
String dateFormat = "YYYY-MM-DD"; String dateFormat = "YYYY-MM-DD";
if (StringUtils.isNotBlank(createTimeStart) && StringUtils.isNotBlank(createTimeEnd)) { if (StringUtils.isNotBlank(createTimeStart) && StringUtils.isNotBlank(createTimeEnd)) {
...@@ -729,6 +734,10 @@ public class OrderController extends BaseController { ...@@ -729,6 +734,10 @@ public class OrderController extends BaseController {
map.put("orderStatus", orderStatus); map.put("orderStatus", orderStatus);
} }
if (StringUtils.isNotBlank(businessPackage)) {
map.put("businessPackage", businessPackage);
}
if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "快递公司"))) { if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "快递公司"))) {
map.put("orderStatus", "待配送"); map.put("orderStatus", "待配送");
map.put("hehuorenArea", "本部"); map.put("hehuorenArea", "本部");
......
task/src/main/java/com/winsun/service/ExportService.java
...@@ -97,6 +97,11 @@ public class ExportService extends BaseController { ...@@ -97,6 +97,11 @@ public class ExportService extends BaseController {
if (map.containsKey("hehuorenArea")) { if (map.containsKey("hehuorenArea")) {
hehuorenArea = map.get("hehuorenArea").toString(); hehuorenArea = map.get("hehuorenArea").toString();
} }
String businessPackage = "";
if (map.containsKey("businessPackage")) {
businessPackage = map.get("businessPackage").toString();
}
boolean isYzk = false; boolean isYzk = false;
if (map.containsKey("isYzk")) { if (map.containsKey("isYzk")) {
isYzk = true; isYzk = true;
...@@ -118,6 +123,7 @@ public class ExportService extends BaseController { ...@@ -118,6 +123,7 @@ public class ExportService extends BaseController {
wrapper.eq(StringUtils.isNotBlank(contactNumber), "contact_number", contactNumber); wrapper.eq(StringUtils.isNotBlank(contactNumber), "contact_number", contactNumber);
wrapper.eq(StringUtils.isNotBlank(hehuorenSchool), "hehuoren_school", hehuorenSchool); wrapper.eq(StringUtils.isNotBlank(hehuorenSchool), "hehuoren_school", hehuorenSchool);
wrapper.like(StringUtils.isNotBlank(hehuorenName), "hehuoren_name", hehuorenName, SqlLike.DEFAULT); wrapper.like(StringUtils.isNotBlank(hehuorenName), "hehuoren_name", hehuorenName, SqlLike.DEFAULT);
wrapper.like(StringUtils.isNotBlank(businessPackage), "business_package", businessPackage, SqlLike.DEFAULT);
wrapper.eq(StringUtils.isNotBlank(orderStatus), "order_status", orderStatus); wrapper.eq(StringUtils.isNotBlank(orderStatus), "order_status", orderStatus);
List<Map<String, Object>> Orders = orderMapper.downloadOrder(wrapper); List<Map<String, Object>> Orders = orderMapper.downloadOrder(wrapper);
List<String> tops = new ArrayList<>(); List<String> tops = new ArrayList<>();
...@@ -141,11 +147,11 @@ public class ExportService extends BaseController { ...@@ -141,11 +147,11 @@ public class ExportService extends BaseController {
columns.add("order_number"); columns.add("order_number");
columns.add("contact_number"); columns.add("contact_number");
columns.add("business_number"); columns.add("business_number");
columns.add("business_package"); columns.add("kapin");
columns.add("hehuoren_name"); columns.add("hehuoren_name");
columns.add("hehuoren_school"); columns.add("hehuoren_school");
columns.add("hehuoren_phone"); columns.add("hehuoren_phone");
columns.add("package_id"); columns.add("now_package");
columns.add("business_package"); columns.add("business_package");
columns.add("order_status"); columns.add("order_status");
columns.add("user_type"); columns.add("user_type");
......
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