Skip to content

W
wangxiaolu-link-module-bi
提交 3e75da50 authored 作者: 吕本才's avatar 吕本才
浏览文件
操作

1、增加店铺筛选，

2、增加多线程优化
上级 33f9deec
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 47 行增加 和 166 行删除
src/main/java/com/link/bi/domain/dao/IFinanceOrderDetailDao.java
浏览文件 @ 3e75da50
...@@ -11,7 +11,7 @@ import com.link.bi.domain.wq.FinanceCostWq; ...@@ -11,7 +11,7 @@ import com.link.bi.domain.wq.FinanceCostWq;
*/ */
public interface IFinanceOrderDetailDao { public interface IFinanceOrderDetailDao {
PageInfo<FinanceOrderDetail> selectBiFinanceCostList(FinanceCostWq qw); PageInfo<FinanceOrderDetail> selectBiFinanceCostList(FinanceCostWq wq);
PageInfo<FinanceOrderDetail> selectBiFinanceCostDetailList(FinanceCostWq qw); PageInfo<FinanceOrderDetail> selectBiFinanceCostDetailList(FinanceCostWq wq);
} }
src/main/java/com/link/bi/domain/entity/FinanceOrderDetail.java
浏览文件 @ 3e75da50
...@@ -5,13 +5,9 @@ import com.baomidou.mybatisplus.annotation.TableField; ...@@ -5,13 +5,9 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.ObjectUtils;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/** /**
* 旺店通订单明细表 wangdiantong_order_detail * 旺店通订单明细表 wangdiantong_order_detail
...@@ -290,142 +286,9 @@ public class FinanceOrderDetail { ...@@ -290,142 +286,9 @@ public class FinanceOrderDetail {
@TableField(exist = false) @TableField(exist = false)
private String queryType; private String queryType;
/** /**
* 是否删除标志0未删除1已删除 * 是否删除标志0未删除1已删除
*/ */
private String delFlag; private String delFlag;
public String getFenxiaoId(FinanceOrder order, Long tradeId) {
// 如果不为空，解析出
if (ObjectUtils.isNotEmpty(order.getFenxiaoNick())) {
String id = extractDistributorId(order.getFenxiaoNick());
return id;
}
return "";
}
/**
* 从输入字符串中提取分销商 ID
*
* @param input 包含分销商 ID 的字符串
* @return 提取出的分销商 ID，如果未找到则返回空字符串
*/
public String extractDistributorId(String input) {
// 使用正则表达式匹配id
Pattern pattern = Pattern.compile("id:(\\d+)；");
Matcher matcher = pattern.matcher(input);
if (matcher.find()) {
return matcher.group(1);
}
return "";
}
public String extractDistributorName(String input) {
// 使用正则表达式匹配逗号后面的字符
Pattern pattern = Pattern.compile("；(.*)】");
Matcher matcher = pattern.matcher(input);
if (matcher.find()) {
return matcher.group(1);
}
return "";
}
/**
* 根据订单和交易 ID 获取分销商名称
*
* @param order 订单
* @param tradeId 交易 ID
* @return 分销商名称，如果未找到则返回空字符串
*/
public String getFenxiaoName(FinanceOrder order, Long tradeId) {
// 如果不为空，解析出
if (ObjectUtils.isNotEmpty(order.getFenxiaoNick())) {
String id = extractDistributorName(order.getFenxiaoNick());
return id;
}
return "";
}
public String getFenxiaoNick(FinanceOrder order) {
return order.getFenxiaoNick();
}
public String extractByRegex(String input, String regex) {
// 使用正则表达式匹配逗号后面的字符
Pattern pattern = Pattern.compile(regex);
Matcher matcher = pattern.matcher(input);
if (matcher.find()) {
return matcher.group(1);
}
return "";
}
public String getZbjName(String remark, FinanceOrderDetail sameDetail) {
if (ObjectUtils.isNotEmpty(sameDetail) && ObjectUtils.isNotEmpty(sameDetail.getZbjName())) {
return sameDetail.getZbjName();
}
// 如果不为空，解析出
if (ObjectUtils.isNotEmpty(remark) && remark.contains("直播")) {
return extractByRegex(remark, "“【直播】”([^;；]*)");
}
return null;
}
public String getZbjId(String remark, FinanceOrderDetail sameDetail) {
if (ObjectUtils.isNotEmpty(sameDetail) && ObjectUtils.isNotEmpty(sameDetail.getZbjId())) {
return sameDetail.getZbjId();
}
// 如果不为空，解析出
if (ObjectUtils.isNotEmpty(remark) && remark.contains("直播间id")) {
return extractByRegex(remark, "直播间id:([^;；]\\d+)");
}
return null;
}
/**
* 根据分销商和remark备注信息获取主播Id
* @param fenxiaoId
* @param remark
* @param sameDetail
* @return
*/
public String getZbjZbId(String fenxiaoId, String remark, FinanceOrderDetail sameDetail) {
if (ObjectUtils.isNotEmpty(fenxiaoId)) {
return fenxiaoId;
}
if (ObjectUtils.isNotEmpty(sameDetail) && ObjectUtils.isNotEmpty(sameDetail.getZbjZbId())) {
return sameDetail.getZbjZbId();
}
// 如果不为空，解析出
if (ObjectUtils.isNotEmpty(remark) && remark.contains("主播id")) {
return extractByRegex(remark, "主播id:([^;；]\\d+)");
}
return null;
}
public String getZbjSaleType(String remark, FinanceOrderDetail sameDetail) {
if (ObjectUtils.isNotEmpty(sameDetail) && ObjectUtils.isNotEmpty(sameDetail.getZbjSaleType())) {
return sameDetail.getZbjSaleType();
}
// 如果不为空，解析出
if (ObjectUtils.isNotEmpty(remark) && remark.contains("销售类型:")) {
return extractByRegex(remark, "销售类型:([^;；]*)；");
}
return null;
}
public String getZbjQdType(String fenxiaoId, String zbjZbId, Map<String, String> baseZbjType) {
if (ObjectUtils.isNotEmpty(fenxiaoId)) {
zbjZbId = fenxiaoId;
}
String zbjType = baseZbjType.get(zbjZbId);
if (ObjectUtils.isNotEmpty(zbjZbId) && ObjectUtils.isEmpty(zbjType)) {
return baseZbjType.get("其他分销名称");
}
return zbjType;
}
} }
src/main/java/com/link/bi/pojo/request/FinanceCostVo.java
浏览文件 @ 3e75da50
...@@ -7,6 +7,10 @@ import java.util.List; ...@@ -7,6 +7,10 @@ import java.util.List;
@Data @Data
public class FinanceCostVo { public class FinanceCostVo {
// 平台id
private String platformId;
// 商铺
private List<String> shopNo;
// 入参 分页当前页 // 入参 分页当前页
private Integer pageNum = 1; private Integer pageNum = 1;
......
src/main/resources/mapper/bi/FinanceOrderDetailMapper.xml
浏览文件 @ 3e75da50
...@@ -6,29 +6,29 @@ ...@@ -6,29 +6,29 @@
<!-- 根据 聚合类型和值 查询聚合记录 --> <!-- 根据 聚合类型和值 查询聚合记录 -->
<select id="selectBiFinanceCostList" resultMap="BaseResultMap"> <select id="selectBiFinanceCostList" resultMap="BaseResultMap">
select select
<if test=" (wq.zbjQdType == null or wq.zbjQdType.isEmpty() ) <!-- <if test=" (wq.zbjQdType == null or wq.zbjQdType.isEmpty() )-->
and (wq.goodsName== null or wq.goodsName.isEmpty() ) <!-- and (wq.goodsName== null or wq.goodsName.isEmpty() )-->
and (wq.specName== null or wq.specName.isEmpty() ) <!-- and (wq.specName== null or wq.specName.isEmpty() )-->
and (wq.flavor== null or wq.flavor.isEmpty() ) <!-- and (wq.flavor== null or wq.flavor.isEmpty() )-->
and (wq.series== null or wq.series.isEmpty() ) "> <!-- and (wq.series== null or wq.series.isEmpty() ) ">-->
zbj_qd_type, <!-- zbj_qd_type,-->
</if> <!-- </if>-->
<if test="wq.zbjQdType!= null and !wq.zbjQdType.isEmpty() "> zbj_qd_type,
zbj_qd_type, <if test="wq.zbjQdType!= null and !wq.zbjQdType.isEmpty() ">
<if test="wq.subType!= null and wq.subType == 0 "> <if test="wq.subType!= null and wq.subType == 0 ">
fenxiao_id, fenxiao_name, fenxiao_id, fenxiao_name,
</if> </if>
</if> </if>
<if test="wq.goodsName!= null and !wq.goodsName.isEmpty() "> <if test="(wq.goodsName!= null and !wq.goodsName.isEmpty() ) or wq.goodsNameAll == true ">
goods_no,goods_name, goods_no,goods_name,
</if> </if>
<if test="wq.specName!= null and !wq.specName.isEmpty() "> <if test="(wq.specName!= null and !wq.specName.isEmpty() ) or wq.specNameAll == true ">
spec_name_erp, spec_name_erp,
</if> </if>
<if test="wq.flavor!= null and !wq.flavor.isEmpty() "> <if test="(wq.flavor!= null and !wq.flavor.isEmpty() ) or wq.flavorAll == true ">
flavor_erp, flavor_erp,
</if> </if>
<if test="wq.series!= null and !wq.series.isEmpty() "> <if test="(wq.series!= null and !wq.series.isEmpty() ) or wq.seriesAll == true ">
series, series,
<if test="wq.subType!= null and wq.subType == 0 "> <if test="wq.subType!= null and wq.subType == 0 ">
goods_no,goods_name, goods_no,goods_name,
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
sum(sum_standard_cost) as sum_standard_cost_sum sum(sum_standard_cost) as sum_standard_cost_sum
from finance_order_detail fod from finance_order_detail fod
<where> <where>
shop_no IN ( '016', '070', '091')
<if test="(wq.zbjQdTypeAll == null or wq.zbjQdTypeAll == false) and (wq.zbjQdType!= null and !wq.zbjQdType.isEmpty() )"> <if test="(wq.zbjQdTypeAll == null or wq.zbjQdTypeAll == false) and (wq.zbjQdType!= null and !wq.zbjQdType.isEmpty() )">
and fod.zbj_qd_type in and fod.zbj_qd_type in
<foreach collection="wq.zbjQdType" item="item" index="index" open="(" separator="," close=")"> <foreach collection="wq.zbjQdType" item="item" index="index" open="(" separator="," close=")">
...@@ -77,33 +78,44 @@ ...@@ -77,33 +78,44 @@
</where> </where>
group by group by
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test=" (wq.zbjQdType == null or wq.zbjQdType .isEmpty() ) zbj_qd_type,
and (wq.goodsName== null or wq.goodsName.isEmpty() )
and (wq.specName== null or wq.specName.isEmpty() )
and (wq.flavor== null or wq.flavor.isEmpty() )
and (wq.series== null or wq.series.isEmpty() ) ">
zbj_qd_type,
</if>
<if test="wq.zbjQdType!= null and !wq.zbjQdType.isEmpty() "> <if test="wq.zbjQdType!= null and !wq.zbjQdType.isEmpty() ">
zbj_qd_type,
<if test="wq.subType!= null and wq.subType == 0 "> <if test="wq.subType!= null and wq.subType == 0 ">
fenxiao_id, fenxiao_name, fenxiao_id, fenxiao_name,
</if> </if>
</if> </if>
<if test="wq.goodsName!= null and !wq.goodsName.isEmpty() "> <if test="(wq.goodsName!= null and !wq.goodsName.isEmpty()) or wq.goodsNameAll == true">
goods_no ,goods_name, goods_no ,goods_name,
</if> </if>
<if test="wq.specName!= null and !wq.specName.isEmpty() "> <if test="(wq.specName!= null and !wq.specName.isEmpty()) or wq.specNameAll == true">
spec_name_erp, spec_name_erp,
</if> </if>
<if test="wq.flavor!= null and !wq.flavor.isEmpty() "> <if test="(wq.flavor!= null and !wq.flavor.isEmpty()) or wq.flavorAll == true ">
flavor_erp, flavor_erp,
</if> </if>
<if test="wq.series!= null and !wq.series.isEmpty() "> <if test="(wq.series!= null and !wq.series.isEmpty() ) or wq.seriesAll == true ">
series, series,
</if> </if>
</trim> </trim>
order by
<trim suffixOverrides="," suffix="">
<if test=" (wq.zbjQdType == null or wq.zbjQdType .isEmpty() )
and (wq.goodsName== null or wq.goodsName.isEmpty() )
and (wq.specName== null or wq.specName.isEmpty() )
and (wq.flavor== null or wq.flavor.isEmpty() )
and (wq.series== null or wq.series.isEmpty() ) ">
zbj_qd_type desc,
</if>
<if test="wq.zbjQdType!= null and !wq.zbjQdType.isEmpty() ">
zbj_qd_type desc,
<if test="wq.subType!= null and wq.subType == 0 ">
fenxiao_id desc ,
</if>
</if>
<if test="(wq.flavor!= null and !wq.flavor.isEmpty()) or wq.flavorAll == true ">
flavor_erp desc,
</if>
</trim>
</select> </select>
<!-- 根据 类型和聚合的值 查询详情记录 --> <!-- 根据 类型和聚合的值 查询详情记录 -->
...@@ -112,12 +124,14 @@ ...@@ -112,12 +124,14 @@
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from finance_order_detail fod from finance_order_detail fod
<where> <where>
shop_no IN ( '016', '070', '091')
<if test="wq.startDate!= null "> <if test="wq.startDate!= null ">
and fod.consign_time between #{wq.startDate} and #{wq.endDate} and fod.consign_time between #{wq.startDate} and #{wq.endDate}
</if> </if>
<if test="wq.fenxiaoId!= null and wq.fenxiaoId!='' "> <if test="wq.fenxiaoId!= null and wq.fenxiaoId!='' ">
and fod.fenxiao_id = #{wq.fenxiaoId} and fod.fenxiao_id = #{wq.fenxiaoId}
</if> </if>
<if test="wq.zbjQdType!= null and !wq.zbjQdType.isEmpty() "> <if test="wq.zbjQdType!= null and !wq.zbjQdType.isEmpty() ">
and fod.zbj_qd_type in and fod.zbj_qd_type in
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论