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

虎哥接口完善

release_toaliyun_real
lrh 2 лет назад
Родитель
Сommit
f5914f1a9a
3 измененных файлов: 23 добавлений и 3 удалений
  1. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrderReservation.java
  2. +12
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderReservationServiceImpl.java
  3. +7
    -0
      mallinkService/src/main/resources/mapper/WxCouponOrderReservationMapper.xml

+ 4
- 0
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<Long> reservationMerchantIdList;


public Long getcUserId() {
return cUserId;


+ 12
- 3
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<WxCouponOrderReservation> 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<Long> collect = wxMerchantRelationService.getRelationByRegionId(merchant.getId());
if (!CollectionUtils.isEmpty(collect)){
record.setReservationMerchantIdList(collect);
}
record.setReservationMerchantId(null);
}

}
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderReservationMapper.findList(record));
}


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

@@ -85,6 +85,13 @@
and `reservation_merchant_id` = #{reservationMerchantId}
</if>

<if test=" null != reservationMerchantIdList and reservationMerchantIdList.size > 0 ">
and `reservation_merchant_id` in
<foreach collection="reservationMerchantIdList" index="index" item="idItem" open="(" separator="," close=")">
#{idItem}
</foreach>
</if>

<if test=" null != reservationMerchantName and '' != reservationMerchantName">
and `reservation_merchant_name` like concat('%', #{reservationMerchantName},'%')
</if>


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