查询优惠券发放记录

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysCouponIssueRecordDao.java

@@ -37,6 +37,7 @@ public interface SysCouponIssueRecordDao extends BaseMapper<SysCouponIssueRecord
      */
     void opsConsume(@Param("id") Integer id, @Param("consumeNum") Integer consumeNum);
 
-    List<SysCoupon> queryUserCanGetCoupon(@Param("userId") Integer userId,@Param("tenantId") Integer tenantId);
+    List<SysCoupon> queryUserCanGetCoupon(@Param("userId") Integer userId, @Param("tenantId") Integer tenantId, @Param(
+            "useSystem") String useSystem);
 }
 

mec-biz/src/main/java/com/ym/mec/biz/service/SysCouponIssueRecordService.java

@@ -29,6 +29,6 @@ public interface SysCouponIssueRecordService extends IService<SysCouponIssueReco
 
     PageInfo<CouponIssueRecordVo> queryIssueRecord(Map<String, Object> param);
 
-    List<SysCoupon> queryCanBeGetCoupon(Integer userId);
+    List<SysCoupon> queryCanBeGetCoupon(Integer userId, String useSystem);
 }
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysCouponIssueRecordServiceImpl.java

@@ -151,10 +151,11 @@ public class SysCouponIssueRecordServiceImpl extends ServiceImpl<SysCouponIssueR
      * 查询可以领取的优惠券
      *
      * @param userId 用户id
+     * @param useSystem
      */
     @Override
-    public List<SysCoupon> queryCanBeGetCoupon(Integer userId) {
-        return baseMapper.queryUserCanGetCoupon(userId,TenantContextHolder.getTenantId());
+    public List<SysCoupon> queryCanBeGetCoupon(Integer userId, String useSystem) {
+        return baseMapper.queryUserCanGetCoupon(userId,TenantContextHolder.getTenantId(),useSystem);
     }
 
     /**

mec-biz/src/main/resources/config/mybatis/SysCouponIssueRecordMapper.xml

@@ -170,6 +170,9 @@
           AND status_ = 1
           AND tenant_id_ = #{tenantId}
           AND a.`limit_exchange_num_` > IFNULL(b.couponNum, 0)
+        <if test="useSystem != null and useSystem != ''">
+            and a.use_system_ = #{useSystem}
+        </if>
           AND NOW() >= start_date_ AND end_date_ >= NOW()
           AND (
                     stock_count_ > consume_num_

mec-student/src/main/java/com/ym/mec/student/controller/SysCouponCodeController.java

@@ -12,6 +12,7 @@ import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.page.WrapperUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -76,8 +77,11 @@ public class SysCouponCodeController extends BaseController {
 
     @ApiOperation("查询优惠券发放记录")
     @GetMapping(value = "/queryCanBeGet")
-    public HttpResponseResult queryCanBeGetCoupon() {
-        return succeed(couponIssueRecordService.queryCanBeGetCoupon(getUserId()));
+    public HttpResponseResult queryCanBeGetCoupon(String useSystem) {
+        if (StringUtils.isEmpty(useSystem)) {
+            useSystem = "MEC";
+        }
+        return succeed(couponIssueRecordService.queryCanBeGetCoupon(getUserId(),useSystem));
     }
 
     private Integer getUserId() {