Commit 37b48f08 by 黄森林

bug修改

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