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