Browse Source

合并

release_toaliyun_real
xhxu 5 years ago
parent
commit
ae547d04b3
2 changed files with 6 additions and 4 deletions
  1. +3
    -1
      mallinkBApi/src/main/java/com/iformall/controller/BaseController.java
  2. +3
    -3
      mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java

+ 3
- 1
mallinkBApi/src/main/java/com/iformall/controller/BaseController.java View File

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


+ 3
- 3
mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java View File

@@ -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);
//更新标签


Loading…
Cancel
Save