Browse Source

fix bug

release_toaliyun_real
winter 2 years ago
parent
commit
6a8caefeb9
2 changed files with 8 additions and 1 deletions
  1. +6
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java
  2. +2
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java

+ 6
- 1
mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java View File

@@ -4,6 +4,7 @@ import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxUserDataRule;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.enums.EnumUserDataRuleType;
import com.iformall.enums.EnumYesOrNo;
import com.iformall.service.WxUserDataRuleService;
import com.iformall.shiro.UserSession;
import com.iformall.utils.IPUtil;
@@ -93,7 +94,11 @@ public class BaseController {
}
public WxUserDataRule getCurrentDataFloors() {
WxUserDataRule byUserId = wxUserDataRuleService.findByUserId(getUser().getId());
MallUserInfo user = getUser();
if (null != user.getIsAdmin() && user.getIsAdmin().intValue() == EnumYesOrNo.YES.getCode().intValue()) {
return null;
}
WxUserDataRule byUserId = wxUserDataRuleService.findByUserId(user.getId());
//没有配置,默认是全部权限
if (byUserId != null && EnumUserDataRuleType.ALL.getCode().intValue() == byUserId.getType().intValue()) {
return null;


+ 2
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java View File

@@ -107,6 +107,7 @@ public class WxCashBackActivityController extends BaseController {
if (null == wxCashBackActivityRecord) wxCashBackActivityRecord = new WxCashBackActivityRecord();
TenantEntity tenantInfo = getTenantInfo();
wxCashBackActivityRecord.updateTenantInfo(tenantInfo);
wxCashBackActivityRecord.setMerchantId(getMerchantBUserId());
wxCashBackActivityRecord.setSortColumns(SortField.CreateDate_DESC);
final PageInfo<WxCashBackActivityRecord> page = wxCashBackActivityService.listActivityRecordAsPage(wxCashBackActivityRecord, pageNum, pageSize);
return new ResultData(page);
@@ -156,6 +157,7 @@ public class WxCashBackActivityController extends BaseController {
WxCashBackActivityRecord r = new WxCashBackActivityRecord();
r.setActivityId(a.getId());
r.updateTenantInfo(a);
r.setMerchantId(getMerchantBUserId());
int allRecordCount = wxCashBackActivityService.getRecordCount(r);
r.setAuditStatus(EnumCashBackActivityRecordStatus.AUDI_SUCCESS.getCode());


Loading…
Cancel
Save