Merge branch 'dev' of GameCenter/game-center into master

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/ManageApplication.java

@@ -23,7 +23,7 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功 < (修复判断异常, 礼包码没有收回的问题 ･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 < (解决支付区间判定问题, 解决手机号不可多绑定的问题 ･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameGiftPackCodeLogServiceImpl.java

@@ -318,9 +318,9 @@ public class GameGiftPackCodeLogServiceImpl extends ServiceImpl<GameGiftPackCode
                 .eq(Order::getGameId, gameGiftPackLinkLog.getGameId())
                 .eq(Order::getRoleId, gameGiftPackLinkLog.getRoleId())
                 .eq(Order::getStatus, OrderStatusEnum.SUCCESS_PAY.getValue()));
-        //充值订单为空, 返回不通过
+        //充值订单为空, 判断付费区间最小值是否包含 0, 如果包含0, 则通过, 否则不通过
         if (CollectionUtils.isEmpty(userOrderList)) {
-            return false;
+            return Objects.equals(payBean.getMin(), 0L);
         }
         //玩家充值总金额
         BigDecimal userPaySum = userOrderList.stream().map(Order::getRealAmount)

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameGiftPackLinkLogServiceImpl.java

@@ -110,17 +110,23 @@ public class GameGiftPackLinkLogServiceImpl extends ServiceImpl<GameGiftPackLink
 
     @Override
     public boolean randomCodeSend(Long linkLogId, String phoneNumber) {
-        //前端输入手机号
-        if (!phoneNumber.contains("****")) {
-            return smsService.randomCodeSend(phoneNumber);
-        }
-        //非前端输入手机号
+        //参数校验
         GameGiftPackLinkLog gameGiftPackLinkLog = super.getById(linkLogId);
         Assert.notNull(gameGiftPackLinkLog, "参数错误, 链接访问日志信息不存在");
-        //正确手机号
-        String userPhone = gameGiftPackLinkLog.getUserPhone();
-        Assert.state(Strings.isNotBlank(userPhone), "参数错误, 手机号信息缺失");
-        return smsService.randomCodeSend(userPhone);
+        //非前端输入手机号
+        if (phoneNumber.contains("****")) {
+            //修正手机号, 且发送验证码
+            String userPhone = gameGiftPackLinkLog.getUserPhone();
+            Assert.state(Strings.isNotBlank(userPhone), "参数错误, 手机号信息缺失");
+            return smsService.randomCodeSend(userPhone);
+        }
+        //判断输入的手机号是否被其他角色绑定
+        Assert.state(roleOperateService.count(new LambdaQueryWrapper<RoleOperate>()
+                .eq(RoleOperate::getGameId, gameGiftPackLinkLog.getGameId())
+                .eq(RoleOperate::getUserPhone, phoneNumber)
+        ) <= 0, "该手机号已被其它角色绑定, 请联系客服小姐姐处理");
+        //发送验证码
+        return smsService.randomCodeSend(phoneNumber);
     }
 
     @Override