Przeglądaj źródła

/、.test

release_toaliyun_real
xhxu 4 lat temu
rodzic
commit
ddf0c02ad0
2 zmienionych plików z 3 dodań i 4 usunięć
  1. +2
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java

+ 2
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Wyświetl plik

@@ -421,7 +421,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
//merchant //merchant
Map<Long,WxMerchant> merchantSimpleMap = new HashMap<Long,WxMerchant>(); Map<Long,WxMerchant> merchantSimpleMap = new HashMap<Long,WxMerchant>();
if (null != merchantIdList) {
if (null != merchantIdList && merchantIdList.size() > 0) {
WxMerchant merchantQ = new WxMerchant(); WxMerchant merchantQ = new WxMerchant();
merchantQ.updateTenantInfo(tenantEntity); merchantQ.updateTenantInfo(tenantEntity);
merchantQ.setIds(merchantIdList); merchantQ.setIds(merchantIdList);
@@ -806,7 +806,6 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
PageInfo<WxCouponOrderBVo> retPageInfo = new PageInfo(volist); PageInfo<WxCouponOrderBVo> retPageInfo = new PageInfo(volist);
pageInfo.setPages(pageInfo.getPages()); pageInfo.setPages(pageInfo.getPages());
pageInfo.setTotal(pageInfo.getTotal()); pageInfo.setTotal(pageInfo.getTotal());
PageHelper.clearPage();


return new ResultData(retPageInfo); return new ResultData(retPageInfo);
} }
@@ -2732,7 +2731,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
List<Long> merchantIds = new ArrayList<Long>(); List<Long> merchantIds = new ArrayList<Long>();
merchantIds.add(record.getMerchantId()); merchantIds.add(record.getMerchantId());
List<Long> couponIds = wxCouponMerchantMapper.findMerchantProductIds(record.getTenantId(),merchantIds,null); List<Long> couponIds = wxCouponMerchantMapper.findMerchantProductIds(record.getTenantId(),merchantIds,null);
if (null == couponIds) {
if (null == couponIds || couponIds.isEmpty()) {
retPageInfo.setPageNum(pageIndex); retPageInfo.setPageNum(pageIndex);
retPageInfo.setPageSize(pageSize); retPageInfo.setPageSize(pageSize);
retPageInfo.setPages(0); retPageInfo.setPages(0);


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java Wyświetl plik

@@ -153,7 +153,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
private Map<Long,String> getMerchantNameMap(BaseTenantEntity tenantEntity,List<Long> merchantIdList) { private Map<Long,String> getMerchantNameMap(BaseTenantEntity tenantEntity,List<Long> merchantIdList) {
Map<Long,String> merchantNameMap = new HashMap<Long,String>(); Map<Long,String> merchantNameMap = new HashMap<Long,String>();
if (merchantIdList.size() > 0) {
if (merchantIdList !=null && merchantIdList.size() > 0) {
WxMerchant merchantQ = new WxMerchant(); WxMerchant merchantQ = new WxMerchant();
merchantQ.updateTenantInfo(tenantEntity); merchantQ.updateTenantInfo(tenantEntity);
merchantQ.setIds(merchantIdList); merchantQ.setIds(merchantIdList);


Ładowanie…
Anuluj
Zapisz