diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java index 1ec84780c..8907b2e96 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java @@ -54,8 +54,7 @@ public class WxCreditHistoryController extends BaseController { logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::list"); if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory(); TenantEntity tenantInfo = getTenantInfo(); - wxCreditHistory.setTenantId(tenantInfo.getFinalTenantId()); - wxCreditHistory.setFinalTenantId(tenantInfo.getFinalTenantId()); + wxCreditHistory.updateTenantInfo(tenantInfo); final PageInfo page = wxCreditHistoryService.listAsPageMore(wxCreditHistory, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index f11d8adff..112b7f4e2 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -152,8 +152,7 @@ public class WxCreditHistoryController extends BaseController { public ResultData list(@ModelAttribute WxCreditHistory wxCreditHistory, Integer pageNum, Integer pageSize) { log.debug("[" + getIpAddr() + "] WxCreditHistoryController::list"); if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory(); - wxCreditHistory.setTenantId(getTenantInfo().getFinalTenantId()); - wxCreditHistory.setFinalTenantId(getTenantInfo().getFinalTenantId()); + wxCreditHistory.updateTenantInfo(getTenantInfo()); WxMerchantBUser bUser = getLoginBUser(); WxMerchant merchant = wxMerchantService.getById(wxCreditHistory.getMerchantId()); if (merchant != null && merchant.getIsAdmin() != null && merchant.getIsAdmin() == 1) { diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java index fc009eaff..6cd24b570 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java @@ -204,9 +204,9 @@ public class WxCouponOrderBVo extends WxCouponOrder { private String verifyMerchantName; @TableField(exist = false) - private Integer floor; + private Long floor; @TableField(exist = false) - private Integer building; + private Long building; // @Excel(name = "楼层楼座", width = 50, orderNum = "12") @TableField(exist = false) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index 56f3d6045..8caf975a2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -134,7 +134,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { } - private Map getUserMap(BaseTenantEntity tenantEntity,List cUserIdList) { + private Map getUserMap(TenantEntity tenantEntity,List cUserIdList) { Map userMap = new HashMap(); if (cUserIdList.size() > 0) { WxCUserBasicInfo cUserBasicInfoQ = new WxCUserBasicInfo(); @@ -151,7 +151,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { return userMap; } - private Map getMerchantNameMap(BaseTenantEntity tenantEntity,List merchantIdList) { + private Map getMerchantNameMap(TenantEntity tenantEntity,List merchantIdList) { Map merchantNameMap = new HashMap(); if (merchantIdList !=null && merchantIdList.size() > 0) { WxMerchant merchantQ = new WxMerchant(); @@ -168,7 +168,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { return merchantNameMap; } - private Map getMallUserInfoOperatorMap(BaseTenantEntity tenantEntity,List mallUserInfoOperatorIdList) { + private Map getMallUserInfoOperatorMap(TenantEntity tenantEntity,List mallUserInfoOperatorIdList) { Map mallUserInfoOperatorMap = new HashMap(); if (mallUserInfoOperatorIdList.size() > 0) { MallUserInfo mallUserInfoQ = new MallUserInfo(); @@ -185,7 +185,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { return mallUserInfoOperatorMap; } - private Map getMerchantBUserOperatorMap(BaseTenantEntity tenantEntity,List merchantBUserOperatorIdList) { + private Map getMerchantBUserOperatorMap(TenantEntity tenantEntity,List merchantBUserOperatorIdList) { Map merchantBUserOperatorMap = new HashMap(); if (merchantBUserOperatorIdList.size() > 0) { WxMerchantBUser merchantBUserQ = new WxMerchantBUser(); @@ -202,7 +202,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { return merchantBUserOperatorMap; } - private List creditHistoryToVoList(BaseTenantEntity tenantEntity,List credithistoryList) { + private List creditHistoryToVoList(TenantEntity tenantEntity,List credithistoryList) { if (null != credithistoryList) { List merchantIdList = new ArrayList(); @@ -295,10 +295,14 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { @Override public PageInfo findListMorePage(WxCreditHistory wxCreditHistory,Integer pageIndex, Integer pageSize) { + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(wxCreditHistory.getTenantId()); + tenantEntity.setParentTenantId(wxCreditHistory.getParentTenantId()); + String merchantName = StringUtils.trimToNull(wxCreditHistory.getMerchantName()); if(!StringUtils.isBlank(merchantName)) { WxMerchant merchantQ = new WxMerchant(); - merchantQ.updateTenantInfo(wxCreditHistory); + merchantQ.updateTenantInfo(tenantEntity); merchantQ.setName(merchantName); List merchantIds = wxMerchantMapper.findIdList(merchantQ); if (null != merchantIds && merchantIds.size() > 0 ) { @@ -319,14 +323,15 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { wxCreditHistory.setCUserIds(cUserIds); } } - + + wxCreditHistory.setTenantId(wxCreditHistory.getFinalTenantId()); PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCreditHistoryMapper.findListMore(wxCreditHistory)); PageInfo retPageInfo = new PageInfo(); retPageInfo.setPageNum(pageInfo.getPageNum()); retPageInfo.setPageSize(pageInfo.getPageSize()); retPageInfo.setPages(pageInfo.getPages()); retPageInfo.setTotal(pageInfo.getTotal()); - retPageInfo.setList(creditHistoryToVoList(wxCreditHistory,pageInfo.getList())); + retPageInfo.setList(creditHistoryToVoList(tenantEntity,pageInfo.getList())); return retPageInfo; } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml index 842c3f139..69fb3ddf3 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml @@ -118,7 +118,13 @@