diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrderReservation.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrderReservation.java index 3053ccbe5..579c8a0b3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrderReservation.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrderReservation.java @@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode; import lombok.ToString; import java.util.Date; +import java.util.List; @TableName(value = "wx_coupon_order_reservation") @Data @@ -79,6 +80,9 @@ public class WxCouponOrderReservation extends TenantEntity { @TableField(exist = false) private Date serchEndDate; + @TableField(exist = false) + private List reservationMerchantIdList; + public Long getcUserId() { return cUserId; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderReservationServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderReservationServiceImpl.java index 22be125be..abc1a7706 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderReservationServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderReservationServiceImpl.java @@ -7,11 +7,13 @@ import com.iformall.domain.po.*; import com.iformall.enums.*; import com.iformall.mapper.*; import com.iformall.service.*; +import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; +import java.util.stream.Collectors; @Service public class WxCouponOrderReservationServiceImpl implements WxCouponOrderReservationService { @@ -39,15 +41,22 @@ public class WxCouponOrderReservationServiceImpl implements WxCouponOrderReserva @Autowired WxMerchantMapper wxMerchantMapper; + @Autowired + WxMerchantRelationService wxMerchantRelationService; + @Override public PageInfo listAsPage(WxCouponOrderReservation record, Integer pageIndex, Integer pageSize) { - if(record.getMerchantId() != null){ + if(record.getReservationMerchantId() != null){ //区域商户查询下面所有子商户的信息 WxMerchant merchant = wxMerchantMapper.selectById(record.getMerchantId()); if(EnumMerchantAdmin.REGIONAL.getCode().equals(merchant.getIsAdmin())){ - + //通过区域商户id查询所有子商户 + List collect = wxMerchantRelationService.getRelationByRegionId(merchant.getId()); + if (!CollectionUtils.isEmpty(collect)){ + record.setReservationMerchantIdList(collect); + } + record.setReservationMerchantId(null); } - } return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderReservationMapper.findList(record)); } diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderReservationMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderReservationMapper.xml index 7fac8ba1a..bda69448e 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderReservationMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderReservationMapper.xml @@ -85,6 +85,13 @@ and `reservation_merchant_id` = #{reservationMerchantId} + + and `reservation_merchant_id` in + + #{idItem} + + + and `reservation_merchant_name` like concat('%', #{reservationMerchantName},'%')