diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxUserCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxUserCouponController.java index 3d70f850a..a216c5e3c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxUserCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxUserCouponController.java @@ -39,7 +39,7 @@ public class WxUserCouponController extends BaseController { if(wxUserCoupon==null||wxUserCoupon.getCUserId()==null||wxUserCoupon.getCouponStatus()==null){ return new ResultData(Result.ERROR,"查询失败"); } - return new ResultData(Result.SUCCESS,"查询成功",wxUserCouponService.findList(wxUserCoupon.getCUserId(),wxUserCoupon.getCouponStatus())); + return new ResultData(Result.SUCCESS,"查询成功",wxUserCouponService.findList(getTenantInfo(),wxUserCoupon.getCUserId(),wxUserCoupon.getCouponStatus())); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 8f0f7c696..f4a4088cc 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -71,6 +71,7 @@ public class WxCouponOrderController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxCouponOrder wxCouponOrder, Integer pageNum, Integer pageSize) { if (null == wxCouponOrder) wxCouponOrder = new WxCouponOrder(); + wxCouponOrder.updateTenantInfo(getTenantInfo()); final PageInfo page = wxCouponOrderService.listAsPage(wxCouponOrder, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxUserCouponService.java b/mallinkService/src/main/java/com/iformall/service/WxUserCouponService.java index a64b794d2..ee4357bf4 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxUserCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxUserCouponService.java @@ -3,6 +3,7 @@ package com.iformall.service; import com.iformall.domain.dto.WxUserCouponDto; +import com.iformall.domain.po.base.TenantEntity; import java.util.List; @@ -10,6 +11,6 @@ import java.util.List; * Created by syf on 2018/8/10. */ public interface WxUserCouponService { - List findList(Long userId, int status); + List findList(TenantEntity tenantEntity,Long userId, int status); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxUserCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxUserCouponServiceImpl.java index 83af99b28..1b534fec6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxUserCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxUserCouponServiceImpl.java @@ -2,6 +2,7 @@ package com.iformall.service.impl; import com.iformall.domain.dto.WxUserCouponDto; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponOrder; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.mapper.WxCouponMapper; import com.iformall.mapper.WxCouponOrderMapper; import com.iformall.service.WxUserCouponService; @@ -34,11 +35,12 @@ public class WxUserCouponServiceImpl implements WxUserCouponService { * @return */ @Override - public List findList(Long userId, int status) { + public List findList(TenantEntity tenantEntity,Long userId, int status) { //TODO 待测试优化 List wxUserCoupons = new ArrayList<>(); //查询订单表 WxCouponOrder wxCouponOrder = new WxCouponOrder(); + wxCouponOrder.updateTenantInfo(tenantEntity); wxCouponOrder.setCUserId(userId); wxCouponOrder.setCouponOrderStatus(status);//状态:0,待使用 1,已核销 2,已过期 3,已退款 List wxCouponOrders = wxCouponOrderMapper.findList(wxCouponOrder); @@ -47,6 +49,7 @@ public class WxUserCouponServiceImpl implements WxUserCouponService { } List ids = wxCouponOrders.stream().map(p->p.getCouponId()).distinct().collect(Collectors.toList()); WxCoupon wxCoupon = new WxCoupon(); + wxCoupon.updateTenantInfo(tenantEntity); wxCoupon.setIds(ids); List wxCoupons = wxCouponMapper.findList(wxCoupon); Map couponNamesMap = wxCoupons.stream().collect(Collectors.toMap(WxCoupon::getId,p->p)); diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 86c8bc011..d5c4611f8 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -43,15 +43,10 @@ - where 1 = 1 - + where `tenant_id` = #{tenantId} and `id` = #{id} - - - and `tenant_id` = #{tenantId} - and `parent_tenant_id` = #{parentTenantId}