winter 1 год назад
Родитель
Сommit
e122099b78
2 измененных файлов: 22 добавлений и 10 удалений
  1. +2
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java
  2. +20
    -9
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

+ 2
- 1
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java Просмотреть файл

@@ -183,6 +183,7 @@ public class WxCouponOrderCVo extends WxCouponOrder {
}
public static void main(String[] args) {
System.out.println(calcuteExpiredCouponOrderId("632830267681071104",300,"632830267681071104"));
//System.out.println(calcuteExpiredCouponOrderId("632830267681071104",300,"632830267681071104"));
System.out.println(getDecodeExpiredCouponOrderId("MTAwMDIyNjcxMDkwMDczMTkwNCYyMDkyLTEwLTE4IDE3OjI5OjUwJjEwMDAyMjUwNDg5NTg1MDA4NjQ="));
}
}

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

@@ -1334,7 +1334,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
@Override
public List<Long> getFloorBuildMerchantIds(TenantEntity tenantEntity,String floorRule,Long building,Long floor,String shopTypeForRule,Integer merchantShopDel,Integer shopDel,String shopNumber ) {
if (null != floorRule || null != building || null != floor) {
List<Long> floorMerchantIds = null;
List<Long> merchantIds = new ArrayList<Long>();
WxShop shopQ = new WxShop();
if (null != shopDel) {
shopQ.setIsDel(shopDel);
@@ -1354,23 +1354,34 @@ public class WxMerchantServiceImpl implements WxMerchantService {
}
shopQ.setShopNumber(shopNumber);
List<Long> shopIds = wxShopMapper.findIdList(shopQ);
List<String> shopNumberList = wxShopMapper.findShopNumberList(shopQ);
if (null == shopIds || shopIds.size() <= 0) {
floorMerchantIds = new ArrayList<Long>();
floorMerchantIds.add(-999L);
return floorMerchantIds;
merchantIds.add(-999L);
return merchantIds;
}
WxMerchantShop merchantShopQ = new WxMerchantShop();
if (null != merchantShopDel) {
merchantShopQ.setIsDel(merchantShopDel);
}
merchantShopQ.updateTenantInfo(tenantEntity);
merchantShopQ.setShopIdList(shopIds);
floorMerchantIds = wxMerchantShopMapper.findMerchantIdList(merchantShopQ);
if (null == floorMerchantIds || floorMerchantIds.size() <= 0) {
floorMerchantIds = new ArrayList<Long>();
floorMerchantIds.add(-999L);
return floorMerchantIds;
List<Long> floorMerchantIds = wxMerchantShopMapper.findMerchantIdList(merchantShopQ);
if (null != floorMerchantIds && floorMerchantIds.size() > 0) {
merchantIds.addAll(floorMerchantIds);
}
//还得查虚拟商户
WxMerchant mq = new WxMerchant();
mq.updateTenantInfo(tenantEntity);
mq.setCreateShopNumberList(shopNumberList);
if (null != shopDel) {
mq.setIsDel(shopDel);
}
List<Long> mids = wxMerchantMapper.findIdList(mq);
if (null != mids && mids.size() > 0 ) {
}
return floorMerchantIds;
}
return null;


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