Browse Source

[砍价营销统计][修改][tenantId不再自动加]

release_toaliyun_real
gongbiao 7 years ago
parent
commit
bf19c9b216
3 changed files with 6 additions and 0 deletions
  1. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  2. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java
  3. +3
    -0
      mallinkService/src/main/resources/mapper/WxCouponMapper.xml

+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java View File

@@ -253,6 +253,7 @@ public class WxCouponController extends BaseController {
if(wxCoupon.getEnddate() == null){ if(wxCoupon.getEnddate() == null){
wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59"));
} }
wxCoupon.setTenantId(getTenantId());
return new ResultData(wxCouponService.findPressData(wxCoupon,pageNum,pageSize)); return new ResultData(wxCouponService.findPressData(wxCoupon,pageNum,pageSize));
} }




+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java View File

@@ -100,6 +100,8 @@ public class TenantInfoImpl implements TenantInfo {
return true; return true;
if ("com.iformall.mapper.WxActivityJoinMapper.updateStatus".equals(ms.getId())) if ("com.iformall.mapper.WxActivityJoinMapper.updateStatus".equals(ms.getId()))
return true; return true;
if ("com.iformall.mapper.WxCouponMapper.findPressData".equals(ms.getId()))
return true;
return false; return false;
} }
} }

+ 3
- 0
mallinkService/src/main/resources/mapper/WxCouponMapper.xml View File

@@ -650,6 +650,9 @@
*100,2) as payment_rate *100,2) as payment_rate


from wx_coupon c where c.type = 8 from wx_coupon c where c.type = 8
<if test="id != null">
and c.tenant_id=#{tenantId}
</if>
<if test="id != null"> <if test="id != null">
and c.id = #{id} and c.id = #{id}
</if> </if>


Loading…
Cancel
Save