|
|
|
@@ -421,7 +421,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
|
|
|
|
//merchant |
|
|
|
Map<Long,WxMerchant> merchantSimpleMap = new HashMap<Long,WxMerchant>(); |
|
|
|
if (null != merchantIdList) { |
|
|
|
if (null != merchantIdList && merchantIdList.size() > 0) { |
|
|
|
WxMerchant merchantQ = new WxMerchant(); |
|
|
|
merchantQ.updateTenantInfo(tenantEntity); |
|
|
|
merchantQ.setIds(merchantIdList); |
|
|
|
@@ -806,7 +806,6 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
PageInfo<WxCouponOrderBVo> retPageInfo = new PageInfo(volist); |
|
|
|
pageInfo.setPages(pageInfo.getPages()); |
|
|
|
pageInfo.setTotal(pageInfo.getTotal()); |
|
|
|
PageHelper.clearPage(); |
|
|
|
|
|
|
|
return new ResultData(retPageInfo); |
|
|
|
} |
|
|
|
@@ -2732,7 +2731,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
List<Long> merchantIds = new ArrayList<Long>(); |
|
|
|
merchantIds.add(record.getMerchantId()); |
|
|
|
List<Long> couponIds = wxCouponMerchantMapper.findMerchantProductIds(record.getTenantId(),merchantIds,null); |
|
|
|
if (null == couponIds) { |
|
|
|
if (null == couponIds || couponIds.isEmpty()) { |
|
|
|
retPageInfo.setPageNum(pageIndex); |
|
|
|
retPageInfo.setPageSize(pageSize); |
|
|
|
retPageInfo.setPages(0); |
|
|
|
|