MrWang 1 rok pred
rodič
commit
6be21342d6

+ 4 - 1
mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserTicketController.java

@@ -419,9 +419,12 @@ public class UserTicketController extends BaseApiController {
       return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1017);
     }*/
         TicketPackage ticketPackage = ticketPackageService.getById(ticket.getPkgId());
-        if (ticketPackage.getStatus() != TicketPkgStatusEnum.SOLD) {
+        if (ticketPackage.getStatus() == TicketPkgStatusEnum.FOR_SALE) {
             LogUtil.warn(logger, "盲票未激活。sn:{0},pkgId:{1}", new Object[]{ticket.getSerialNo(), ticket.getPkgId()});
             return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1023);
+        }else if(ticketPackage.getStatus() == TicketPkgStatusEnum.STOP){
+            LogUtil.warn(logger, "盲票已停售。sn:{0},pkgId:{1}", new Object[]{ticket.getSerialNo(), ticket.getPkgId()});
+            return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1027);
         }
 
         ChannelOrderDetail channelOrderDetail = channelOrderDetailService.getOne(

+ 2 - 2
mp-common/src/main/java/com/qs/mp/common/enums/ErrorCodeEnum.java

@@ -32,9 +32,9 @@ public enum ErrorCodeEnum {
     ERROR_CODE_1023(1023, "盲票未激活"),
     ERROR_CODE_1024(1024, "删除失败,分类下存在商品"),
     ERROR_CODE_1025(1025, "删除失败,标签下存在商品"),
-
     ERROR_CODE_1026(1026, "用户支付宝未授权登录"),
-    ;
+    ERROR_CODE_1027(1027, "盲票已停售");
+
     private int code;
     private String msg;
 

+ 2 - 1
mp-common/src/main/java/com/qs/mp/common/enums/TicketPkgStatusEnum.java

@@ -14,7 +14,8 @@ import com.qs.mp.common.json.EnumValueDeserializer;
 public enum TicketPkgStatusEnum implements IEnum<String> {
 
   FOR_SALE("forSale", "待售"),
-  SOLD("sold", "已售");
+  SOLD("sold", "已售"),
+  STOP("stop","停售");
 
   private final String value;
   private final String desc;