紫亚兰签到bugfix

src/main/java/com/caimei365/user/controller/LoginApi.java

@@ -127,8 +127,8 @@ public class LoginApi {
 
     @ApiOperation("紫亚兰票据详情")
     @GetMapping("/ticket/detail")
-    public ResponseJson<TicketPo> ticketBind(String ticket) {
-        return loginService.ticketDetail(ticket);
+    public ResponseJson<TicketPo> ticketBind(Integer userId, String ticket) {
+        return loginService.ticketDetail(userId, ticket);
     }
 
     @ApiOperation("紫亚兰展台供应商信息")

src/main/java/com/caimei365/user/model/po/TicketPo.java

@@ -4,6 +4,10 @@ import lombok.Data;
 
 @Data
 public class TicketPo {
+    /**
+     * 1 已绑定 0 未绑定
+     */
+    private Integer ticketFlag;
     private Integer userId;
     private String ticketId;
     private String idCard;

src/main/java/com/caimei365/user/service/LoginService.java

@@ -248,7 +248,7 @@ public interface LoginService {
 
     ResponseJson<List<ShopSignPo>> signList(Integer userId);
 
-    ResponseJson<TicketPo> ticketDetail(String ticket);
+    ResponseJson<TicketPo> ticketDetail(Integer userId, String ticket);
 
     ResponseJson ticketCheck(String mobile, String smsCode);
 }

src/main/java/com/caimei365/user/service/impl/LoginServiceImpl.java

@@ -1667,7 +1667,7 @@ public class LoginServiceImpl implements LoginService {
                 return ResponseJson.success("绑定成功！");
             }
         }
-        return ResponseJson.error(-3, "该用户已绑定门票！");
+        return ResponseJson.error(-3, "您已激活过门票，请勿重复激活！");
     }
 
     private Integer ticketRegiste(String name, String mobile, String SmsCode, String unionId, HttpHeaders headers) {
@@ -1683,7 +1683,7 @@ public class LoginServiceImpl implements LoginService {
             Object randomCode = redisService.get("code:" + mobile);
             if (!ObjectUtils.isEmpty(randomCode) && SmsCode.equals(randomCode.toString())) {
                 redisService.remove("code:" + mobile);
-            }else{
+            } else {
                 return null;
             }
         }
@@ -1892,8 +1892,12 @@ public class LoginServiceImpl implements LoginService {
     }
 
     @Override
-    public ResponseJson<TicketPo> ticketDetail(String ticket) {
-        return ResponseJson.success(loginMapper.findTicket(ticket));
+    public ResponseJson<TicketPo> ticketDetail(Integer userId, String ticket) {
+        TicketPo ticketUser = loginMapper.findTicketUser(userId);
+        TicketPo ticketPo = loginMapper.findTicket(ticket);
+        Integer flag = null == ticketUser || ticket.equals(ticketUser.getTicketId()) ? 0 : 1;
+        ticketPo.setTicketFlag(flag);
+        return ResponseJson.success(ticketPo);
     }
 
     @Override