From b957b6594e6205a53f259951141832ec70033041 Mon Sep 17 00:00:00 2001 From: 199901012 Date: Mon, 12 Apr 2021 23:43:06 +0800 Subject: [PATCH] =?UTF-8?q?'=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hai-bweb/src/main/resources/dev/config.properties | 2 +- hai-bweb/src/main/resources/prod/config.properties | 2 +- .../src/main/java/com/cweb/controller/pay/OrderController.java | 2 +- .../src/main/java/com/hai/common/security/UserCenter.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hai-bweb/src/main/resources/dev/config.properties b/hai-bweb/src/main/resources/dev/config.properties index 6e43f1df..9874dd8e 100644 --- a/hai-bweb/src/main/resources/dev/config.properties +++ b/hai-bweb/src/main/resources/dev/config.properties @@ -1,4 +1,4 @@ fileUrl=/home/project/hsg/filesystem cmsPath=/home/project/hsg/filesystem/cmsPath agentQrCode=/home/project/hsg/filesystem/agentQrCode -agentQrCodeWxUrl=https://hsgcs.dctpay.com/wx/test?id= +agentQrCodeWxUrl=https://hsgcs.dctpay.com/wx/?action=gogogo&id= diff --git a/hai-bweb/src/main/resources/prod/config.properties b/hai-bweb/src/main/resources/prod/config.properties index 6e43f1df..69132629 100644 --- a/hai-bweb/src/main/resources/prod/config.properties +++ b/hai-bweb/src/main/resources/prod/config.properties @@ -1,4 +1,4 @@ fileUrl=/home/project/hsg/filesystem cmsPath=/home/project/hsg/filesystem/cmsPath agentQrCode=/home/project/hsg/filesystem/agentQrCode -agentQrCodeWxUrl=https://hsgcs.dctpay.com/wx/test?id= +agentQrCodeWxUrl=https://hsg.dctpay.com/wx/?action=gogogo&id= diff --git a/hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java b/hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java index a8985ab6..0243f904 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java @@ -109,7 +109,7 @@ public class OrderController { // 商品类型 1:卡卷 2:金币充值 for (HighChildOrder childOrder : order.getHighChildOrderList()) { - if (childOrder.getGoodsType() == 1) { + if (childOrder.getGiveawayType() == false && childOrder.getGoodsType() == 1) { HighCoupon coupon = highCouponService.getCouponById(childOrder.getGoodsId()); // 支付类型：1.微信支付 2.金币支付 if (coupon.getPayType() != 1) { diff --git a/hai-service/src/main/java/com/hai/common/security/UserCenter.java b/hai-service/src/main/java/com/hai/common/security/UserCenter.java index 43c9d1e9..0916cc3c 100644 --- a/hai-service/src/main/java/com/hai/common/security/UserCenter.java +++ b/hai-service/src/main/java/com/hai/common/security/UserCenter.java @@ -19,7 +19,7 @@ public class UserCenter { private static Logger log = LoggerFactory.getLogger(UserCenter.class); private static final String COOKIE_FIELD = "_ida"; - private static final int EXPIRE = 43200;//过期时间为12小时 + private static final int EXPIRE = 86400 * 7;//过期时间为24小时 * 7天 /** * 判断用户是否登录,并且不能单个用户同时登录