'修改配置文件'

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=

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=

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) {

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天
 
     /**
      * 判断用户是否登录,并且不能单个用户同时登录