Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!85 订单相关优化、健康评估报告模板修改

Browse Source 
Merge pull request !85 from 德仔/xzj
This commit is contained in:
德仔 2021-03-03 13:59:43 +08:00 committed by Gitee
commit dc7102f6bb
3 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
running/pdf/healthyReport.pdf
View File

Binary file not shown.

3
stdiet-custom/src/main/java/com/stdiet/custom/utils/NutritionalUtils.java
View File

@ -1,6 +1,7 @@
package com.stdiet.custom.utils; package com.stdiet.custom.utils;
import com.stdiet.common.utils.HealthyUtils; import com.stdiet.common.utils.HealthyUtils;
import com.stdiet.common.utils.NumberUtils;
import com.stdiet.custom.domain.SysCustomerHealthy; import com.stdiet.custom.domain.SysCustomerHealthy;
import com.stdiet.custom.dto.response.NutritionalCalories; import com.stdiet.custom.dto.response.NutritionalCalories;
@ -19,7 +20,7 @@ public class NutritionalUtils {
nutritionalCalories.setTall(sysCustomerHealthy.getTall()); nutritionalCalories.setTall(sysCustomerHealthy.getTall());
nutritionalCalories.setWeight(sysCustomerHealthy.getWeight().doubleValue()); nutritionalCalories.setWeight(sysCustomerHealthy.getWeight().doubleValue());
nutritionalCalories.setStandardWeight(HealthyUtils.calculateStandardWeight(nutritionalCalories.getTall())); nutritionalCalories.setStandardWeight(HealthyUtils.calculateStandardWeight(nutritionalCalories.getTall()));
double overHeight = nutritionalCalories.getWeight() - nutritionalCalories.getStandardWeight(); double overHeight = NumberUtils.getNumberByRoundHalfUp(nutritionalCalories.getWeight() - nutritionalCalories.getStandardWeight(),1).doubleValue();
overHeight = overHeight > 0 ? overHeight : 0; overHeight = overHeight > 0 ? overHeight : 0;
nutritionalCalories.setOverWeight(overHeight); nutritionalCalories.setOverWeight(overHeight);
nutritionalCalories.setMetabolizeHeat(HealthyUtils.calculateMetabolizeHeat(nutritionalCalories.getAge(), nutritionalCalories.getTall(), nutritionalCalories.getWeight()).intValue()); nutritionalCalories.setMetabolizeHeat(HealthyUtils.calculateMetabolizeHeat(nutritionalCalories.getAge(), nutritionalCalories.getTall(), nutritionalCalories.getWeight()).intValue());

48
stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml
View File

@ -69,6 +69,28 @@
LEFT JOIN (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'conditioning_project') AS cp ON cp.dict_value = o.conditioning_project_id LEFT JOIN (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'conditioning_project') AS cp ON cp.dict_value = o.conditioning_project_id
</sql> </sql>
<sql id="searchOrderType">
<if test="searchOrderTypeArray != null">
<trim prefix="AND (" suffix=")" suffixOverrides="or">
<foreach collection="searchOrderTypeArray" separator="or" item="typeArray" index="i">
(
<foreach collection="typeArray" separator="and" item="type" index="j">
<if test="j == 0">
order_type = #{type}
</if>
<if test="j == 1">
order_count_type = #{type}
</if>
<if test="j == 2">
order_money_type = #{type}
</if>
</foreach>
)
</foreach>
</trim>
</if>
</sql>
<select id="selectAllOrderAmount" parameterType="SysOrder" resultType="BigDecimal"> <select id="selectAllOrderAmount" parameterType="SysOrder" resultType="BigDecimal">
SELECT SUM(amount) FROM sys_order SELECT SUM(amount) FROM sys_order
<where> <where>
@ -102,6 +124,9 @@
and 0 > amount and 0 > amount
</if> </if>
</if> </if>
<include refid="searchOrderType">
<property name="reviewStatus" value="#{searchOrderTypeArray}"/>
</include>
<if test="true">and del_flag = 0</if> <if test="true">and del_flag = 0</if>
<!-- 计算总额时需要除去二开售后提成单 --> <!-- 计算总额时需要除去二开售后提成单 -->
AND after_sale_commiss_order = 0 AND after_sale_commiss_order = 0
@ -141,26 +166,9 @@
and 0 > amount and 0 > amount
</if> </if>
</if> </if>
<if test="searchOrderTypeArray != null"> <include refid="searchOrderType">
<trim prefix="AND (" suffix=")" suffixOverrides="or"> <property name="reviewStatus" value="#{searchOrderTypeArray}"/>
<foreach collection="searchOrderTypeArray" separator="or" item="typeArray" index="i"> </include>
(
<foreach collection="typeArray" separator="and" item="type" index="j">
<if test="j == 0">
order_type = #{type}
</if>
<if test="j == 1">
order_count_type = #{type}
</if>
<if test="j == 2">
order_money_type = #{type}
</if>
</foreach>
)
<!--(order_type = #{typeArray[0]} and order_count_type = #{typeArray[1]} and order_money_type =#{typeArray[2]})-->
</foreach>
</trim>
</if>
<if test="true">and o.del_flag = 0</if> <if test="true">and o.del_flag = 0</if>
</where> </where>
order by order_time desc order by order_time desc