Merge branch 'v20.3-yundan-renzheng-0730' into test

performance-api/src/main/java/com/clx/performance/enums/OrderGoodsEnum.java

+package com.clx.performance.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum OrderGoodsEnum {
+    ;
+
+    @Getter
+    @AllArgsConstructor
+    public enum SendWaitModeEnum {
+        // 发货-排队系统形式  1:小程序  2:app
+        WECHAT_PROGRAM(1, "微信小程序"),
+        APP(2, "app");
+
+        private final Integer code;
+        private final String msg;
+
+
+        public static Optional<SendWaitModeEnum> getByCode(Integer code) {
+            return Arrays.stream(values()).filter(e -> e.code.equals(code)).findFirst();
+        }
+
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(SendWaitModeEnum::getMsg).orElse(null);
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum SendWaitSystemMsgEnum {
+
+        YES(1, "需要"),
+        NO(0, "不需要");
+
+        private final Integer code;
+        private final String msg;
+
+
+        public static Optional<SendWaitSystemMsgEnum> getByCode(Integer code) {
+            return Arrays.stream(values()).filter(e -> e.code.equals(code)).findFirst();
+        }
+
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(SendWaitSystemMsgEnum::getMsg).orElse(null);
+        }
+    }
+}

performance-api/src/main/java/com/clx/performance/vo/pc/OrderGoodsVO.java

 package com.clx.performance.vo.pc;
 
+import com.clx.performance.enums.OrderGoodsEnum;
 import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -181,9 +182,19 @@ public class OrderGoodsVO {
     @ApiModelProperty(value = "发货-是否需要系统排队 0 否  1 是")
     private Integer sendWaitSystem;
 
+    @ApiModelProperty(value = "发货-是否需要系统排队 描述：  需要 不需要")
+    public String getSendWaitSystemMsg() {
+        return OrderGoodsEnum.SendWaitSystemMsgEnum.getMsgByCode(sendWaitMode);
+    }
+
     @ApiModelProperty(value = "发货-排队系统名称")
     private String sendWaitSystemName;
 
     @ApiModelProperty(value = "发货-排队系统形式  1:小程序  2:app")
     private Integer sendWaitMode;
+
+    @ApiModelProperty(value = "发货-排队系统形式 描述：  微信小程序  app")
+    public String getSendWaitModeMsg() {
+        return OrderGoodsEnum.SendWaitModeEnum.getMsgByCode(sendWaitMode);
+    }
 }
\ No newline at end of file