5G加装包升级新增PC受理按钮

old-user/src/main/java/com/winsun/controller/PackageUpgradeController.java

@@ -529,6 +529,7 @@ public class PackageUpgradeController extends BaseController {
         order.setOrderNumber(orderNumber);
         order.setCustomerName(customerName);
         order.setContactNumber(contactNumber);
+        order.setBusinessNumber(businessNumber);
         order.setKapin(kapin);
         order.setIdCard(idCard);
         order.setOrderStatus("待受理");
@@ -551,8 +552,7 @@ public class PackageUpgradeController extends BaseController {
             e.printStackTrace();
         }
         if(integer == 1){
-            appMapper.inserOrderHis(uuid, "5G加装包升级成功", data, customerName);
-            return ResponseData.success("5G加装包升级成功");
+            return ResponseData.success(uuid,"5G加装包升级成功");
         }
         return ResponseData.error("5G升级订单失败，请重试！");
     }

service-manager/src/main/java/com/winsun/controller/OrderController.java

@@ -1488,15 +1488,25 @@ public class OrderController extends BaseController {
             Wrapper<Order> wrapper = new EntityWrapper();
             wrapper.eq(StringUtils.isNotBlank(businessNumber),"business_number",businessNumber);
             wrapper.eq("kapin","5G加装包");
-            wrapper.ne("user_type","1");
+            wrapper.eq("user_type","1");
             List<Order> orderByNumber = orderMapper.selectList(wrapper);
             if(orderByNumber.size()==0){
                 continue;
             }
+            Date date = new Date();
             Order dataOrder = new Order();
+            dataOrder.setId(orderByNumber.get(0).getId());
             dataOrder.setOrderStatus(orderStatus);
+            dataOrder.setAcceptComment("批量受理："+orderStatus);
+            dataOrder.setAcceptName(user.getName());
+            dataOrder.setAcceptDate(date);
+            if("已完成".equals(orderStatus)){
+                dataOrder.setAcceptResult("受理成功");
+            }else {
+                dataOrder.setAcceptResult("受理失败");
+            }
             SalesList sales = new SalesList();
-            Date date = new Date();
+
 
             try {
                 integer = orderMapper.update(dataOrder,wrapper);
@@ -1512,6 +1522,8 @@ public class OrderController extends BaseController {
                 sales.setName(orderByNumber.get(0).getHehuorenName());
                 sales.setAccount(user.getAccount());
                 sales.setCreateTime(date);
+                sales.setStatus(orderStatus);
+                sales.setRemark("批量受理："+orderStatus);
                 sales.setSalesSubst(orderByNumber.get(0).getHehuorenArea());
                 sales.setSalesSchool(orderByNumber.get(0).getHehuorenSchool());
                 sales.setOrderType(orderByNumber.get(0).getUserType());
@@ -2091,10 +2103,30 @@ public class OrderController extends BaseController {
         if("1".equals(auditType)){
             order.setAcceptResult("受理成功");
             order.setOrderStatus("已完成");
+            List<Order> orderByNumber = orderMapper.selectList(wrapper);
+            SalesList sales = new SalesList();
+            Date date = new Date();
+            sales.setOrderPhone(orderByNumber.get(0).getBusinessNumber());
+            sales.setUserId(orderByNumber.get(0).getHehuorenId());
+            sales.setName(orderByNumber.get(0).getHehuorenName());
+            sales.setAccount(user.getAccount());
+            sales.setCreateTime(date);
+            sales.setStatus("已完成");
+            sales.setRemark(contentMsg);
+            sales.setSalesSubst(orderByNumber.get(0).getHehuorenArea());
+            sales.setSalesSchool(orderByNumber.get(0).getHehuorenSchool());
+            sales.setOrderType(orderByNumber.get(0).getUserType());
+            sales.setOrderNum(orderByNumber.get(0).getOrderNumber());
+            sales.setUpgradeCombo(orderByNumber.get(0).getBusinessPackage());
+            sales.setOldCombo(orderByNumber.get(0).getNowPackage());
+            sales.setDelFlag("0");
+            sales.setLockState("0");
+            salesListMapper.insert(sales);
         }else {
             order.setOrderStatus("异常单");
             order.setAcceptResult("受理失败");
         }
+
         appMapper.inserOrderHis(orderId, "受理意见："+contentMsg, new Date(), user.getName());
         orderMapper.update(order, wrapper);
         return ResponseData.success();