zoujiajian пре 2 година
родитељ
комит
1001a90734

+ 1 - 1
netflix-dao/src/main/java/com/cyksj/mapper/manage/coupon/CouponUserMapper.java

@@ -33,5 +33,5 @@ public interface CouponUserMapper extends BaseMapper<CouponUser> {
 
 	CouponUserView getCouponDetailById(@Param("userId") long userId, @Param("couponId") Long couponId);
 
-	Map<String, Integer> selectCouponUserNumData(Long couponId);
+	Map<String, Long> selectCouponUserNumData(Long couponId);
 }

+ 4 - 0
netflix-dao/src/main/java/com/cyksj/model/views/CouponReceiptDetailView.java

@@ -1,5 +1,6 @@
 package com.cyksj.model.views;
 
+import com.cyksj.model.entity.CouponUser;
 import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
@@ -33,6 +34,9 @@ public class CouponReceiptDetailView {
 	@DbField("u.nickname")
 	private String nickname;
 
+	@DbField("cu.status")
+	private CouponUser.Status status;
+
 	@DbField("cu.created_time")
 	private Date receiptTime;
 

+ 1 - 1
netflix-dao/src/main/resources/mapper/CouponUserMapper.xml

@@ -235,7 +235,7 @@
     </select>
 
     <select id="selectCouponUserNumData" resultType="java.util.Map">
-        select if(status = 'used', 1, NULL) usedNum, count(*) receiptNum
+        select count(if(status = 'used', 1, NULL)) usedNum, count(*) receiptNum
         from coupon_user
         where coupon_id = #{couponId}
     </select>

+ 3 - 3
netflix-web/src/main/java/com/cyksj/web/controller/manage/coupon/CouponController.java

@@ -189,10 +189,10 @@ public class CouponController {
 		search.getDataList().forEach(data -> {
 			data.setRelationNum(couponDistributePopularizeMapper.selectCount(Wrappers.lambdaQuery(CouponDistributePopularize.class).eq(CouponDistributePopularize::getCouponId, data.getId())));
 
-			Map<String,Integer> couponUserNumData = couponUserMapper.selectCouponUserNumData(data.getId());
-			Integer usedNum = couponUserNumData.get("usedNum");
+			Map<String, Long> couponUserNumData = couponUserMapper.selectCouponUserNumData(data.getId());
+			Integer usedNum = Integer.parseInt(couponUserNumData.get("usedNum").toString());
 			data.setUsedNum(usedNum);
-			Integer receiptNum = couponUserNumData.get("receiptNum");
+			Integer receiptNum = Integer.parseInt(couponUserNumData.get("receiptNum").toString());
 			data.setReceiptNum(receiptNum);
 
 			List<GoodsDonSkuView> skuViewList = couponSkuMapper.selectGoodsSkuViewList(data.getId());