Merge branch 'dev' of maopiao/mp-server into mp-server-test

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/TicketBoxMgrController.java

@@ -499,24 +499,24 @@ public class TicketBoxMgrController extends BaseApiController {
             return AjaxResult.error("参数异常，盲票组不存在");
         }
         //更新盲票列表的状态
-        List<Ticket> ticketList = ticketService
-            .list(new LambdaQueryWrapper<Ticket>().eq(Ticket::getBoxId, ticketBox.getBoxId()).eq(Ticket::getStatus,TicketStatusEnum.NOT_PAY));
+//        List<Ticket> ticketList = ticketService
+//            .list(new LambdaQueryWrapper<Ticket>().eq(Ticket::getBoxId, ticketBox.getBoxId()).eq(Ticket::getStatus,TicketStatusEnum.NOT_PAY));
         //更新盲票包的状态
-        List<TicketPackage> ticketPackageList = ticketPackageService.list(new LambdaQueryWrapper<TicketPackage>()
-            .eq(TicketPackage::getBoxId, ticketBox.getBoxId()));
+//        List<TicketPackage> ticketPackageList = ticketPackageService.list(new LambdaQueryWrapper<TicketPackage>()
+//            .eq(TicketPackage::getBoxId, ticketBox.getBoxId()));
         if((ticketBox.getStatus() == TicketBoxStatusEnum.PUT_ON || ticketBox.getStatus() == TicketBoxStatusEnum.PUT_OFF) && ticketBox.getType() == TicketTypeEnum.OFFLINE){
             ticketBoxService.update(new LambdaUpdateWrapper<TicketBox>()
                 .set(TicketBox::getStatus, TicketBoxStatusEnum.STOP)
                 .eq(TicketBox::getBoxId, ticketBox.getBoxId()));
-            if(ticketPackageList != null && ticketPackageList.size()>0){
-                for(TicketPackage ticketPackage : ticketPackageList){
-                    ticketPackage.setStatus(TicketPkgStatusEnum.STOP);
-                    ticketPackageService.saveOrUpdate(ticketPackage);
-                }
-            }
-            if(ticketList == null || ticketList.size() == 0){
-                return AjaxResult.error("盲票不存在");
-            }
+//            if(ticketPackageList != null && ticketPackageList.size()>0){
+//                for(TicketPackage ticketPackage : ticketPackageList){
+//                    ticketPackage.setStatus(TicketPkgStatusEnum.STOP);
+//                    ticketPackageService.saveOrUpdate(ticketPackage);
+//                }
+//            }
+//            if(ticketList == null || ticketList.size() == 0){
+//                return AjaxResult.error("盲票不存在");
+//            }
 //            //创建线程
 //            int threadNumber = 5;//线程数量
 //            long start = System.currentTimeMillis();//开始时间

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

@@ -409,11 +409,9 @@ public class UserTicketController extends BaseApiController {
         @ApiResponse(code = 200, message = "success", response = TicketVO.class)
     )
     public AjaxResult queryLuckyNum(@RequestBody TicketParam param) {
-
         if (StringUtils.isBlank(param.getSerialNo())) {
             return AjaxResult.error("参数异常，盲票序列号缺失");
         }
-
         String serialNo = param.getSerialNo();
         boolean match = ReUtil.isMatch("^\\w*-\\w*-\\w*$", serialNo);
         if (!match) {
@@ -421,7 +419,6 @@ public class UserTicketController extends BaseApiController {
         }
         Ticket ticket = ticketService.getOne(
             new LambdaQueryWrapper<Ticket>().eq(Ticket::getSerialNo, serialNo));
-
         if (null == ticket) {
             return AjaxResult.error("参数异常，盲票不存在");
         }
@@ -431,46 +428,42 @@ public class UserTicketController extends BaseApiController {
             return AjaxResult.error("非法访问!");
         }
         TicketPackage ticketPackage = ticketPackageService.getById(ticket.getPkgId());
-        //盲票状态:2已激活、3已兑奖、4付款中'
-        //处理线下票停售(type线下票。status已上架或已下架)
-        //判断盲票是否付款
-        // 未付款
-        AjaxResult ajaxResult = null;
-        if(ticket.getStatus().equals(TicketStatusEnum.STOP)){
-            LogUtil.warn(logger, "该盲票已停售", new Object[]{ticket.getSerialNo(), ticket.getPkgId()});
-            return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1027);
+        //线下票初始化状态就是待售 没有绑定门店 直接显示未激活
+        if (ticketPackage.getStatus().equals(TicketPkgStatusEnum.FOR_SALE)) {
+//            if(ticketBox.getStatus().equals(TicketBoxStatusEnum.STOP)){
+//                LogUtil.warn(logger, "盲票已停售。sn:{0},pkgId:{1}", new Object[] { ticket.getSerialNo(), ticket.getPkgId() });
+//                return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1027);
+//            }
+            LogUtil.warn(logger, "盲票未激活。sn:{0},pkgId:{1}", new Object[] { ticket.getSerialNo(), ticket.getPkgId() });
+            return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1023);
         }
-        //未激活
-        if (ticketPackage.getStatus() == TicketPkgStatusEnum.FOR_SALE) {
-            LogUtil.warn(logger, "盲票未激活。sn:{0},pkgId:{1}", new Object[]{ticket.getSerialNo(), ticket.getPkgId()});
+        AjaxResult ajaxResult = null;
+        //线下票绑定门店状态就是已售 绑定门店
+        if(ticketPackage.getStatus().equals(TicketPkgStatusEnum.SOLD)){
+            //停售盲票组
             if(ticketBox.getStatus().equals(TicketBoxStatusEnum.STOP)){
-                LogUtil.warn(logger, "该盲票已停售", new Object[]{ticket.getSerialNo(), ticket.getPkgId()});
-                return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1027);
-            }
-            return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1023);
-        }else if(ticketPackage.getStatus() == TicketPkgStatusEnum.SOLD){
-            //盲票已激活
-            LogUtil.warn(logger, "盲票已激活", new Object[]{ticket.getSerialNo(), ticket.getPkgId()});
-            if(ticket.getStatus().equals(TicketStatusEnum.NOT_PAY)){
-                if(ticketBox.getStatus().equals(TicketBoxStatusEnum.STOP)){
-                    LogUtil.warn(logger, "该盲票已停售", new Object[]{ticket.getSerialNo(), ticket.getPkgId()});
+                if(ticket.getStatus().equals(TicketStatusEnum.NOT_PAY)){
+                    LogUtil.warn(logger, "盲票已停售", new Object[]{ticket.getSerialNo(), ticket.getPkgId()});
                     return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1027);
+                }else{
+                    //走正常的逻辑
+                    ajaxResult = queryLuckyNumTrue(ticketPackage, ticket, ticketBox);
                 }
-                ajaxResult = queryLuckyNumTrue(ticketPackage, ticket, ticketBox);
-            }else if(ticket.getStatus().equals(TicketStatusEnum.STOP)){
-                return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1027);
             }else{
+                //走正常的逻辑
                 ajaxResult = queryLuckyNumTrue(ticketPackage, ticket, ticketBox);
             }
-        }else if(ticketPackage.getStatus() == TicketPkgStatusEnum.STOP){
-            if(ticketBox.getStatus().equals(TicketBoxStatusEnum.STOP)){
-                if(ticket.getStatus().equals(TicketStatusEnum.NOT_PAY)){
-                    LogUtil.warn(logger, "该盲票已停售", new Object[]{ticket.getSerialNo(), ticket.getPkgId()});
-                    return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1027);
-                }
-                ajaxResult = queryLuckyNumTrue(ticketPackage,ticket,ticketBox);
-            }
         }
+        //线下票绑定门店状态停售
+//        if(ticketPackage.getStatus().equals(TicketPkgStatusEnum.STOP)){
+//            if(ticket.getStatus().equals(TicketStatusEnum.NOT_PAY)){
+//                LogUtil.warn(logger, "盲票已停售", new Object[]{ticket.getSerialNo(), ticket.getPkgId()});
+//                return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1027);
+//            }else{
+//                //走正常的逻辑
+//                ajaxResult = queryLuckyNumTrue(ticketPackage, ticket, ticketBox);
+//            }
+//        }
         return ajaxResult;
     }
 

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

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

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

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

mp-common/src/main/java/com/qs/mp/common/enums/TicketStatusEnum.java

@@ -14,8 +14,8 @@ import com.qs.mp.common.json.EnumValueDeserializer;
 public enum TicketStatusEnum implements IEnum<Integer> {
   NOT_PAY(1, "未付款"),
   ACTIVATED(2, "待兑奖"),
-  CASHED(3, "已兑奖"),
-  STOP(5,"已停售");
+  CASHED(3, "已兑奖");
+//  STOP(5,"已停售");
 
   private final int value;
   private final String desc;