Merge remote-tracking branch 'origin/master'

new-user/src/main/java/com/winsun/controller/PackageNewClothes.java

@@ -184,7 +184,7 @@ public class PackageNewClothes {
         SysUser sysUser = userMapper.selectById(partner);
         SysUser sysUser = userMapper.selectById(partner);
         Order order = new Order();
         Order order = new Order();
         String id = UUID.randomUUID().toString();
         String id = UUID.randomUUID().toString();
-        order.setId(id);
+        order.setId(id.split("-")[0]+id.split("-")[1]);
         order.setIdCard(idCard);
         order.setIdCard(idCard);
         order.setOrderStatus("待处理");
         order.setOrderStatus("待处理");
         order.setUserSchool(userSchool);
         order.setUserSchool(userSchool);
@@ -300,7 +300,7 @@ public class PackageNewClothes {
         SysUser sysUser = userMapper.selectById(partner);
         SysUser sysUser = userMapper.selectById(partner);
         Order order = new Order();
         Order order = new Order();
         String id = UUID.randomUUID().toString();
         String id = UUID.randomUUID().toString();
-        order.setId(id);
+        order.setId(id.split("-")[0]+id.split("-")[1]);
         order.setIdCard(idCard);
         order.setIdCard(idCard);
         order.setOrderStatus("待处理");
         order.setOrderStatus("待处理");
         order.setUserSchool(userSchool);
         order.setUserSchool(userSchool);
@@ -434,7 +434,7 @@ public class PackageNewClothes {
         SysUser sysUser = userMapper.selectById(partner);
         SysUser sysUser = userMapper.selectById(partner);
         Order order = new Order();
         Order order = new Order();
         String id = UUID.randomUUID().toString();
         String id = UUID.randomUUID().toString();
-        order.setId(id);
+        order.setId(id.split("-")[0]+id.split("-")[1]);
         order.setIdCard(idCard);
         order.setIdCard(idCard);
         order.setXbOrderId(map.get("orderCode").toString());
         order.setXbOrderId(map.get("orderCode").toString());
         order.setOrderStatus("待识别");
         order.setOrderStatus("待识别");

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

@@ -224,7 +224,7 @@ public class PackageUpgradeController extends BaseController {
         SysUser sysUser = userMapper.selectById(partner);
         SysUser sysUser = userMapper.selectById(partner);
         Order order = new Order();
         Order order = new Order();
         String id = UUID.randomUUID().toString();
         String id = UUID.randomUUID().toString();
-        order.setId(id);
+        order.setId(id.split("-")[0]+id.split("-")[1]);
         order.setIdCard(packageUpgrade.getSocialId());
         order.setIdCard(packageUpgrade.getSocialId());
         order.setOrderStatus(OrderStatus.PENDINGACCEPTANCE.getName());
         order.setOrderStatus(OrderStatus.PENDINGACCEPTANCE.getName());
         order.setHehuorenId(partner);
         order.setHehuorenId(partner);
@@ -253,7 +253,7 @@ public class PackageUpgradeController extends BaseController {
         // MessageUtil.sent(contactNumber,"4","");
         // MessageUtil.sent(contactNumber,"4","");
         if (StringUtils.isNotBlank(mark)) {
         if (StringUtils.isNotBlank(mark)) {
             String id1 = UUID.randomUUID().toString();
             String id1 = UUID.randomUUID().toString();
-            order.setId(id1);
+            order.setId(id1.split("-")[0]+id1.split("-")[1]);
             String s1 = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
             String s1 = String.valueOf((int) ((Math.random() * 9 + 1) * 1000));
             order.setOrderNumber("YRYM" + format + s1);
             order.setOrderNumber("YRYM" + format + s1);
             order.setUserType(UserType.YCTK.getId());
             order.setUserType(UserType.YCTK.getId());

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

 package com.winsun.controller;
 package com.winsun.controller;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 
 
+import com.winsun.utils.MyBatisPlusUpdateUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFRow;
@@ -58,6 +60,22 @@ public class OrderController extends BaseController {
         List<Map<String, Object>> list = orderMapper.selectOrderHis(orderId);
         List<Map<String, Object>> list = orderMapper.selectOrderHis(orderId);
         return ResponseData.success(list);
         return ResponseData.success(list);
     }
     }
+
+    /**
+     * 修改为异常单
+     */
+    @RequestMapping(value = "abnormal", method = RequestMethod.POST)
+    public ResponseData<String> abnormal(@RequestParam("orderId") String orderId) {
+        Wrapper wrapper = new EntityWrapper<>();
+        wrapper.eq("id", orderId);
+        Map<String, Object> dataMapping = new HashMap<>();
+        dataMapping.put("order_status","异常单");
+        Integer integer = orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
+        if(integer == 1){
+            return ResponseData.success("设为异常单成功！");
+        }
+        return ResponseData.error("设为异常单失败！");
+    }
     
     
     /**
     /**
      * 
      *