From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserSystemCouponCountServiceImpl.java | 75 +++++++++++++++++++++++++------------
1 files changed, 50 insertions(+), 25 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserSystemCouponCountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserSystemCouponCountServiceImpl.java
index 28cef8e..41cc4a5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserSystemCouponCountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserSystemCouponCountServiceImpl.java
@@ -3,15 +3,19 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
import javax.annotation.Resource;
+import org.apache.commons.beanutils.PropertyUtils;
import org.springframework.stereotype.Service;
import com.yeshi.fanli.dao.mybatis.user.UserSystemCouponCountMapper;
+import com.yeshi.fanli.dto.ChartTDO;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
import com.yeshi.fanli.entity.bus.user.UserSystemCouponRecord;
+import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
+import com.yeshi.fanli.service.inter.config.SystemCouponService;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.count.UserSystemCouponCountService;
import com.yeshi.fanli.service.inter.order.CommonOrderCountService;
@@ -38,6 +42,9 @@
@Resource
private HongBaoV2CountService hongBaoV2CountService;
+
+ @Resource
+ private SystemCouponService systemCouponService;
/**
* 濂栧姳鍒哥粺璁�
@@ -133,11 +140,13 @@
}
for (SystemCouponVO systemCouponVO: list) {
+ BigDecimal money = null;
+ if (systemCouponVO.getType() != CouponTypeEnum.freeCouponGive)
+ money = userSystemCouponCountMapper.countFreeMoneyByCouponId(systemCouponVO.getId());
- BigDecimal money = userSystemCouponCountMapper.countFreeMoneyByCouponId(systemCouponVO.getId());
- if (money == null) {
+ if (money == null)
money = new BigDecimal(0);
- }
+
systemCouponVO.setMoney(money);
}
return list;
@@ -179,7 +188,6 @@
orderMoney = new BigDecimal(0);
}
userSystemCouponVO.setOrderMoney(orderMoney);
-
}
}
@@ -197,36 +205,53 @@
public List<UserSystemCouponCountVO> listFreeCouponRecord(long start,int count, String key, Integer keyType,
Integer state){
- List<UserSystemCouponCountVO> list = userSystemCouponCountMapper.listFreeCouponRecord(start, count, key,
+ List<UserSystemCouponRecord> list = userSystemCouponCountMapper.listFreeCouponRecord(start, count, key,
keyType, state);
- if (list == null ) {
- list = new ArrayList<UserSystemCouponCountVO>();
+ if (list == null || list.size() == 0) {
+ return null;
}
- for (UserSystemCouponCountVO userSystemCouponVO: list) {
+ List<UserSystemCouponCountVO> listvo = new ArrayList<UserSystemCouponCountVO>();
+
+ for (UserSystemCouponRecord couponRecord: list) {
+
+ UserSystemCouponCountVO vo = new UserSystemCouponCountVO();
+ UserSystemCoupon userSystemCoupon = couponRecord.getUserSystemCoupon();
+ try {
+ PropertyUtils.copyProperties(vo, userSystemCoupon);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ vo.setUserSystemCouponRecord(couponRecord);
+
+// SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();
+// SystemCoupon baseCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
+// if (baseCoupon == null || baseCoupon.getId() == null) {
+// continue;
+// }
+// vo.setSystemCoupon(baseCoupon);
+
// 鐢ㄦ埛淇℃伅
- Long uid = userSystemCouponVO.getUid();
+ Long uid = userSystemCoupon.getUid();
UserInfo userInfo = userInfoService.selectByPKey(uid);
if (userInfo == null) {
userInfo = new UserInfo();
userInfo.setId(uid);
}
- userSystemCouponVO.setUserInfo(userInfo);
+ vo.setUserInfo(userInfo);
- UserSystemCouponRecord couponRecord = userSystemCouponVO.getUserSystemCouponRecord();
- if (couponRecord != null) {
- String orderNo = couponRecord.getOrderNo();
- BigDecimal orderMoney = commonOrderCountService.getMoneyByOrderNo(orderNo);
- if (orderMoney == null) {
- orderMoney = new BigDecimal(0);
- }
- userSystemCouponVO.setOrderMoney(orderMoney);
-
+ String orderNo = couponRecord.getOrderNo();
+ BigDecimal orderMoney = commonOrderCountService.getMoneyByOrderNo(orderNo);
+ if (orderMoney == null) {
+ orderMoney = new BigDecimal(0);
}
+ vo.setOrderMoney(orderMoney);
+
+ listvo.add(vo);
}
-
- return list;
+ return listvo;
}
@@ -237,19 +262,19 @@
@Override
- public List<Map<String, Object>> getRebateCouponUsedNumToCharts(Integer dateType, String year,
+ public List<ChartTDO> getRebateCouponUsedNumToCharts(Integer dateType, String year,
String startTime, String endTime){
return userSystemCouponCountMapper.getRebateCouponUsedNumToCharts(dateType, year, startTime, endTime);
}
@Override
- public List<Map<String, Object>> getRebateCouponMoneyToCharts(Integer dateType, String year,
+ public List<ChartTDO> getRebateCouponMoneyToCharts(Integer dateType, String year,
String startTime, String endTime){
return userSystemCouponCountMapper.getRebateCouponMoneyToCharts(dateType, year, startTime, endTime);
}
@Override
- public List<Map<String, Object>> getFreeCouponMoneyToCharts(Integer dateType, String year, String startTime,
+ public List<ChartTDO> getFreeCouponMoneyToCharts(Integer dateType, String year, String startTime,
String endTime, String couponType){
return userSystemCouponCountMapper.getFreeCouponMoneyToCharts(dateType, year, startTime, endTime, couponType);
}
--
Gitblit v1.8.0