From 6c789c1addad6b0cc7b4ea9a35c4e89cfe335350 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Tue, 27 Oct 2020 15:51:00 +0800 Subject: [PATCH 1/2] fix bug --- .../com/iformall/controller/WxCreditHistoryController.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index 38472c7a5..f47bf8bed 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -121,9 +121,8 @@ public class WxCreditHistoryController extends BaseController { wxCreditHistory.setOperatorType(EnumUserType.BUSER.getCode()); try { wxCreditHistoryService.creditUsercheck(wxCreditHistory.getCUserId(),wxCreditHistory); - WxBuser buser = getWxBuser(); - if (null != buser) { - wxCreditHistory.setBuserId(buser.getId()); + if (null != getLoginBUser().getBuserId()) { + wxCreditHistory.setBuserId(getLoginBUser().getBuserId()); } WxCreditHistory credit = wxCreditHistoryService.saveOrUpdate(wxCreditHistory); //更新标签 From bf93f3e3d488b89635d7305d2b61eb8b23dc54bc Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Tue, 27 Oct 2020 15:56:44 +0800 Subject: [PATCH 2/2] fix bug --- .../src/main/java/com/iformall/controller/BaseController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java index f578d0f80..0e8b25816 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java @@ -94,7 +94,9 @@ public class BaseController { if (null != wxBuserId) { WxBuser buser = getWxBuser(); Long userId = buser.getUserId(); - return getWxMerchantBUser(userId); + WxMerchantBUser user = getWxMerchantBUser(userId); + user.setBuserId(buser.getId()); + return user; }else { Long userId = getMerchantBUserId(); return getWxMerchantBUser(userId);