From 3ffe411b98f19b663cc572a96145ecc3cdfadf5e Mon Sep 17 00:00:00 2001 From: hanxueda Date: Wed, 24 Apr 2019 20:07:36 +0800 Subject: [PATCH] =?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());