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

修改微信统计导出顺序固定

Browse Source
This commit is contained in:
huangdeliang 2021-05-08 10:56:09 +08:00
parent 6b784c3f1f
commit 2b6cc96016
4 changed files with 67 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java
View File

@ -280,6 +280,8 @@ public class SysOrder extends BaseEntity {
//订单查询时的订单类型二维数组
private JSONArray searchOrderTypeArray;
private Integer counted;
}

28
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java
View File

@ -141,7 +141,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService {
}
//判断是否提成单，拆分单中的副单，体验单,定金单
if (sysOrder.getAfterSaleCommissOrder().intValue() == 1 || ("1".equals(sysOrder.getOrderType()) && sysOrder.getMainOrderId().intValue() != 0) ||
"2".equals(sysOrder.getOrderType()) || "1".equals(sysOrder.getOrderMoneyType())){
"2".equals(sysOrder.getOrderType()) || "1".equals(sysOrder.getOrderMoneyType()) || sysOrder.getCounted() == 1) {
System.out.println("---------------------" + sysOrder.getOrderId() + "不生成食谱------------------------");
continue;
}
@ -177,6 +177,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService {
/**
* 更新食谱计划，删除旧食谱中多余的，添加新食谱中多的
*
* @param oldRecipesPlanList
* @param newRecipesPlanList
*/
@ -303,6 +304,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService {
/**
* 根据食谱开始时间、结束时间、暂停列表获取在食谱计划范围内的暂停天数，以及返回调整之后的计划开始、结束时间，以及暂停日期
*
* @param planStartDate 原先的计划开始时间
* @param planEndDate 原先计划结束时间
* @param pauseList 暂停列表集合
@ -354,6 +356,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService {
/**
* 根据暂停时间范围获取范围内的日期
*
* @return
*/
private Set<String> getPauseDateString(LocalDate pauseStartDate, LocalDate pauseEndDate) {
@ -365,17 +368,6 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService {
return pauseDateList;
}
/**
* 集合排序key值比较器
* */
class MyComparator implements Comparator<String>{
@Override
public int compare(String o1, String o2) {
return Integer.parseInt(o1) - Integer.parseInt(o2);
}
}
/**
* 根据订单ID删除所有食谱安排计划
*
@ -411,6 +403,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService {
/**
* 根据客户ID查询最后一天食谱计划
*
* @param customerId 客户ID
* @return
*/
@ -437,4 +430,15 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService {
return sysRecipesPlanMapper.selectRecipesModelList(sysRecipesPlan);
}
/**
* 集合排序key值比较器
*/
class MyComparator implements Comparator<String> {
@Override
public int compare(String o1, String o2) {
return Integer.parseInt(o1) - Integer.parseInt(o2);
}
}
}

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

@ -49,6 +49,7 @@
<result property="afterSaleCommissOrder" column="after_sale_commiss_order"/>
<result property="commissStartTime" column="commiss_start_time"/>
<result property="delFlag" column="del_flag"/>
<result property="counted" column="counted"/>
<!-- 非持久化字段 -->
<result property="afterSale" column="afterSale_name"></result><!-- 售后名称 -->
@ -61,7 +62,7 @@
o.serve_time_id, o.pay_type_id, pay.dict_label as pay_type, o.pre_sale_id, o.create_by, o.create_time, o.after_sale_id, o.update_by, o.update_time,
o.nutritionist_id, o.remark, o.nutri_assis_id, o.account_id, acc.dict_label as account, o.planner_id, o.planner_assis_id, o.operator_id, o.operator_assis_id,
o.recommender, o.order_time,o.give_serve_day,o.conditioning_project_id,cp.dict_label as conditioning_project,o.server_end_time,
o.on_sale_id,o.order_type,o.order_count_type,o.order_money_type,o.main_order_id,o.after_sale_commiss_order,o.commiss_start_time
o.on_sale_id,o.order_type,o.order_count_type,o.order_money_type,o.main_order_id,o.after_sale_commiss_order,o.commiss_start_time, o.counted
from sys_order o
LEFT JOIN sys_customer sc ON sc.id = o.cus_id
LEFT JOIN (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'cus_pay_type') AS pay ON pay.dict_value = o.pay_type_id
@ -243,6 +244,7 @@
<if test="afterSaleCommissOrder != null">after_sale_commiss_order,</if>
<if test="commissStartTime != null">commiss_start_time,</if>
<if test="delFlag != null">del_flag,</if>
<if test="counted != null">counted,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="orderId != null">#{orderId},</if>
@ -285,6 +287,7 @@
<if test="afterSaleCommissOrder != null">#{afterSaleCommissOrder},</if>
<if test="commissStartTime != null">#{commissStartTime},</if>
<if test="delFlag != null">#{delFlag},</if>
<if test="counted != null">#{counted},</if>
</trim>
</insert>
@ -330,6 +333,7 @@
<if test="afterSaleCommissOrder != null">after_sale_commiss_order = #{afterSaleCommissOrder},</if>
<if test="commissStartTime != null">commiss_start_time = #{commissStartTime},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
<if test="counted != null">counted = #{counted},</if>
</trim>
where order_id = #{orderId}
</update>

2
stdiet-custom/src/main/resources/mapper/custom/SysWxFanStatisticsMapper.xml
View File

@ -70,7 +70,7 @@
LEFT JOIN (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'fan_channel') AS cn ON cn.dict_value = wd.account_id
LEFT JOIN sys_user AS su ON su.user_id = wd.user_id
WHERE wd.del_flag = 0
ORDER BY wd.sale_group_id, wd.user_id ASC
ORDER BY wd.sale_group_id, wd.user_id, wd.wechat_account ASC
</select>
<!-- 查询总进粉数量 -->