From 9d18b8bdacb791b6520ebd452c92694dfc6c8c6c Mon Sep 17 00:00:00 2001 From: hanxueda Date: Wed, 24 Apr 2019 19:50:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[=E6=88=90=E9=95=BF=E5=80=BC][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E6=8E=88=E6=9D=83=E6=89=8B=E6=9C=BA=E6=97=B6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=88=90=E9=95=BF=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxUserGrantController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 2ef8bb29d..23ed57bd3 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/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); From 3ffe411b98f19b663cc572a96145ecc3cdfadf5e Mon Sep 17 00:00:00 2001 From: hanxueda Date: Wed, 24 Apr 2019 20:07:36 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[=E7=A7=AF=E5=88=86][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E6=B6=88=E8=B4=B9=E7=A7=AF=E5=88=86:=E5=8F=96=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E4=BA=BA=E7=9A=84=E5=95=86=E6=88=B7ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCreditHistoryController.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index 4e9484d92..ecd202fca 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/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()); From 15d91f253269e463040a00d155b3642893e6ff0b Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 25 Apr 2019 10:13:09 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[=E4=BA=8C=E7=BB=B4=E7=A0=81=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD][=E4=BF=AE=E6=94=B9]:=E4=B8=8D=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java b/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java index 7897bbcfc..2a4dcf90a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java +++ b/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") From 54f82e13e3fed547ed9c6f22790a915f1e6d89b9 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 25 Apr 2019 10:33:55 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[=E5=95=86=E6=88=B7=E4=BF=A1=E6=81=AF][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][C=E7=AB=AF=E5=B1=95=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxMerchantMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 6195bc564..fd919c181 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -19,7 +19,7 @@ - +