Merge remote-tracking branch 'origin/cloud_teacher_active_2021_09' into cloud_teacher_active_2021_09

mec-biz/src/main/java/com/ym/mec/biz/dal/page/SysCouponCodeQueryInfo.java

@@ -10,6 +10,8 @@ public class SysCouponCodeQueryInfo extends QueryInfo {
 
     private Integer organId;
 
+    private Integer userId;
+
     private String couponName;
 
     private Long paymentOrderId;
@@ -24,6 +26,14 @@ public class SysCouponCodeQueryInfo extends QueryInfo {
         this.organId = organId;
     }
 
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
     public String getCouponName() {
         return couponName;
     }

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

@@ -89,9 +89,9 @@ public class SysCouponCodeServiceImpl extends BaseServiceImpl<Long, SysCouponCod
 		}
 		sysCouponCodeDao.insert(sysCouponCode);
 		sysCoupon.setConsumeNum(new AtomicInteger(sysCoupon.getConsumeNum()).incrementAndGet());
-		if(sysCoupon.getStockCount()-sysCoupon.getConsumeNum()>sysCoupon.getWarningStockNum()){
+		if(sysCoupon.getWarningStatus()==0&&sysCoupon.getStockCount()-sysCoupon.getConsumeNum()<sysCoupon.getWarningStockNum()){
+			sysCouponService.stockWarning(sysCoupon.getId(), sysCoupon.getName());
 			sysCoupon.setWarningStatus(1);
-			sysCouponService.stockWarning(sysCoupon.getId(),sysCoupon.getName());
 		}
 		sysCouponDao.update(sysCoupon);
 		return true;

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

@@ -115,6 +115,9 @@
 
 	<sql id="querySysCouponUseListCondition">
 		<where>
+			<if test="userId!=null">
+				AND scc.user_id_=#{userId}
+			</if>
 			<if test="couponName!=null and couponName!=''">
 				AND sc.name_ LIKE CONCAT('%', #{couponName}, '%')
 			</if>

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

@@ -0,0 +1,38 @@
+package com.ym.mec.student.controller;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.page.SysCouponCodeQueryInfo;
+import com.ym.mec.biz.service.SysCouponCodeService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("sysCouponCode")
+@Api(tags = "优惠券明细")
+@RestController
+public class SysCouponCodeController extends BaseController {
+
+	@Autowired
+	private SysCouponCodeService sysCouponCodeService;
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
+
+	@ApiOperation("分页查询")
+	@PostMapping(value = "queryPage")
+	@PreAuthorize("@pcs.hasPermissions('sysCouponCode/queryPage')")
+	public HttpResponseResult queryPage(SysCouponCodeQueryInfo queryInfo) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null) {
+			return failed("请登录");
+		}
+		queryInfo.setUserId(sysUser.getId());
+		return succeed(sysCouponCodeService.querySysCouponUseList(queryInfo));
+	}
+}