Просмотр исходного кода

/、.test

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
1b4370a17a
5 измененных файлов: 24 добавлений и 15 удалений
  1. +1
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java
  2. +1
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java
  3. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
  4. +13
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java
  5. +7
    -1
      mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml

+ 1
- 2
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<WxCreditHistoryVo> page = wxCreditHistoryService.listAsPageMore(wxCreditHistory, pageNum, pageSize);
return new ResultData(page);
}


+ 1
- 2
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) {


+ 2
- 2
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)


+ 13
- 8
mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java Просмотреть файл

@@ -134,7 +134,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
}
private Map<Long,WxCUserBasicInfo> getUserMap(BaseTenantEntity tenantEntity,List<Long> cUserIdList) {
private Map<Long,WxCUserBasicInfo> getUserMap(TenantEntity tenantEntity,List<Long> cUserIdList) {
Map<Long,WxCUserBasicInfo> userMap = new HashMap<Long,WxCUserBasicInfo>();
if (cUserIdList.size() > 0) {
WxCUserBasicInfo cUserBasicInfoQ = new WxCUserBasicInfo();
@@ -151,7 +151,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
return userMap;
}
private Map<Long,String> getMerchantNameMap(BaseTenantEntity tenantEntity,List<Long> merchantIdList) {
private Map<Long,String> getMerchantNameMap(TenantEntity tenantEntity,List<Long> merchantIdList) {
Map<Long,String> merchantNameMap = new HashMap<Long,String>();
if (merchantIdList !=null && merchantIdList.size() > 0) {
WxMerchant merchantQ = new WxMerchant();
@@ -168,7 +168,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
return merchantNameMap;
}
private Map<Long,String> getMallUserInfoOperatorMap(BaseTenantEntity tenantEntity,List<Long> mallUserInfoOperatorIdList) {
private Map<Long,String> getMallUserInfoOperatorMap(TenantEntity tenantEntity,List<Long> mallUserInfoOperatorIdList) {
Map<Long,String> mallUserInfoOperatorMap = new HashMap<Long,String>();
if (mallUserInfoOperatorIdList.size() > 0) {
MallUserInfo mallUserInfoQ = new MallUserInfo();
@@ -185,7 +185,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
return mallUserInfoOperatorMap;
}
private Map<Long,String> getMerchantBUserOperatorMap(BaseTenantEntity tenantEntity,List<Long> merchantBUserOperatorIdList) {
private Map<Long,String> getMerchantBUserOperatorMap(TenantEntity tenantEntity,List<Long> merchantBUserOperatorIdList) {
Map<Long,String> merchantBUserOperatorMap = new HashMap<Long,String>();
if (merchantBUserOperatorIdList.size() > 0) {
WxMerchantBUser merchantBUserQ = new WxMerchantBUser();
@@ -202,7 +202,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
return merchantBUserOperatorMap;
}
private List<WxCreditHistoryVo> creditHistoryToVoList(BaseTenantEntity tenantEntity,List<WxCreditHistory> credithistoryList) {
private List<WxCreditHistoryVo> creditHistoryToVoList(TenantEntity tenantEntity,List<WxCreditHistory> credithistoryList) {
if (null != credithistoryList) {
List<Long> merchantIdList = new ArrayList<Long>();
@@ -295,10 +295,14 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
@Override
public PageInfo<WxCreditHistoryVo> 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<Long> 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<WxCreditHistory> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCreditHistoryMapper.findListMore(wxCreditHistory));
PageInfo<WxCreditHistoryVo> retPageInfo = new PageInfo<WxCreditHistoryVo>();
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;
}


+ 7
- 1
mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml Просмотреть файл

@@ -118,7 +118,13 @@
<select id="findSimpleList" parameterType="com.iformall.domain.po.WxMerchantBUser" resultMap="BaseResultMap">
select id,name,phone,merchant_id
from wx_merchant_b_user
where `tenant_id` = #{tenantId}
where 1 = 1
<if test=" null != tenantId and '' != tenantId">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">


Загрузка…
Отмена
Сохранить