|
@@ -8,9 +8,11 @@ import com.qs.mp.admin.domain.vo.TicketListVO;
|
|
|
import com.qs.mp.common.core.domain.AjaxResult;
|
|
|
import com.qs.mp.common.core.page.TableDataInfo;
|
|
|
import com.qs.mp.common.enums.PrizeStorageStatusEnum;
|
|
|
+import com.qs.mp.common.enums.TicketPrizeTypeEnum;
|
|
|
import com.qs.mp.common.enums.TicketStatusEnum;
|
|
|
import com.qs.mp.common.enums.UserCouponStatusEnum;
|
|
|
import com.qs.mp.common.utils.DateUtils;
|
|
|
+import com.qs.mp.common.utils.StringUtils;
|
|
|
import com.qs.mp.user.domain.UserCoin;
|
|
|
import com.qs.mp.user.domain.UserCoinLog;
|
|
|
import com.qs.mp.user.domain.UserCoupon;
|
|
@@ -77,6 +79,20 @@ public class UserMineController extends BaseApiController {
|
|
|
startPage();
|
|
|
List<TicketListVO> ticketListVOS = userTicketOrderItemService.listMyTicketVO(userId,
|
|
|
param.getStatus());
|
|
|
+
|
|
|
+
|
|
|
+ // 已兑奖的盲豆奖品需要拼接数量
|
|
|
+ if (TicketStatusEnum.CASHED.equals(param.getStatus())) {
|
|
|
+ for (TicketListVO ticketListVO : ticketListVOS) {
|
|
|
+ if (StringUtils.isBlank(ticketListVO.getPrizeInfo())) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ // 如果为盲豆需要拼接数量
|
|
|
+ if (TicketPrizeTypeEnum.COIN.getValue().equals(ticketListVO.getPrizeType())) {
|
|
|
+ ticketListVO.setPrizeInfo(ticketListVO.getPrizeInfo() + ticketListVO.getValue() + "颗");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
return getDataTable(ticketListVOS);
|
|
|
}
|
|
|
|