From 458bf3b8161e57603ac1679a5c07a1f09f49453c Mon Sep 17 00:00:00 2001 From: 199901012 Date: Wed, 31 Mar 2021 00:29:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?'=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bweb/controller/HighMerchantController.java | 5 +++-- .../src/main/java/com/hai/schedule/HighCouponSchedule.java | 2 +- .../main/java/com/hai/service/impl/HighOrderServiceImpl.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighMerchantController.java b/hai-bweb/src/main/java/com/bweb/controller/HighMerchantController.java index a389163c..d801ac82 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/HighMerchantController.java +++ b/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()) - || StringUtils.isBlank(highMerchant.getMerchantName()) + if (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()); diff --git a/hai-schedule/src/main/java/com/hai/schedule/HighCouponSchedule.java b/hai-schedule/src/main/java/com/hai/schedule/HighCouponSchedule.java index e4c5e52b..387ee4f1 100644 --- a/hai-schedule/src/main/java/com/hai/schedule/HighCouponSchedule.java +++ b/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 userCoupons = highUserCouponService.getOverdueCoupon(); for (HighUserCoupon highUserCoupon : userCoupons) { diff --git a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java index 33dd2708..94271aa8 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java +++ b/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 From 6b29a6413dde61e70ea720e73129c1846c290727 Mon Sep 17 00:00:00 2001 From: 199901012 Date: Wed, 31 Mar 2021 01:00:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?'=E6=8F=90=E4=BA=A4diam'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hai-cweb/src/main/java/com/cweb/config/AuthConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/hai-cweb/src/main/java/com/cweb/config/AuthConfig.java b/hai-cweb/src/main/java/com/cweb/config/AuthConfig.java index 2c1fa708..d047b015 100644 --- a/hai-cweb/src/main/java/com/cweb/config/AuthConfig.java +++ b/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")