linxk 2 долоо хоног өмнө
parent
commit
2f798eff3b

+ 10 - 2
cif-service/src/main/java/com/txz/cif/web/RedEnvelopeApiController.java

@@ -1,5 +1,6 @@
 package com.txz.cif.web;
 import cn.hutool.core.date.DateUtil;
+import com.txz.cif.core.AuthService;
 import com.txz.cif.core.Result;
 import com.txz.cif.core.ResultGenerator;
 import com.txz.cif.model.RedEnvelope;
@@ -22,6 +23,7 @@ import tk.mybatis.mapper.entity.Condition;
 import tk.mybatis.mapper.entity.Example.Criteria;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.List;
 import org.apache.commons.lang.StringUtils;
@@ -39,14 +41,20 @@ public class RedEnvelopeApiController {
     @Resource
     private RedEnvelopeService redEnvelopeService;
 
+	@Resource
+	private AuthService authService;
+
     @PostMapping("/list")
 	@ApiOperation(value = "redEnvelope获取列表",httpMethod = "POST")
-    public Result<List<RedEnvelope>> list(@RequestBody RedEnvelopeListParam param) {
+    public Result<List<RedEnvelope>> list(@RequestBody RedEnvelopeListParam param, HttpServletRequest request) {
+		Long userId = authService.getTokenUserId(request);
+
 
-        PageHelper.startPage(param.getPage(), param.getSize());
+		PageHelper.startPage(param.getPage(), param.getSize());
 
         Condition condition = new Condition(RedEnvelope.class);
         Criteria criteria = condition.createCriteria();
+		criteria.andEqualTo("userId",userId);
 		if (param.getType() == 1 ){
 			Date todayStart = DateUtil.beginOfDay(DateUtil.date());
 			criteria.andGreaterThanOrEqualTo("createTime", todayStart);