Merge branch '2.0-master' into 2.0-dev

# Conflicts:
#	hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java
#	hai-user/src/main/java/com/web/controller/LoginController.java

hai-service/src/main/java/com/hai/common/utils/ImageUtils.java

@@ -2,7 +2,6 @@ package com.hai.common.utils;
 
 
 import com.hai.common.QRCodeGenerator;
-import com.hai.config.CommonConfig;
 import com.hai.config.CommonSysConst;
 import sun.misc.BASE64Decoder;
 import sun.misc.BASE64Encoder;

hai-service/src/main/java/com/hai/config/HuiLianTongConfig.java

@@ -10,15 +10,9 @@ import com.hai.common.utils.HttpsUtils;
 import com.hai.common.utils.MD5Util;
 import com.hai.common.utils.RedisUtil;
 import com.hai.dao.HighGasOrderPushMapper;
-import com.hai.entity.HighCouponCodeOther;
-import com.hai.entity.HighGasOrderPush;
-import com.hai.entity.HighUserCoupon;
-import com.hai.enum_type.OrderPushType;
 import org.apache.commons.collections4.MapUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
 import sun.misc.BASE64Decoder;
 import sun.misc.BASE64Encoder;

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

@@ -9,6 +9,7 @@ import com.hai.common.security.SessionObject;
 import com.hai.common.security.UserCenter;
 import com.hai.common.utils.BaiduUtils;
 import com.hai.common.utils.DateUtil;
+import com.hai.common.utils.HttpsUtils;
 import com.hai.common.utils.RequestUtils;
 import com.hai.dao.HighGoldRecMapper;
 import com.hai.dao.HighUserLoginLogMapper;
@@ -18,7 +19,6 @@ import com.hai.enum_type.LoginPlatform;
 import com.hai.enum_type.OilCardBindStatusEnum;
 import com.hai.enum_type.UserCardType;
 import com.hai.model.HighUserModel;
-import com.hai.openApi.config.BlxConfig;
 import com.hai.service.*;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -50,8 +50,10 @@ public class HighUserServiceImpl implements HighUserService {
     private HighUserCouponService highUserCouponService;
 
     @Resource
-    private HighUserCardService highUserCardService;
+    private OutRechargeOrderService outRechargeOrderService;
 
+    @Resource
+    private HighUserCardService highUserCardService;
 
     @Resource
     private HighOrderService highOrderService;
@@ -121,6 +123,7 @@ public class HighUserServiceImpl implements HighUserService {
             }
 
             SecRegion region = commonService.getRegionsByName(loginLog.getProvinceName());
+//            distributionUserRelService.insertDistributionRebate(user.getId(),  popularizeUserId, "500000");
             if (region != null) {
                 // 绑定推广关联关系
                 distributionUserRelService.insertDistributionUserRel(user.getId(),  popularizeUserId, region.getRegionId().toString());
@@ -167,8 +170,8 @@ public class HighUserServiceImpl implements HighUserService {
         if (StringUtils.isNotBlank(MapUtils.getString(map , "name"))) {
             criteria.andNameLike("%" + MapUtils.getString(map , "name") + "%");
         }
-        if (MapUtils.getInteger(map , "status") != null) {
-            criteria.andStatusEqualTo(MapUtils.getInteger(map , "status"));
+        if (StringUtils.isNotBlank(map.get("status"))) {
+            criteria.andStatusEqualTo(Integer.valueOf(map.get("status")));
         }
         if (MapUtils.getBoolean(map , "isAgent") != null) {
             criteria.andIsAgentEqualTo(MapUtils.getBoolean(map , "isAgent"));