修改代码

ad-platform-common/ad-platform-common-auth/src/main/java/com/baiye/util/MobileUtil.java

@@ -12,20 +12,20 @@ import java.util.regex.Pattern;
 public class MobileUtil {
 
     /**
-     * 中国电信号码格式验证 手机段： 133,149,153,173,177,180,181,189,199,1349,1410,1700,1701,1702
+     * 中国电信号码格式验证 手机段： 133,149,153,173,177,180,181,189,199,191,193,197,1349,1410,1700,1701,1702
      **/
-    private static final String CHINA_TELECOM_PATTERN = "(?:^(?:\\+86)?1(?:33|49|53|7[37]|8[019]|99)\\d{8}$)|(?:^(?:\\+86)?1349\\d{7}$)|(?:^(?:\\+86)?1410\\d{7}$)|(?:^(?:\\+86)?170[0-2]\\d{7}$)";
+    private static final String CHINA_TELECOM_PATTERN = "(?:^(?:\\+86)?1(?:33|49|53|7[37]|8[019]|9[1379])\\d{8}$)|(?:^(?:\\+86)?1349\\d{7}$)|(?:^(?:\\+86)?1410\\d{7}$)|(?:^(?:\\+86)?170[0-2]\\d{7}$)";
 
     /**
-     * 中国联通号码格式验证 手机段：130,131,132,145,146,155,156,166,171,175,176,185,186,1704,1707,1708,1709
+     * 中国联通号码格式验证 手机段：130,131,132,145,146,155,156,166,171,175,176,185,186,196,1704,1707,1708,1709
      **/
-    private static final String CHINA_UNICOM_PATTERN = "(?:^(?:\\+86)?1(?:3[0-2]|4[56]|5[56]|66|7[156]|8[56])\\d{8}$)|(?:^(?:\\+86)?170[47-9]\\d{7}$)";
+    private static final String CHINA_UNICOM_PATTERN = "(?:^(?:\\+86)?1(?:3[0-2]|4[56]|5[56]|66|7[156]|8[56]|96)\\d{8}$)|(?:^(?:\\+86)?170[47-9]\\d{7}$)";
 
     /**
      * 中国移动号码格式验证
-     * 手机段：134,135,136,137,138,139,147,148,150,151,152,157,158,159,178,182,183,184,187,188,198,1440,1703,1705,1706
+     * 手机段：134,135,136,137,138,139,147,148,150,151,152,157,158,159,178,182,183,184,187,188,198,195,172,148,1440,1703,1705,1706
      **/
-    private static final String CHINA_MOBILE_PATTERN = "(?:^(?:\\+86)?1(?:3[4-9]|4[78]|5[0-27-9]|78|8[2-478]|98)\\d{8}$)|(?:^(?:\\+86)?1440\\d{7}$)|(?:^(?:\\+86)?170[356]\\d{7}$)";
+    private static final String CHINA_MOBILE_PATTERN = "(?:^(?:\\+86)?1(?:3[4-9]|4[78]|5[0-27-9]|78|8[2-478]|98|95|72|48)\\d{8}$)|(?:^(?:\\+86)?1440\\d{7}$)|(?:^(?:\\+86)?170[356]\\d{7}$)";
 
     /**
      * 中国大陆手机号码校验
@@ -36,9 +36,7 @@ public class MobileUtil {
      */
     public static boolean checkPhone(String phone) {
         if (StringUtils.isNotBlank(phone)) {
-            if (checkChinaMobile(phone) || checkChinaUnicom(phone) || checkChinaTelecom(phone)) {
-                return true;
-            }
+            return checkChinaMobile(phone) || checkChinaUnicom(phone) || checkChinaTelecom(phone);
         }
         return false;
     }

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/CallDeductServiceImpl.java

@@ -73,7 +73,7 @@ public class CallDeductServiceImpl implements CallDeductService {
                     String year = String.valueOf(vo.getYear());
                     CallDeductResponseVO deductResponseVO = new CallDeductResponseVO();
                     String format = year.concat(StrPool.DASHED.concat(String.valueOf(vo.getMonth())));
-                    DateTime parse = DateUtil.parse(format, "yyyy-MM");
+                    DateTime parse = DateUtil.parse(format, DatePattern.NORM_MONTH_PATTERN);
                     DateTime dateTime =
                             DateUtil.beginOfMonth(DateUtil.offsetMonth(parse,
                                     DefaultNumberConstants.ONE_NUMBER));
@@ -90,7 +90,7 @@ public class CallDeductServiceImpl implements CallDeductService {
     public Map<String, Object> queryMonthList(CallDeductMonthQueryCriteria criteria, Pageable pageable, Long companyId) {
         Map<String, Object> map = Maps.newHashMap();
         String queryTime = criteria.getQueryTime();
-        DateTime parse = DateUtil.parse(queryTime, "yyyy-MM");
+        DateTime parse = DateUtil.parse(queryTime, DatePattern.NORM_MONTH_PATTERN);
         DateTime endDate = DateUtil.offsetMonth(parse, DefaultNumberConstants.ONE_NUMBER);
         List<CallDeduct> deductList =
                 callDeductRepository.queryByCompanyIdAndTime

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/DeptServiceImpl.java

@@ -31,6 +31,7 @@
  import com.baiye.modules.system.service.dto.DeptQueryCriteria;
  import com.baiye.modules.system.service.mapstruct.DeptMapper;
  import com.baiye.util.*;
+ import com.google.common.collect.Lists;
  import lombok.RequiredArgsConstructor;
 
  import lombok.extern.slf4j.Slf4j;
@@ -71,10 +72,7 @@
                  criteria.setPidIsNull(true);
              }
              List<Field> fields = QueryHelp.getAllFields(criteria.getClass(), new ArrayList<>());
-             List<String> fieldNames = new ArrayList<String>() {{
-                 add("pidIsNull");
-                 add("enabled");
-             }};
+             List<String> fieldNames = Lists.newArrayList("pidIsNull", "pidIsNull");
              for (Field field : fields) {
                  //设置对象的访问权限，保证对private的属性的访问
                  field.setAccessible(true);

manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java

@@ -76,9 +76,10 @@ public class DeliveryBalanceTask {
                 if (ObjectUtil.isNotNull(companyByUserId) &&
                         // 判断价格
                         ObjectUtil.isNotNull(companyByUserId.getDmpDeliveryFee())) {
+                    boolean limitFlag = ObjectUtil.isNotNull(companyByUserId.getDmpLimitNum())  &&
+                            companyByUserId.getDmpLimitNum() == DefaultNumberConstants.ONE_HUNDRED;
                     // 判断余额
-                    if (companyByUserId.getUserBalance() <= DefaultNumberConstants.ZERO_NUMBER
-                            || companyByUserId.getDmpLimitNum().equals(DefaultNumberConstants.ZERO_NUMBER)) {
+                    if (companyByUserId.getUserBalance() <= DefaultNumberConstants.ZERO_NUMBER || limitFlag) {
                         continue;
                     }
                     // 截取数据