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

fix 优化bug

release_toaliyun_real
winter 4 лет назад
Родитель
Сommit
5ccabe4e41
3 измененных файлов: 4 добавлений и 25 удалений
  1. +0
    -2
      mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java
  2. +0
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  3. +4
    -18
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

+ 0
- 2
mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java Просмотреть файл

@@ -224,8 +224,6 @@ public interface WxCouponOrderService {

void statisticsWriteOff(WxCouponOrder wxCouponOrder, Map<String, Object> resultMap);

Integer findCount(WxCouponOrder wxCouponOrder);

PageInfo<WxCouponOrderBVo> goodsListAsPage(WxCouponOrderBVo couponOrderBvo, Integer pageNum, Integer pageSize);
List<MarkingCouponDataReportVo> couponDataMap(TenantEntity tenantEntity,Date startTime,Date endTime);


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

@@ -2384,11 +2384,6 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
resultMap.put("countTingche",wxCouponOrderMapper.findWriteOffCount(wxCouponOrder));
}

@Override
public Integer findCount(WxCouponOrder wxCouponOrder) {
return wxCouponOrderMapper.findCount(wxCouponOrder);
}

@Override
public PageInfo<WxCouponOrderBVo> goodsListAsPage(WxCouponOrderBVo record, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findGoodsList(record));


+ 4
- 18
mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml Просмотреть файл

@@ -294,7 +294,7 @@


<select id = "findCreateDateCouponOrderCount" resultType="hashmap" parameterType="hashmap">
select DATE_FORMAT(create_date,'%m/%d') as createTime ,count(1) as count from wx_coupon_order
select DATE_FORMAT(create_date,'%m/%d') as createTime ,count(1) as count from wx_coupon_order co
where `tenant_id` = #{tenantId}
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
@@ -318,7 +318,7 @@
</select>
<select id = "findCreateDateCouponOrderUserCount" resultType="hashmap" parameterType="hashmap">
select DATE_FORMAT(create_date,'%m/%d') as createTime ,count(DISTINCT c_user_id) as count from wx_coupon_order
select DATE_FORMAT(create_date,'%m/%d') as createTime ,count(DISTINCT c_user_id) as count from wx_coupon_order co
where `tenant_id` = #{tenantId}
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
@@ -460,18 +460,7 @@

<select id="findCount" parameterType="com.iformall.domain.po.WxCouponOrder" resultType="java.lang.Integer">
select COUNT(1) FROM wx_coupon_order co
<if test=" null != businessId ">
inner join wx_coupon c
on c.id = co.coupon_id
and c.business = #{businessId}
<if test=" null != subBusinessId ">
and c.sub_business = #{subBusinessId}
</if>
</if>
where 1=1
<if test=" null != tenantId and '' != tenantId">
and co.`tenant_id` = #{tenantId}
</if>
where co.`tenant_id` = #{tenantId}
<if test=" null != parentTenantId and '' != parentTenantId">
and co.`parent_tenant_id` = #{parentTenantId}
</if>
@@ -561,10 +550,7 @@
<select id="findProductCount" parameterType="com.iformall.domain.po.WxCouponOrder" resultType="java.lang.Integer">
select COALESCE(sum(coupon_number),0) FROM wx_coupon_order co
where 1=1
<if test=" null != tenantId and '' != tenantId">
and co.`tenant_id` = #{tenantId}
</if>
where co.`tenant_id` = #{tenantId}
<if test=" null != parentTenantId and '' != parentTenantId">
and co.`parent_tenant_id` = #{parentTenantId}
</if>


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