diff --git a/dts-dao/src/main/java/com/qiguliuxing/dts/dao/app/Application.java b/dts-dao/src/main/java/com/qiguliuxing/dts/dao/app/Application.java deleted file mode 100644 index 5f36e98..0000000 --- a/dts-dao/src/main/java/com/qiguliuxing/dts/dao/app/Application.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.qiguliuxing.dts.dao.app; - -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication(scanBasePackages = { "com.qiguliuxing.dts.db" }) -@MapperScan("com.qiguliuxing.dts.db.dao") -public class Application { - - public static void main(String[] args) { - SpringApplication.run(Application.class, args); - } - -} \ No newline at end of file diff --git a/dts-dao/src/main/java/com/qiguliuxing/dts/db/service/DtsCouponService.java b/dts-dao/src/main/java/com/qiguliuxing/dts/db/service/DtsCouponService.java index ca455a9..b1edd2a 100644 --- a/dts-dao/src/main/java/com/qiguliuxing/dts/db/service/DtsCouponService.java +++ b/dts-dao/src/main/java/com/qiguliuxing/dts/db/service/DtsCouponService.java @@ -193,4 +193,17 @@ public class DtsCouponService { .andEndTimeLessThan(LocalDate.now()).andDeletedEqualTo(false); return couponMapper.selectByExample(example); } + + /** + * 查询用户的优惠券 + * @param userId + * @return + */ + public int queryUserCouponCnt(Integer userId) { + DtsCouponUserExample example = new DtsCouponUserExample(); + DtsCouponUserExample.Criteria criteria = example.createCriteria(); + criteria.andUserIdEqualTo(userId); + criteria.andDeletedEqualTo(false); + return (int) couponUserMapper.countByExample(example); + } } diff --git a/dts-wx-api/src/main/java/com/qiguliuxing/dts/wx/web/WxCouponController.java b/dts-wx-api/src/main/java/com/qiguliuxing/dts/wx/web/WxCouponController.java index 31a61cc..5d915b3 100644 --- a/dts-wx-api/src/main/java/com/qiguliuxing/dts/wx/web/WxCouponController.java +++ b/dts-wx-api/src/main/java/com/qiguliuxing/dts/wx/web/WxCouponController.java @@ -9,6 +9,7 @@ import java.util.Map; import javax.validation.constraints.NotNull; +import com.github.pagehelper.PageInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -110,7 +111,8 @@ public class WxCouponController { List couponUserList = couponUserService.queryList(userId, null, status, page, size, sort, order); List couponVoList = change(couponUserList); - int total = couponService.queryTotal(); + long total = PageInfo.of(couponUserList).getTotal(); + //int total = couponService.queryTotal(); Map data = new HashMap(); data.put("data", couponVoList); data.put("count", total); diff --git a/dts-wx-api/src/main/java/com/qiguliuxing/dts/wx/web/WxUserController.java b/dts-wx-api/src/main/java/com/qiguliuxing/dts/wx/web/WxUserController.java index 46374b9..ff5298e 100644 --- a/dts-wx-api/src/main/java/com/qiguliuxing/dts/wx/web/WxUserController.java +++ b/dts-wx-api/src/main/java/com/qiguliuxing/dts/wx/web/WxUserController.java @@ -78,7 +78,7 @@ public class WxUserController { data.put("remainAmount", remainAmount); // 查询用户的优惠券 - int total = couponService.queryTotal(); + int total = couponService.queryUserCouponCnt(userId); data.put("couponCount", total); logger.info("【请求结束】用户个人页面数据,响应结果:{}", JSONObject.toJSONString(data));