Merge remote-tracking branch 'origin/master'

yiqi-api/src/main/java/com/yiqi/api/controller/WeAppUserController.java

@@ -2,6 +2,9 @@ package com.yiqi.api.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.yiqi.app.domain.AppUserAddress;
+import com.yiqi.app.domain.AppUserPointLog;
+import com.yiqi.app.service.IAppUserPointLogService;
 import com.yiqi.common.exception.ServiceException;
 import com.yiqi.app.domain.AppCouponItem;
 import com.yiqi.app.domain.AppUser;
@@ -43,6 +46,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author xiaohei
@@ -56,6 +60,8 @@ public class WeAppUserController extends BaseController {
     @Autowired
     private IAppUserService appUserService;
     @Autowired
+    private IAppUserPointLogService appUserPointLogService;
+    @Autowired
     private IWeAppTokenService weAppTokenService;
     @Autowired
     private ISysSmsService sysSmsService;
@@ -222,6 +228,14 @@ public class WeAppUserController extends BaseController {
         return R.ok(null, "设置成功");
     }
 
+    @ApiOperation("获取我的积分记录")
+    @GetMapping(value = "pointLogList")
+    public R<List<AppUserPointLog>> pointLogList() {
+        return R.ok(appUserPointLogService.list(new QueryWrapper<AppUserPointLog>().lambda()
+                .eq(AppUserPointLog::getAppUserId, AuthHolder.userId())
+                .orderByDesc(AppUserPointLog::getId)));
+    }
+
     @ApiOperation("设置是否开启支付密码")
     @GetMapping(value = "setIsOpenPayPass")
     public R setIsOpenPayPass(@RequestParam @ApiParam("Y=开启，N=关闭") String isOpen) throws Exception {