From 160dc5abfd56ff9fd23d734a9e44f4d28b2b63b1 Mon Sep 17 00:00:00 2001 From: xiezhijun <15270898033@163.com> Date: Tue, 19 Jan 2021 17:35:30 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=9F=E8=B0=B1=E8=AE=A1=E5=88=92=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=81=E6=8C=89=E5=A4=A9=E8=AE=A1=E7=AE=97=E6=8F=90?= =?UTF-8?q?=E6=88=90=E4=BC=98=E5=8C=96=E3=80=81=E5=9B=BE=E7=89=87logo?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../custom/SysRecipesPlanController.java | 12 ++ .../stdiet/custom/domain/SysRecipesPlan.java | 1 + .../custom/mapper/SysRecipesPlanMapper.java | 7 ++ .../service/ISysRecipesPlanService.java | 7 ++ .../impl/SysCommissionDayServiceImpl.java | 19 ++- .../service/impl/SysOrderServiceImpl.java | 4 +- .../impl/SysRecipesPlanServiceImpl.java | 15 ++- .../mapper/custom/SysRecipesPlanMapper.xml | 36 +++++- stdiet-ui/src/assets/logo/st_logo2.png | Bin 0 -> 14394 bytes .../src/layout/components/Sidebar/Logo.vue | 4 +- .../custom/commision/detail_day/index.vue | 6 +- .../src/views/custom/recipesPlan/index.vue | 110 ++++++++++++++---- 12 files changed, 184 insertions(+), 37 deletions(-) create mode 100644 stdiet-ui/src/assets/logo/st_logo2.png diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesPlanController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesPlanController.java index e021a93cd..b0dfd61a6 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesPlanController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysRecipesPlanController.java @@ -38,6 +38,18 @@ public class SysRecipesPlanController extends BaseController return getDataTable(list); } + /** + * 根据订单查询完整食谱计划列表 + */ + @PreAuthorize("@ss.hasPermi('recipes:recipesPlan:list')") + @GetMapping("/getAllPlanByOrderId") + public TableDataInfo getAllPlanByOrderId(SysRecipesPlan sysRecipesPlan) + { + startPage(); + List list = sysRecipesPlanService.selectPlanListByOrderId(sysRecipesPlan); + return getDataTable(list); + } + /** * 获取食谱计划详细信息 */ diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlan.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlan.java index b2cf33063..f1b2091a4 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlan.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlan.java @@ -29,6 +29,7 @@ public class SysRecipesPlan extends BaseEntity private String customer; //非持久化字段，客户手机号 + @Excel(name = "客户手机号") private String phone; /** 食谱开始日期 */ diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesPlanMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesPlanMapper.java index 45dec7152..97290f477 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesPlanMapper.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysRecipesPlanMapper.java @@ -79,4 +79,11 @@ public interface SysRecipesPlanMapper * @return */ List selectPlanListByCondition(SysRecipesPlan sysRecipesPlan); + + /** + * 根据订单ID查询食谱计划 + * @param sysRecipesPlan + * @return + */ + List selectPlanListByOrderId(SysRecipesPlan sysRecipesPlan); } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysRecipesPlanService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysRecipesPlanService.java index 6d809a6a1..196f86977 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysRecipesPlanService.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysRecipesPlanService.java @@ -80,4 +80,11 @@ public interface ISysRecipesPlanService * @return */ List selectPlanListByCondition(SysRecipesPlan sysRecipesPlan); + + /** + * 根据订单ID查询食谱计划 + * @param sysRecipesPlan + * @return + */ + List selectPlanListByOrderId(SysRecipesPlan sysRecipesPlan); } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java index e46282397..8bf398fb5 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java @@ -123,6 +123,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService { } commissionMonthSet.addAll(sysOrderCommisionDayDetail.getEveryYearMonthServerMoney().keySet()); } + //System.out.println("总提成："+sysCommissionDayDetail.getNickName()+"-"+orderAmount.get("20211")); //获取提成比例以及计算提成 Map rateMap = getRateByAmount(sysCommissionDayDetail.getUserId(), sysCommissionDayDetail.getPostId(), orderAmount); @@ -225,10 +226,10 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService { //整理出每个用户对应的订单List Map> userOrderResultMap = new HashMap<>(); for (SysOrder sysOrder : orderList) { - //建档时间为空、售后人员ID为空、营养师ID为空、订单金额为空或小于0，都视为异常订单 + //开始时间为空、售后人员ID为空、营养师ID都为空、订单金额为空，都视为异常订单 if(sysOrder.getOrderTime() == null || sysOrder.getStartTime() == null || sysOrder.getServeTimeId() == null || (sysOrder.getAfterSaleId() == null && sysOrder.getNutritionistId() == null) - || sysOrder.getAmount() == null || sysOrder.getAmount().doubleValue() < 0){ + || sysOrder.getAmount() == null){ //System.out.println("客户："+ sysOrder.getCustomer() +",营养师："+sysOrder.getNutritionist() + ",售后" + sysOrder.getAfterSale()); continue; } @@ -436,7 +437,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService { * double转为BigDecimal，保留一位小数，向下舍去 * */ public BigDecimal getMoney(Double money, int n){ - return new BigDecimal(money).setScale(n, BigDecimal.ROUND_HALF_UP); + return new BigDecimal(money.toString()).setScale(n, BigDecimal.ROUND_DOWN); } /** @@ -459,7 +460,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService { nf.setRoundingMode(RoundingMode.DOWN); System.out.println(Double.parseDouble(nf.format(s))); System.out.println( new BigDecimal(nf.format(s)).doubleValue());*/ - System.out.println(new BigDecimal(s).setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue()); + /*System.out.println(new BigDecimal(s).setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue()); LocalDate localDate = LocalDate.of(2020, 1, 15); System.out.println(ChronoUnit.MONTHS.between(localDate, LocalDate.now())); @@ -467,6 +468,14 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService { System.out.println(localDate.getDayOfWeek()); System.out.println(localDate.getDayOfYear()); - System.out.println(ChronoUnit.DAYS.between(LocalDate.of(2021, 1,14), LocalDate.now())); + System.out.println(ChronoUnit.DAYS.between(LocalDate.of(2021, 1,14), LocalDate.now()));*/ + + /*System.out.println(ts(109792.8 * 6 / 100D, 1)); + System.out.println(ts(6587.8,2).doubleValue());*/ + System.out.println(ts(1.919,1).doubleValue()); + } + + public static BigDecimal ts(Double money, int n){ + return new BigDecimal(money.toString()).setScale(n, BigDecimal.ROUND_DOWN); } } diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java index fd401cd6a..c8b665ef8 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderServiceImpl.java @@ -1,6 +1,7 @@ package com.stdiet.custom.service.impl; import java.math.BigDecimal; +import java.time.LocalDate; import java.time.temporal.ChronoUnit; import java.util.Date; import java.util.List; @@ -196,7 +197,8 @@ public class SysOrderServiceImpl implements ISysOrderService { * @param sysOrder */ private void setOrderServerEndDate(SysOrder sysOrder){ - sysOrder.setServerEndTime(DateUtils.localDateToDate(sysCommissionDayService.getServerEndDate(sysOrder))); + LocalDate serverEndDate = sysCommissionDayService.getServerEndDate(sysOrder); + sysOrder.setServerEndTime(serverEndDate != null ? DateUtils.localDateToDate(serverEndDate) : null); } /** diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java index eac4536eb..bad90a0fa 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java @@ -133,10 +133,11 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService return; } SysOrder sysOrder = sysOrderService.selectSysOrderById(orderId); - //订单为空、金额小于0不进行食谱生成、更新 - if(sysOrder == null){ + //订单为空、金额小于0不进行食谱生成、更新，只对2021年开始的订单进行食谱计划生成 + if(sysOrder == null && DateUtils.dateToLocalDate(sysOrder.getOrderTime()).getYear() > 2020){ return; } + System.out.println(DateUtils.dateToLocalDate(sysOrder.getOrderTime()).getYear()); try{ //获取redis中该订单对应的锁 if(synchrolockUtil.lock(String.format(generateRecipesPlanLockKey, orderId))){ @@ -281,4 +282,14 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService public List selectPlanListByCondition(SysRecipesPlan sysRecipesPlan){ return sysRecipesPlanMapper.selectPlanListByCondition(sysRecipesPlan); } + + /** + * 根据订单ID查询食谱计划 + * @param sysRecipesPlan + * @return + */ + @Override + public List selectPlanListByOrderId(SysRecipesPlan sysRecipesPlan){ + return sysRecipesPlanMapper.selectPlanListByOrderId(sysRecipesPlan); + } } \ No newline at end of file diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml index 376f1bc76..fe546cb74 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml @@ -96,11 +96,11 @@ - update sys_recipes_plan set del_flag = 1 where id = #{id} + delete from sys_recipes_plan where id = #{id} - update sys_recipes_plan set del_flag = 1 where id in + delete from sys_recipes_plan where id in #{id} @@ -118,7 +118,7 @@ - update sys_recipes_plan set del_flag = 1 where order_id in + delete from sys_recipes_plan where order_id in #{orderId} @@ -133,10 +133,38 @@ LEFT JOIN sys_user su_nutritionist_assis ON su_nutritionist_assis.user_id = sr.nutri_assis_id AND su_nutritionist_assis.del_flag = 0 WHERE srp.del_flag = 0 AND srp.order_id = #{orderId} - AND sr.customer like concat('%',#{customer},'%') + AND srp.send_flag = #{sendFlag} + AND (sr.customer like concat('%',#{customer},'%') OR sr.phone like concat('%',#{customer},'%')) AND su_nutritionist.user_id = #{nutritionistId} AND su_nutritionist_assis.user_id = #{nutritionistAssisId} AND srp.start_date BETWEEN date_format(#{startDate},'%y%m%d') AND date_format(#{endDate},'%y%m%d') ORDER BY srp.order_id DESC,srp.id ASC + + + + + \ No newline at end of file diff --git a/stdiet-ui/src/assets/logo/st_logo2.png b/stdiet-ui/src/assets/logo/st_logo2.png new file mode 100644 index 0000000000000000000000000000000000000000..f07e7770463811d0dd41a0934f00733a650ea9b7 GIT binary patch literal 14394 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 GC;tmU*JTm_ literal 0 HcmV?d00001 diff --git a/stdiet-ui/src/layout/components/Sidebar/Logo.vue b/stdiet-ui/src/layout/components/Sidebar/Logo.vue index 8b7c66586..8bd1a05fa 100644 --- a/stdiet-ui/src/layout/components/Sidebar/Logo.vue +++ b/stdiet-ui/src/layout/components/Sidebar/Logo.vue @@ -14,7 +14,7 @@