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

[A端][修复]:修复券列表全部不能显示作废的问题

release_toaliyun_real
hupeng 7 лет назад
Родитель
Сommit
18a5841c23
5 измененных файлов: 4 добавлений и 162 удалений
  1. +4
    -5
      mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java
  2. +0
    -1
      mallinkService/src/main/java/com/simple/mapper/WxCouponMapper.java
  3. +0
    -9
      mallinkService/src/main/java/com/simple/service/WxCouponService.java
  4. +0
    -5
      mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java
  5. +0
    -142
      mallinkService/src/main/resources/mapper/WxCouponMapper.xml

+ 4
- 5
mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java Просмотреть файл

@@ -57,11 +57,10 @@ public class WxCouponController extends BaseController
if (null == wxCoupon) wxCoupon = new WxCoupon();
wxCoupon.setTenantId(getTenantId());
PageInfo<WxCoupon> page = null;
if (wxCoupon.getStatus() != null && wxCoupon.getStatus() == -1) {
page = wxCouponService.findEnableList(wxCoupon, pageNum, pageSize);
}else {
page = wxCouponService.listAsPage(wxCoupon, pageNum, pageSize);
}
if (wxCoupon.getStatus() != null && wxCoupon.getStatus() == -1)
wxCoupon.setStatus(null);
page = wxCouponService.listAsPage(wxCoupon, pageNum, pageSize);

List<WxCoupon> wxCouponList = page.getList();

if(wxCouponList.isEmpty()){


+ 0
- 1
mallinkService/src/main/java/com/simple/mapper/WxCouponMapper.java Просмотреть файл

@@ -11,7 +11,6 @@ public interface WxCouponMapper extends CommonMapper<WxCoupon, Long> {

List<WxCoupon> findList(WxCoupon wxCoupon);

List<WxCoupon> findEnableList(WxCoupon wxCoupon);

List<WxCoupon> findCanSendList(WxCoupon wxCoupon);



+ 0
- 9
mallinkService/src/main/java/com/simple/service/WxCouponService.java Просмотреть файл

@@ -19,15 +19,6 @@ public interface WxCouponService {
*/
PageInfo<WxCoupon> listAsPage(WxCoupon record, Integer pageIndex, Integer pageSize);

/**
* 根据实体查询分页列表
*
* @param record
* @param pageIndex
* @param pageSize
* @return
*/
PageInfo<WxCoupon> findEnableList(WxCoupon record, Integer pageIndex, Integer pageSize);

/**
* 不分页


+ 0
- 5
mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java Просмотреть файл

@@ -37,11 +37,6 @@ public class WxCouponServiceImpl implements WxCouponService {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponMapper.findList(record));
}

@Override
public PageInfo<WxCoupon> findEnableList(WxCoupon record, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponMapper.findEnableList(record));
}

@Override
public List<WxCoupon> findList(WxCoupon record) {
return wxCouponMapper.findList(record);


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

@@ -171,144 +171,6 @@
<if test=" null != sortColumns"> order by ${sortColumns} </if>
</sql>

<sql id="findEnableConditions">
where 1 = 1

<if test=" null != id ">
and `id` = #{id}

</if>

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

</if>

<if test=" null != merchantId ">
and `merchant_id` = #{merchantId}

</if>

<if test=" null != type ">
and `type` = #{type}

</if>

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

</if>

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

</if>

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

</if>

<if test=" null != salePrice ">
and `sale_price` = #{salePrice}

</if>

<if test=" null != usePrice ">
and `use_price` = #{usePrice}

</if>

<if test=" null != useLimitQuantity ">
and `use_limit_quantity` = #{useLimitQuantity}

</if>

<if test=" null != targetAd ">
and `target_ad` = #{targetAd}

</if>

<if test=" null != sendType ">
and `send_type` = #{sendType}

</if>



<if test=" null != validType ">
and `valid_type` = #{validType}

</if>

<if test=" null != validStartDate ">
and `valid_start_date` = #{validStartDate}

</if>

<if test=" null != validEndDate ">
and `valid_end_date` = #{validEndDate}

</if>

<if test=" null != validDays ">
and `valid_days` = #{validDays}

</if>

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

</if>

<if test=" null != price ">
and `price` = #{price}

</if>

<if test=" null != remainInventory ">
and `remain_inventory` = #{remainInventory}

</if>

<if test=" null != inventory ">
and `inventory` = #{inventory}

</if>

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

</if>

<if test=" null != status ">
and `status` =0

</if>

<if test=" null != createDate ">
and `create_date` = #{createDate}

</if>

<if test=" null != updateDate ">
and `update_date` = #{updateDate}

</if>

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

</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
#{idItem}
</foreach>
</if>
<if test=" null != sortColumns"> order by ${sortColumns} </if>
</sql>

<sql id="findCanSendConditions">
where 1 = 1

@@ -451,10 +313,6 @@
<include refid="dynamicWhereConditions" />
</select>

<select id="findEnableList" parameterType="com.simple.domain.po.WxCoupon" resultMap="BaseResultMap">
select <include refid="allColumns" /> from wx_coupon
<include refid="findEnableConditions" />
</select>

<select id="findCanSendList" parameterType="com.simple.domain.po.WxCoupon" resultMap="BaseResultMap">
select <include refid="allColumns" /> from wx_coupon


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