zhijiezhao 3 jaren geleden
bovenliggende
commit
1157c62018

+ 1 - 0
src/main/java/com/caimei365/user/service/impl/RegisterServiceImpl.java

@@ -1244,6 +1244,7 @@ public class RegisterServiceImpl implements RegisterService {
             list.add("15814011616");
             list.add("13100721916");
             list.add("15113936829");
+            list.add("15827317748");
             if ("prod".equals(profile) || list.contains(mobile)) {
                 if (StringUtils.isNotBlank(mobile) && mobile.length() == 11) {
                     String regex = "^(1[3-9]\\d{9}$)";

+ 3 - 1
src/main/resources/mapper/SuperVipMapper.xml

@@ -130,10 +130,12 @@
         cc.`couponType`,
         cc.`shopId`,
         cc.`productType`,
-        cc.`categoryType`
+        cc.`categoryType`,
+        s.name AS shopName
         FROM cm_coupon cc
         INNER JOIN cm_svip_coupon cs ON cs.couponId = cc.id
         left join cm_svip_coupon_month cmn on cmn.id = cs.montId
+        left join shop s on cc.shopId = s.shopID
         WHERE cc.delFlag = 0
         AND cc.status != 2
         AND cs.delFlag = 0