Merge remote-tracking branch 'origin/master'

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

@@ -158,9 +158,9 @@ public class supervisorController extends BaseController {
         wrapper.eq("id", orderId);
         Order order = orderMapper.selectById(orderId);
         Map<String, Object> dataMapping = new HashMap<>();
-        int xb = order.getXbType();
+        String xb = order.getXbType();
         if ("0".equals(type)) {
-            if (xb == 1) {
+            if ("1".equals(xb)) {
                 dataMapping.put("order_status", "待配送");
                 dataMapping.put("send_type", "快递");
             } else {
@@ -169,7 +169,7 @@ public class supervisorController extends BaseController {
             }
         }
         if ("1".equals(type)) {
-            if (xb == 1) {
+            if ("1".equals(xb)) {
                 dataMapping.put("order_status", "待活体");
                 dataMapping.put("send_type", "送货上门");
             } else {
@@ -272,8 +272,8 @@ public class supervisorController extends BaseController {
         Wrapper wrapper = new EntityWrapper<>();
         wrapper.eq("id", orderId);
         Map<String, Object> dataMapping = new HashMap<>();
-        int xbType = order.getXbType();
-        if (xbType == 1) {
+        String xbType = order.getXbType();
+        if ("1".equals(xbType)) {
             dataMapping.put("order_status", "待活体");
         } else {
             dataMapping.put("order_status", "已完成");