|
@@ -17,23 +17,13 @@ import com.qs.mp.common.utils.DateUtils;
|
|
|
import com.qs.mp.common.utils.StringUtils;
|
|
|
import com.qs.mp.system.domain.SysUser;
|
|
|
import com.qs.mp.system.service.ISysUserService;
|
|
|
-import com.qs.mp.user.domain.UserCoin;
|
|
|
-import com.qs.mp.user.domain.UserCoinLog;
|
|
|
-import com.qs.mp.user.domain.UserCoupon;
|
|
|
-import com.qs.mp.user.domain.UserPrizeStorage;
|
|
|
+import com.qs.mp.user.domain.*;
|
|
|
import com.qs.mp.user.domain.dto.CoinTransferParamDTO;
|
|
|
-import com.qs.mp.user.domain.param.CdKeyExchangeParam;
|
|
|
-import com.qs.mp.user.domain.param.CoinTransferParam;
|
|
|
-import com.qs.mp.user.domain.param.CouponChannelQueryParam;
|
|
|
-import com.qs.mp.user.domain.param.UserPrizeStorageUpdateParam;
|
|
|
+import com.qs.mp.user.domain.param.*;
|
|
|
import com.qs.mp.user.domain.vo.UserCouponVO;
|
|
|
import com.qs.mp.user.domain.vo.UserExchangeCdKeyVO;
|
|
|
import com.qs.mp.user.domain.vo.UserPrizeStorageVO;
|
|
|
-import com.qs.mp.user.service.IUserCoinLogService;
|
|
|
-import com.qs.mp.user.service.IUserCoinService;
|
|
|
-import com.qs.mp.user.service.IUserCouponService;
|
|
|
-import com.qs.mp.user.service.IUserPrizeStorageService;
|
|
|
-import com.qs.mp.user.service.IUserTicketOrderItemService;
|
|
|
+import com.qs.mp.user.service.*;
|
|
|
import com.qs.mp.utils.SecurityUtils;
|
|
|
import com.qs.mp.web.controller.common.BaseApiController;
|
|
|
import io.swagger.annotations.*;
|
|
@@ -98,6 +88,9 @@ public class UserMineController extends BaseApiController {
|
|
|
@Autowired
|
|
|
private ICdKeyGroupService cdKeyGroupService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private IUserRedPkgService redPkgService;
|
|
|
+
|
|
|
@Log(title = "昵称和头像修改", businessType = BusinessType.UPDATE)
|
|
|
@PostMapping("/updateUserInfo")
|
|
|
public AjaxResult updateUserInfo(@RequestBody SysUser user) {
|
|
@@ -173,6 +166,35 @@ public class UserMineController extends BaseApiController {
|
|
|
return getDataTable(userCouponVOList);
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 我的红包
|
|
|
+ */
|
|
|
+ @PostMapping("/red/pkg/list")
|
|
|
+ @ApiOperation("我的红包")
|
|
|
+ @ApiResponses(
|
|
|
+ @ApiResponse(code = 200, message = "成功", response = UserRedPkg.class)
|
|
|
+ )
|
|
|
+ public TableDataInfo redPkgList(@RequestBody UserRedPkg redPkg) {
|
|
|
+ Long userId = SecurityUtils.getLoginUser().getUserId();
|
|
|
+ startPage();
|
|
|
+ List<UserRedPkg> redPkgList = redPkgService.list(new QueryWrapper<UserRedPkg>().eq("user_id", userId)
|
|
|
+ .eq("status", redPkg.getStatus())
|
|
|
+ .orderByDesc(UserRedPkgStatusEnum.UN_DRAW.equals(redPkg.getStatus()), "created_time")
|
|
|
+ .orderByDesc(UserRedPkgStatusEnum.DRAW.equals(redPkg.getStatus()), "draw_time"));
|
|
|
+ return getDataTable(redPkgList);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 红包领取
|
|
|
+ */
|
|
|
+ @PostMapping("red/pkg/draw")
|
|
|
+ @ApiOperation("红包领取")
|
|
|
+ public AjaxResult redPkgDraw(@RequestBody RedPkgDrawParam param) {
|
|
|
+
|
|
|
+ boolean rst = redPkgService.draw(param);
|
|
|
+ return AjaxResult.success("红包领取成功,请查看微信钱包零钱余额");
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 优惠券详情
|
|
|
*/
|