diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java index 49ab0ffbb..73dbf3bea 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java @@ -26,6 +26,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; @RestController @RequestMapping("wxCUserBasicInfo") @@ -40,7 +41,7 @@ public class WxCUserBasicInfoController extends BaseController { private WxCUserTagsService wxCUserTagsService; @Autowired - private WxTagsService wxTagsService; + private WxCUserCarService wxCUserCarService; @Autowired private WxCouponOrderService wxCouponOrderService; @@ -78,6 +79,15 @@ public class WxCUserBasicInfoController extends BaseController { } + private void setUserInfoCar(WxCUserBasicInfo info) { + WxCUserCar wxCUserCar = new WxCUserCar(); + wxCUserCar.setCUserId(info.getId()); + List list = wxCUserCarService.getList(wxCUserCar); + if (list.size() > 0) { + info.setCarList(list.stream().map(p -> p.getCarNumber()).collect(Collectors.toList())); + } + + } @ApiOperation("分页列表接口") @GetMapping("list") @@ -168,7 +178,7 @@ public class WxCUserBasicInfoController extends BaseController { setUserInfoTag(info); setUserInfoLevel(info); - + setUserInfoCar(info); return new ResultData(info); } diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java index 3c4db504a..bd83ecce6 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java @@ -89,10 +89,8 @@ public class DaliyAmountSchedule { List list = wxCouponOrderMapper.findListOfOrderedByDate(dateMap); logger.info("find " + list.size() + " coupon order from " + startDate + " to " + new Date()); - int total_price = 0; - for(WxCouponOrder couponOrder : list) { - total_price = total_price + couponOrder.getCouponPrice(); - } + int total_price = list.stream().mapToInt(p->p.getCouponPrice()).sum(); + logger.info("\nFound " + list.size() + " coupon orders \n" + "for " + merchant.getId() + "\n" + "from " + startDate + " to " + new Date() +"\n" + @@ -112,10 +110,7 @@ public class DaliyAmountSchedule { list= wxCouponOrderMapper.findListOfVerifiedByDate(dateMap); logger.info("find " + list.size() + " coupon order from " + startDate + " to " + new Date()); - total_price = 0; - for(WxCouponOrder couponOrder : list) { - total_price = total_price + couponOrder.getCouponPrice(); - } + total_price = list.stream().mapToInt(p->p.getCouponPrice()).sum(); logger.info("\nFound " + list.size() + " coupon orders \n" + "for " + merchant.getId() + "\n" + "from " + startDate + " to " + new Date() +"\n" + diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java index 6d3fd9a05..ede41ea6a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -113,6 +113,9 @@ public class WxCUserBasicInfo implements Serializable { @Transient private List tagsList; + @Transient + private List carList; + @Transient private Date startTime; @Transient @@ -121,7 +124,6 @@ public class WxCUserBasicInfo implements Serializable { @Transient private String addressStr; - public String getLevel() { return level; } @@ -270,6 +272,14 @@ public class WxCUserBasicInfo implements Serializable { this.tagsList = tagsList; } + public List getCarList() { + return carList; + } + + public void setCarList(List carList) { + this.carList = carList; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 59bbc55c4..1826e0b4e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -38,6 +38,7 @@ import java.io.*; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; @Service public class WxCouponOrderServiceImpl implements WxCouponOrderService { @@ -173,11 +174,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { else list = wxCouponOrderMapper.findListOfOrderedByDate(dateMap); logger.info("find " + list.size() + " coupon order from " + startDate + " to " + new Date()); - int total_price = 0; - for (WxCouponOrder couponOrder : list) { - total_price = total_price + couponOrder.getCouponPrice(); - } - resultMap.put("amount", total_price); + resultMap.put("amount", list.stream().mapToInt(p->p.getCouponPrice()).sum()); } else { if (isVerified) resultMap.put("list", PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfVerifiedByDateForBUser(dateMap)));