From 7816a5782a8fc540d898b59b7aee622645462b3a Mon Sep 17 00:00:00 2001 From: hanxueda Date: Wed, 24 Apr 2019 16:55:01 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=AF=E5=88=86][=E4=BF=AE=E6=94=B9]:B?= =?UTF-8?q?=E7=AB=AF=E5=A2=9E=E5=8A=A0=E7=A7=AF=E5=88=86=E5=95=86=E7=AE=A1?= =?UTF-8?q?=E4=B8=8E=E6=99=AE=E9=80=9A=E5=95=86=E6=88=B7=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCreditHistoryController.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index 051df941e..4e9484d92 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -10,6 +10,8 @@ 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.exception.MallinkException; @@ -78,7 +80,16 @@ public class WxCreditHistoryController extends BaseController { log.debug("[" + getIpAddr() + "] WxCreditHistoryController::add"); wxCreditHistory.setTenantId(getTenantId()); wxCreditHistory.setOperatorId(getUser().getId()); - wxCreditHistory.setMerchantId(getUser().getMerchantId()); + WxMerchant wxMerchant = new WxMerchant(); + 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 { + wxCreditHistory.setMerchantId(getUser().getMerchantId()); + } //B端操作用户 wxCreditHistory.setOperatorType(EnumUserType.BUSER.getCode()); try {