Merge branch 'dev' of http://139.159.177.244:3000/hurui/hai-server into dev

hai-bweb/src/main/java/com/bweb/controller/HighMerchantController.java

@@ -9,6 +9,7 @@ import com.hai.common.exception.SysCode;
 import com.hai.common.security.AESEncodeUtil;
 import com.hai.common.security.SessionObject;
 import com.hai.common.security.UserCenter;
+import com.hai.common.utils.DateUtil;
 import com.hai.common.utils.MD5Util;
 import com.hai.common.utils.MemberValidateUtil;
 import com.hai.common.utils.ResponseMsgUtil;
@@ -69,8 +70,7 @@ public class HighMerchantController {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.MENU_TREE_HAS_NOT_ERROR, "");
             }
 
-            if (StringUtils.isBlank(highMerchant.getMerchantKey())
+            if (StringUtils.isBlank(highMerchant.getMerchantName())
-                || StringUtils.isBlank(highMerchant.getMerchantName())
                 || StringUtils.isBlank(highMerchant.getTelephone())
                 || StringUtils.isBlank(highMerchant.getAddress())
                 || StringUtils.isBlank(highMerchant.getSecUser().getPassword())
@@ -92,6 +92,7 @@ public class HighMerchantController {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.PHONE_NUM_EXISTED, "");
             }
 
+            highMerchant.setMerchantKey("HF" + DateUtil.date2String(new Date(), "MMddHHmmss"));
             highMerchant.setStatus(1); // 状态：0：不可用，1：可用
             highMerchant.setCreateTime(new Date());
             highMerchant.setUpdateTime(new Date());

hai-cweb/src/main/java/com/cweb/config/AuthConfig.java

@@ -91,6 +91,7 @@ public class AuthConfig implements WebMvcConfigurer {
 	      .excludePathPatterns("/**/swagger-ui.html")
 	      .excludePathPatterns("/login/*")
 	      .excludePathPatterns("/coupon/getCouponList")
+	      .excludePathPatterns("/wechatpay/*")
 	      .excludePathPatterns("/coupon/getCouponById")
 	      .excludePathPatterns("/highMerchantStore/getMerchantStoreById")
 	      .excludePathPatterns("/highMerchantStore/getStoreListByCoupon")

hai-schedule/src/main/java/com/hai/schedule/HighCouponSchedule.java

@@ -20,7 +20,7 @@ public class HighCouponSchedule {
     private HighUserCouponService highUserCouponService;
 
     // @Scheduled(cron="0 0/1 * * * ?")  //每1分钟执行一次
-    // @Scheduled(cron = "0 0 0 * * ?")  //每天 凌晨0点执行
+    @Scheduled(cron = "0 0 0 * * ?")  //每天 凌晨0点执行
     public void certification() {
         List<HighUserCoupon> userCoupons = highUserCouponService.getOverdueCoupon();
         for (HighUserCoupon highUserCoupon : userCoupons) {

hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java

@@ -239,7 +239,7 @@ public class HighOrderServiceImpl implements HighOrderService {
                 order.setHighChildOrderList(getChildOrderByOrder(order.getId()));
             }
         }
-        return new ArrayList<>();
+        return list;
     }
 
     @Override