diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserRespVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserRespVO.java index 1cd22833..cce2b6e6 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserRespVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserRespVO.java @@ -49,4 +49,6 @@ public class MemberUserRespVO extends MemberUserBaseVO { @Schema(description = "用户经验值", requiredMode = Schema.RequiredMode.REQUIRED, example = "200") private Integer experience; + @Schema(description = "绑定卡号") + private String cardId; } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/order/vo/AppOrderRespVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/order/vo/AppOrderRespVO.java index 3e6051e7..a5e89016 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/order/vo/AppOrderRespVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/order/vo/AppOrderRespVO.java @@ -46,13 +46,13 @@ public class AppOrderRespVO { private List detailList; @Schema(description = "推荐摄入量") - private Double proposeIntake; + private BigDecimal proposeIntake; @Schema(description = "摄入量") - private Double intake; + private BigDecimal intake; @Schema(description = "差值") - private Double difference; + private BigDecimal difference; } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppNutritionDayVo.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppNutritionDayVo.java index 6637e479..aaf8cd08 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppNutritionDayVo.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppNutritionDayVo.java @@ -4,6 +4,7 @@ import cn.iocoder.yudao.module.member.dal.dataobject.orderdetail.OrderDetailDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.math.BigDecimal; import java.util.List; /** @@ -15,10 +16,10 @@ import java.util.List; public class AppNutritionDayVo { @Schema(description = "摄入量", example = "24217") - private Double intake; + private BigDecimal intake; @Schema(description = "推荐摄入量", example = "赵六") - private Double proposeIntake; + private BigDecimal proposeIntake; @Schema(description = "时间段(1-早,2-中,3-晚)") private String timePeriod; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/customertraffic/CustomerTrafficServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/customertraffic/CustomerTrafficServiceImpl.java index 5de53a13..814a9d21 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/customertraffic/CustomerTrafficServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/customertraffic/CustomerTrafficServiceImpl.java @@ -90,9 +90,9 @@ public class CustomerTrafficServiceImpl implements CustomerTrafficService { public List getData(Long storeId) { LocalDateTime now = LocalDateTime.now(); List customerTrafficDOS = customerTrafficMapper.selectList(Wrappers.lambdaQuery() - .lt(CustomerTrafficDO::getCreateTime, now) + //.lt(CustomerTrafficDO::getCreateTime, now) .eq(storeId!=null,CustomerTrafficDO::getStoreId,storeId) - .orderByDesc(CustomerTrafficDO::getCustomerNum) + .orderByDesc(CustomerTrafficDO::getCreateTime) .last("limit 7")); return customerTrafficDOS; } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java index 738efebd..3a1c94b9 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/order/OrderServiceImpl.java @@ -111,7 +111,7 @@ public class OrderServiceImpl implements OrderService { List appOrderDetailRespVOS = orderDetailService.selectListByOrderId(id); appOrderRespVO.setDetailList(appOrderDetailRespVOS); BigDecimal reduce1 = appOrderDetailRespVOS.stream().filter(heat -> ObjUtil.isNotEmpty(heat.getHeat())).map(m-> BigDecimal.valueOf(m.getHeat())).reduce(BigDecimal.ZERO, BigDecimal::add); - Double reduce= reduce1.setScale(2, RoundingMode.HALF_UP).doubleValue(); + BigDecimal reduce = reduce1.setScale(2, RoundingMode.HALF_UP); appOrderRespVO.setIntake(reduce); //判断时间 int hour = order.getCreateTime().getHour(); diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java index 60644478..415692b2 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java @@ -426,10 +426,10 @@ public class MemberUserServiceImpl implements MemberUserService { if(CollectionUtil.isNotEmpty(moIds)){ List orderDetailDOS = orderDetailService.selectListByOrderIds(moIds); AppNutritionDayVo appNutritionDayVo = new AppNutritionDayVo(); - Double reduce = orderDetailDOS.stream() + BigDecimal reduce = orderDetailDOS.stream() .filter(f-> ObjectUtil.isNotEmpty(f.getHeat())) .map(m->BigDecimal.valueOf(m.getHeat())) - .reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, RoundingMode.HALF_UP).doubleValue(); + .reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, RoundingMode.HALF_UP); appNutritionDayVo.setIntake(reduce); appNutritionDayVo.setProposeIntake(MemberConstants.PROPOSE_MORNING); appNutritionDayVo.setTimePeriod("1"); @@ -439,10 +439,10 @@ public class MemberUserServiceImpl implements MemberUserService { if(CollectionUtil.isNotEmpty(miIds)){ List orderDetailDOS = orderDetailService.selectListByOrderIds(miIds); AppNutritionDayVo appNutritionDayVo = new AppNutritionDayVo(); - Double reduce = orderDetailDOS.stream() + BigDecimal reduce = orderDetailDOS.stream() .filter(f-> ObjectUtil.isNotEmpty(f.getHeat())) .map(m->BigDecimal.valueOf(m.getHeat())) - .reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, RoundingMode.HALF_UP).doubleValue(); + .reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, RoundingMode.HALF_UP); appNutritionDayVo.setIntake(reduce); appNutritionDayVo.setProposeIntake(MemberConstants.PROPOSE_NOON); appNutritionDayVo.setTimePeriod("2"); @@ -452,10 +452,10 @@ public class MemberUserServiceImpl implements MemberUserService { if(CollectionUtil.isNotEmpty(niIds)){ List orderDetailDOS = orderDetailService.selectListByOrderIds(niIds); AppNutritionDayVo appNutritionDayVo = new AppNutritionDayVo(); - Double reduce = orderDetailDOS.stream() + BigDecimal reduce = orderDetailDOS.stream() .filter(f-> ObjectUtil.isNotEmpty(f.getHeat())) .map(m->BigDecimal.valueOf(m.getHeat())) - .reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, RoundingMode.HALF_UP).doubleValue(); + .reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, RoundingMode.HALF_UP); appNutritionDayVo.setIntake(reduce); appNutritionDayVo.setProposeIntake(MemberConstants.PROPOSE_NIGHT); appNutritionDayVo.setTimePeriod("3"); diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/util/MemberConstants.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/util/MemberConstants.java index d80b3657..613003d3 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/util/MemberConstants.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/util/MemberConstants.java @@ -72,15 +72,15 @@ public class MemberConstants { /** * 早餐推荐摄入量 */ - public static final Double PROPOSE_MORNING = 400D; + public static final BigDecimal PROPOSE_MORNING = new BigDecimal("400"); /** * 午餐推荐摄入量 */ - public static final Double PROPOSE_NOON = 800D; + public static final BigDecimal PROPOSE_NOON = new BigDecimal("800"); /** * 晚餐推荐摄入量 */ - public static final Double PROPOSE_NIGHT = 400D; + public static final BigDecimal PROPOSE_NIGHT = new BigDecimal("400"); } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/order/DishOrderMapper.xml b/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/order/DishOrderMapper.xml index a7f32d11..15ec12f4 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/order/DishOrderMapper.xml +++ b/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/order/DishOrderMapper.xml @@ -9,7 +9,7 @@ 文档可见:https://www.iocoder.cn/MyBatis/x-plugins/ -->