合并

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);

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

@@ -122,10 +122,10 @@ public class WxCreditHistoryController extends BaseController  {
         //B端操作用户
         wxCreditHistory.setOperatorType(EnumUserType.BUSER.getCode());
         try {
+
             wxCreditHistoryService.creditUsercheck(wxCreditHistory.getCUserId(),tenantInfo);
-            WxBuser buser = getWxBuser();
-            if (null != buser) {
-            	wxCreditHistory.setBuserId(buser.getId());
+            if (null != getLoginBUser().getBuserId()) {
+            	wxCreditHistory.setBuserId(getLoginBUser().getBuserId());
             }
             WxCreditHistory credit = wxCreditHistoryService.saveOrUpdate(wxCreditHistory);
             //更新标签