Merge branch 'master' of http://119.28.51.83/hewei/Jumeirah into dev/lanpingxiong

api-app/src/main/java/com/jumeirah/api/app/controller/SysNoticeController.java

@@ -56,6 +56,7 @@ public class SysNoticeController extends BaseController {
             sysNoticeQueryVo.setTheme(sysNotice.getTheme());
             sysNoticeQueryVo.setTheme(sysNotice.getTheme());
             sysNoticeQueryVo.setMsgInfo(sysNotice.getContent());
             sysNoticeQueryVo.setMsgInfo(sysNotice.getContent());
             sysNoticeQueryVo.setSendTime(sysNotice.getCreateTime());
             sysNoticeQueryVo.setSendTime(sysNotice.getCreateTime());
+            sysNoticeQueryVoList.add(sysNoticeQueryVo);
         }
         }
 
 
         // 修改为已读
         // 修改为已读
@@ -64,7 +65,12 @@ public class SysNoticeController extends BaseController {
         if (sysNoticeRead != null) {
         if (sysNoticeRead != null) {
             sysNoticeRead.setReadStatus(1);
             sysNoticeRead.setReadStatus(1);
             sysNoticeReadService.updateById(sysNoticeRead);
             sysNoticeReadService.updateById(sysNoticeRead);
-        }
+        } /*else {
+            SysNoticeRead sysNoticeRead1 = new SysNoticeRead();
+            sysNoticeRead1.setUserId(jwtToken.getUserId());
+            sysNoticeRead1.setReadStatus(1);
+            sysNoticeReadService.save(sysNoticeRead1);
+        }*/
 
 
         return ApiResult.ok(sysNoticeQueryVoList);
         return ApiResult.ok(sysNoticeQueryVoList);
     }
     }

api-app/src/main/java/com/jumeirah/api/app/service/AppUserApiService.java

@@ -31,6 +31,14 @@ public interface AppUserApiService {
      */
      */
     boolean updateAppUser(AppUserInfoParam appUserInfoParam) throws Exception;
     boolean updateAppUser(AppUserInfoParam appUserInfoParam) throws Exception;
 
 
+    /**
+     * 修改手机号
+     * @param phoneArea
+     * @param phone
+     * @param code
+     * @return
+     * @throws Exception
+     */
     ApiResult<Boolean> updatePhone(String phoneArea, String phone, String code) throws Exception;
     ApiResult<Boolean> updatePhone(String phoneArea, String phone, String code) throws Exception;
 
 
 
 

api-app/src/main/java/com/jumeirah/api/app/service/impl/AppUserApiServiceImpl.java

@@ -44,6 +44,15 @@ public class AppUserApiServiceImpl implements AppUserApiService {
         // 删除已使用的验证码
         // 删除已使用的验证码
         appSmsService.deleteUpdatePhoneCode(appUserById.getPhoneArea(), appUserById.getPhone());
         appSmsService.deleteUpdatePhoneCode(appUserById.getPhoneArea(), appUserById.getPhone());
 
 
+        // 判断手机号是否已经注册
+        AppUser one = appUserService.getOne(new QueryWrapper<AppUser>().lambda()
+                .eq(AppUser::getPhoneArea, phoneArea)
+                .eq(AppUser::getPhone, phone));
+        if (one != null) {
+            return ApiResult.fail(ApiCode.BUSINESS_EXCEPTION);
+        }
+
+
         AppUser appUser = new AppUser();
         AppUser appUser = new AppUser();
         appUser.setPhoneArea(phoneArea);
         appUser.setPhoneArea(phoneArea);
         appUser.setPhone(phone);
         appUser.setPhone(phone);

common/src/main/java/com/jumeirah/common/vo/StrokeQueryVo.java

@@ -70,13 +70,13 @@ public class StrokeQueryVo implements Serializable {
     @ApiModelProperty("返程飞机型号ID")
     @ApiModelProperty("返程飞机型号ID")
     private Long arrivePlainTypeId;
     private Long arrivePlainTypeId;
 
 
-    @NotBlank(message = "返程出发机场名称不能为空")
-    @ApiModelProperty("返程出发机场名称")
-    private String backOutsetAirportName;
-
-    @NotBlank(message = "返程到达机场名称不能为空")
-    @ApiModelProperty("返程到达机场名称")
-    private String backArriveAirportName;
+//    @NotBlank(message = "返程出发机场名称不能为空")
+//    @ApiModelProperty("返程出发机场名称")
+//    private String backOutsetAirportName;
+//
+//    @NotBlank(message = "返程到达机场名称不能为空")
+//    @ApiModelProperty("返程到达机场名称")
+//    private String backArriveAirportName;
 
 
     @NotNull(message = "付款状态不能为空")
     @NotNull(message = "付款状态不能为空")
     @ApiModelProperty("付款状态，0-未付款，1-付款中，2-已付款，3-退款中，99-已退款")
     @ApiModelProperty("付款状态，0-未付款，1-付款中，2-已付款，3-退款中，99-已退款")

common/src/main/resources/mapper/StrokeMapper.xml

@@ -129,8 +129,7 @@
         <where>
         <where>
             and s.user_id = #{userId}
             and s.user_id = #{userId}
             and s.deleted = 0
             and s.deleted = 0
-            and s.`status` = #{param.status}
-            or s.`status` = 99
+            AND s.`status` IN (#{param.status},99)
         </where>
         </where>
 
 
     </select>
     </select>

config/src/main/resources/config/application.yml

@@ -187,6 +187,7 @@ spring-boot-plus:
       - /sys/login,/sys/logout,/sys/register
       - /sys/login,/sys/logout,/sys/register
       - /merchant/user/login,/merchant/user/register
       - /merchant/user/login,/merchant/user/register
       - /app/sms/registerOrLoginCode,/merchant/sms/registerCode
       - /app/sms/registerOrLoginCode,/merchant/sms/registerCode
+      - /app/versionControl/lastOne/**
       # 排除静态资源
       # 排除静态资源
       - /static/**,/templates/**
       - /static/**,/templates/**
       # 排除Swagger
       # 排除Swagger