Commit d4db80dd authored by zhengyi's avatar zhengyi

对单独的提货状态进查询与文案判断转义bug修复

parent 205f1154
...@@ -149,7 +149,10 @@ public enum OrderStatusMsgEnum { ...@@ -149,7 +149,10 @@ public enum OrderStatusMsgEnum {
public static String getMsg(Integer pickState, Integer status, Integer inWarehouseState, Integer shipmentState, Integer airShipment, public static String getMsg(Integer pickState, Integer status, Integer inWarehouseState, Integer shipmentState, Integer airShipment,
Integer transportId, Integer userType, Integer lang) { Integer transportId, Integer userType, Integer lang) {
if (Objects.nonNull(pickState)) {
// 当提货状态不未空时,判断提货状态是否需要转化为对应的原有主状态中的提货状态
status = pickState > 0 ? (pickState == 1 ? 21 : 20) : status; status = pickState > 0 ? (pickState == 1 ? 21 : 20) : status;
}
for (OrderStatusMsgEnum value : OrderStatusMsgEnum.values()) { for (OrderStatusMsgEnum value : OrderStatusMsgEnum.values()) {
String message = userType == 2 ? value.adminSourceName : value.customerSourceName; String message = userType == 2 ? value.adminSourceName : value.customerSourceName;
if (Objects.equals(value.status, status) && shipmentState != 0 && Objects.equals(value.shipmentState, shipmentState)) { if (Objects.equals(value.status, status) && shipmentState != 0 && Objects.equals(value.shipmentState, shipmentState)) {
......
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