Merge tag 'refs/tags/jenkins-back-end-1418' into release

develop

mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java

@@ -8,6 +8,7 @@ public class UrlCheck {
     public static boolean checkUrl(String url) {
         return url.contains("awsFileUpload")
                 || url.contains("awsFilesUpload")
+                || url.contains("downQrCode")
                 || url.contains("cimgUpload")
                 || url.contains("ueditor/exec")
                 || url.contains("/wxCUserBasicInfo/importTemplate")

mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java

@@ -10,10 +10,7 @@ import com.iformall.domain.po.WxMerchant;
 import com.iformall.domain.po.WxMerchantBUser;
 import com.iformall.domain.vo.WxCreditHistoryVo;
 import com.iformall.domain.vo.WxMerchantVo;
-import com.iformall.enums.EnumMerchantStatus;
-import com.iformall.enums.EnumMerchantType;
-import com.iformall.enums.EnumUserType;
-import com.iformall.enums.EnumYesOrNo;
+import com.iformall.enums.*;
 import com.iformall.exception.MallinkException;
 import com.iformall.service.WxCUserBasicInfoService;
 import com.iformall.service.WxCreditHistoryService;
@@ -84,11 +81,17 @@ public class WxCreditHistoryController extends BaseController  {
         wxMerchant.setId(getUser().getMerchantId());
         wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode());
         WxMerchant merchant = wxMerchantService.findOne(wxMerchant);
-        //如果为商管商户 则消费商户按前端传入的进行记录
-        if (merchant != null && merchant.getIsAdmin() != null && merchant.getIsAdmin() == 1) {
-            wxCreditHistory.setMerchantId(wxCreditHistory.getMerchantId());
-        }else {
+        //消费积分:取当前人的商户ID
+        if (wxCreditHistory.getCreditType() == EnumScoreType.REDUCE_CREDIT.getCode()) {
             wxCreditHistory.setMerchantId(getUser().getMerchantId());
+        } else {
+            //新增积分:
+            //如果为商管商户 则消费商户按前端传入的进行记录
+            if (merchant != null && merchant.getIsAdmin() != null && merchant.getIsAdmin() == 1) {
+                wxCreditHistory.setMerchantId(wxCreditHistory.getMerchantId());
+            } else {
+                wxCreditHistory.setMerchantId(getUser().getMerchantId());
+            }
         }
         //B端操作用户
         wxCreditHistory.setOperatorType(EnumUserType.BUSER.getCode());

mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java

@@ -430,7 +430,7 @@ public class WxUserGrantController extends BaseController {
                 wxCUserService.saveOrUpdate(user);
 
                 // 成长值
-                wxScoreRulesService.addScore(EnumScoreType.WECHAT_PHONE, user);
+                user.setScore(wxScoreRulesService.addScore(EnumScoreType.WECHAT_PHONE, user));
                 //增加积分
                 addCredit(user, EnumScoreType.WECHAT_PHONE);
 

mallinkService/src/main/resources/mapper/WxMerchantMapper.xml

@@ -19,7 +19,7 @@
         <result column="brand" jdbcType="VARCHAR" property="brand"/>
         <result column="type" jdbcType="SMALLINT" property="type"/>
 	    <result column="is_public" jdbcType="SMALLINT" property="isPublic"/>
-        <result column="email" property="email"/>
+        <result column="email" jdbcType="VARCHAR" property="email"/>
         <result column="title" jdbcType="VARCHAR" property="title"/>
         <result column="cover_picture" jdbcType="VARCHAR" property="coverPicture"/>
         <result column="is_admin" jdbcType="INTEGER" property="isAdmin"/>