Merge branch 'dev' into 'mp-server-test'

getLoginUserInfo增加uid

See merge request quanshu/mp-server!300

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

@@ -301,6 +301,7 @@ public class UserController extends BaseApiController {
     loginUser.getUser().getRoles().forEach(sysRole -> roles.add(sysRole.getRoleName()));
     jsonObject.put("roleKeys", roleKeys);
     jsonObject.put("roles", roles);
+    jsonObject.put("userId", SecurityUtils.getUserId());
 
     return success(jsonObject);
   }

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

@@ -131,7 +131,7 @@ public class UserTicketController extends BaseApiController {
     TicketPackage ticketPackage = ticketPackageService.getById(ticket.getPkgId());
     if (ticketPackage.getStatus() != TicketPkgStatusEnum.SOLD) {
       LogUtil.error(logger, "盲票未激活。ticketId:{0},pkgId:{1}", new Object[]{ticket.getTicketId(), ticket.getPkgId()});
-      return AjaxResult.error("盲票未激活");
+      return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1023);
     }
 
     TicketBox ticketBox = ticketBoxService.getById(ticket.getBoxId());

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

@@ -29,6 +29,7 @@ public enum ErrorCodeEnum {
   ERROR_CODE_1020(1020, "库存不足"),
   ERROR_CODE_1021(1021, "盲豆余额不足"),
   ERROR_CODE_1022(1022, "订单支付中"),
+  ERROR_CODE_1023(1023, "盲票未激活"),
   ;
   private int code;
   private String msg;