|
|
@@ -8,6 +8,7 @@ import com.cyksj.dto.Result;
|
|
|
import com.cyksj.enums.GatewayApiCode;
|
|
|
import com.cyksj.enums.GatewayResponse;
|
|
|
import com.cyksj.mapper.OrderDonMapper;
|
|
|
+import com.cyksj.mapper.RegisterOrderDonMapper;
|
|
|
import com.cyksj.mapper.manage.coupon.CouponUserMapper;
|
|
|
import com.cyksj.mapper.market.task.UserBindDetailMapper;
|
|
|
import com.cyksj.model.dto.UserWhoami;
|
|
|
@@ -66,6 +67,8 @@ public class UserController {
|
|
|
|
|
|
private final WorkOrderFrontService workOrderFrontService;
|
|
|
|
|
|
+ private final RegisterOrderDonMapper registerOrderDonMapper;
|
|
|
+
|
|
|
private final HttpServletRequest request;
|
|
|
|
|
|
@GetMapping(value = "/wx/whoami")
|
|
|
@@ -96,7 +99,10 @@ public class UserController {
|
|
|
UserPersonalView personalView = new UserPersonalView();
|
|
|
DateTime now = DateTime.now();
|
|
|
//车票
|
|
|
- personalView.setNumOfTickets(ticket.size());
|
|
|
+ Integer register_count = registerOrderDonMapper.selectCount(Wrappers.lambdaQuery(RegisterOrderDon.class)
|
|
|
+ .eq(RegisterOrderDon::getUserId, userId)
|
|
|
+ .eq(RegisterOrderDon::getStatus, RegisterOrderDon.Status.complete));
|
|
|
+ personalView.setNumOfTickets(ticket.size() + register_count);
|
|
|
//优惠券
|
|
|
Integer couponSize = couponUserMapper.selectCount(Wrappers.lambdaQuery(CouponUser.class)
|
|
|
.eq(CouponUser::getUserId, userId)
|