Skip to content

W
wangxiaolu-sfa-module-operation
提交 ad0a93e4 authored 作者: 000516's avatar 000516
浏览文件
操作

合并分支 'lql-s' 到 'qa'

2511版 - 档期计划修改 查看合并请求 !55
上级 11a711f7 b6495d92
隐藏空白字符变更
内嵌 并排
正在显示 包含 104 行增加 和 30 行删除
src/main/java/com/sfa/operation/controller/sales/core/ApPromotionCoreController.java
浏览文件 @ ad0a93e4
......@@ -15,7 +15,7 @@ import java.util.List;
/**
* @author : liqiulin
* @date : 2025-09-17 15
* @describe :
* @describe : 档期计划
*/
@RestController
@RequestMapping("/sales/ap_promotion/core")
......
src/main/java/com/sfa/operation/controller/sales/query/ApPromotionQueryController.java
浏览文件 @ ad0a93e4
......@@ -17,7 +17,7 @@ import java.util.List;
/**
* @author : liqiulin
* @date : 2025-09-17 15
* @describe :
* @describe : 档期计划
*/
@RestController
@RequestMapping("/sales/ap_promotion/query")
......
src/main/java/com/sfa/operation/domain/sales/dao/impl/SalesApPromotionImplDao.java
浏览文件 @ ad0a93e4
......@@ -40,6 +40,10 @@ public class SalesApPromotionImplDao implements ISalesApPromotionDao {
public PageInfo page(SalesApWq salesApWq) {
LambdaQueryWrapper<SalesApPromotion> qw = buildWq(salesApWq);
Page<SalesApPromotion> salesApDisplayPage = salesApPromotionMapper.selectPage(TableSupport.pageI(), qw);
salesApDisplayPage.getRecords().forEach(salesApPromotion -> {
String flavor = salesApPromotion.getPlannedPromotionFlavor() == null ? null : salesApPromotion.getPlannedPromotionFlavor() + salesApPromotion.getPlannedPromotionFlavorOther();
salesApPromotion.setPlannedPromotionFlavor(flavor);
});
return new PageInfo(salesApDisplayPage);
}
......
src/main/java/com/sfa/operation/domain/sales/entity/SalesApPromotion.java
浏览文件 @ ad0a93e4
......@@ -21,7 +21,12 @@ public class SalesApPromotion implements Serializable {
*/
@TableId(type = IdType.AUTO)
private Long sapId;
/**
* 陈列所属月份
*/
private Date salesMonth;
/**
* 销售大区
*/
......@@ -117,6 +122,11 @@ public class SalesApPromotion implements Serializable {
*/
private String promotionExecutionMonth;
/**
* 档期目标网点数
*/
private Integer promotionSn;
/**
* 档期计划-促销规格
*/
......@@ -126,24 +136,35 @@ public class SalesApPromotion implements Serializable {
* 档期计划-促销口味
*/
private String plannedPromotionFlavor;
private String plannedPromotionFlavorOther;
/**
* 档期执行-促销规格
*/
private String actualPromotionSpec;
/**
* 实际执行规格(填报)
*/
private String actualPromotionSpecRe;
/**
* 档期执行-促销口味
*/
private String actualPromotionFlavor;
/**
* 档期规格是否执行
* 实际执行口味(填报)
*/
private String actualPromotionFlavorRe;
/**
* 档期规格是否执行,有计划默认否
*/
private String specExecutionStatus;
/**
* 促销口味是否执行
* 促销口味是否执行,有计划默认未执行
*/
private String flavorExecutionStatus;
......@@ -191,8 +212,6 @@ public class SalesApPromotion implements Serializable {
* 实际-档期开始时间
*/
private Date actualPromotionStartDate;
@TableField(exist = false)
private Boolean isActualPromotionStartDate;
/**
* 计划-档期结束时间
......@@ -203,16 +222,14 @@ public class SalesApPromotion implements Serializable {
* 实际-档期结束时间
*/
private Date actualPromotionEndDate;
@TableField(exist = false)
private Boolean isActualPromotionEndDate;
/**
* 档期是否开展
* 档期是否开展,有计划默认否
*/
private String promotionImplementationStatus;
/**
* 时间是否执行
* 时间是否执行,有计划默认否
*/
private String timeExecutionStatus;
......@@ -237,7 +254,7 @@ public class SalesApPromotion implements Serializable {
private String actualPromotionMechanism;
/**
* 促销机制是否执行
* 促销机制是否执行,有计划默认否
*/
private String promotionMechanismExecutionStatus;
......@@ -277,10 +294,15 @@ public class SalesApPromotion implements Serializable {
private BigDecimal actualPromotionPrice;
/**
* 促销价是否执行
* 促销价是否执行,有计划默认否
*/
private String promotionPriceExecutionStatus;
/**
* 实际执行价格(填报)
*/
private String actualPromotionPriceRe;
/**
* 正常经销商毛利现状
*/
......@@ -322,7 +344,7 @@ public class SalesApPromotion implements Serializable {
private BigDecimal totalAdjustmentCost;
/**
* 档期是否执行
* 档期是否执行,有计划默认否
*/
private String promotionExecutionStatus;
......@@ -342,7 +364,7 @@ public class SalesApPromotion implements Serializable {
private String actualPosterFormat;
/**
* 海报是否执行
* 海报是否执行,有计划默认否
*/
private String posterExecutionStatus;
......@@ -360,9 +382,22 @@ public class SalesApPromotion implements Serializable {
* 费用
*/
private BigDecimal cost;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新者
*/
private String updateBy;
/**
* 更新时间
*/
private Date updateTime;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
src/main/java/com/sfa/operation/pojo/sales/request/SalesApRequest.java
浏览文件 @ ad0a93e4
......@@ -141,10 +141,18 @@ public class SalesApRequest {
* 档期执行-促销规格
*/
private String actualPromotionSpec;
/**
* 实际执行规格
*/
private String actualPromotionSpecRe;
/**
* 档期执行-促销口味
*/
private String actualPromotionFlavor;
/**
* 实际执行口味
*/
private String actualPromotionFlavorRe;
/**
* 档期规格是否执行
*/
......@@ -206,6 +214,10 @@ public class SalesApRequest {
* 促销价是否执行
*/
private String promotionPriceExecutionStatus;
/**
* 实际执行价格(填报)
*/
private String actualPromotionPriceRe;
/**
* 档期是否执行
*/
......
src/main/java/com/sfa/operation/pojo/sales/response/SalesApPromotionDto.java
浏览文件 @ ad0a93e4
......@@ -17,10 +17,18 @@ public class SalesApPromotionDto {
* 档期执行-促销规格
*/
private String actualPromotionSpec;
/**
* 实际执行规格
*/
private String actualPromotionSpecRe;
/**
* 档期执行-促销口味
*/
private String actualPromotionFlavor;
/**
* 实际执行口味
*/
private String actualPromotionFlavorRe;
/**
* 档期规格是否执行
*/
......@@ -66,6 +74,10 @@ public class SalesApPromotionDto {
* 实际促销售价（单包）
*/
private BigDecimal actualPromotionPrice;
/**
* 实际执行价格(填报)
*/
private String actualPromotionPriceRe;
/**
* 促销价是否执行
*/
......
src/main/resources/mapper/sales/SalesApPromotionMapper.xml
浏览文件 @ ad0a93e4
......@@ -5,6 +5,7 @@
<mapper namespace="com.sfa.operation.domain.sales.mapper.SalesApPromotionMapper">
<resultMap id="SalesApPromotionBaseMap" type="com.sfa.operation.domain.sales.entity.SalesApPromotion">
<id property="sapId" column="sap_id" jdbcType="BIGINT"/>
<result property="salesMonth" column="sales_month" jdbcType="DATE"/>
<result property="regionName" column="region_name" jdbcType="VARCHAR"/>
<result property="districtName" column="district_name" jdbcType="VARCHAR"/>
<result property="dealerProvince" column="dealer_province" jdbcType="VARCHAR"/>
......@@ -24,10 +25,14 @@
<result property="lineLf" column="line_lf" jdbcType="VARCHAR"/>
<result property="storeCount" column="store_count" jdbcType="VARCHAR"/>
<result property="promotionExecutionMonth" column="promotion_execution_month" jdbcType="VARCHAR"/>
<result property="promotionSn" column="promotion_sn" jdbcType="INTEGER"/>
<result property="plannedPromotionSpec" column="planned_promotion_spec" jdbcType="VARCHAR"/>
<result property="plannedPromotionFlavor" column="planned_promotion_flavor" jdbcType="VARCHAR"/>
<result property="plannedPromotionFlavorOther" column="planned_promotion_flavor_other" jdbcType="VARCHAR"/>
<result property="actualPromotionSpec" column="actual_promotion_spec" jdbcType="VARCHAR"/>
<result property="actualPromotionSpecRe" column="actual_promotion_spec_re" jdbcType="VARCHAR"/>
<result property="actualPromotionFlavor" column="actual_promotion_flavor" jdbcType="VARCHAR"/>
<result property="actualPromotionFlavorRe" column="actual_promotion_flavor_re" jdbcType="VARCHAR"/>
<result property="specExecutionStatus" column="spec_execution_status" jdbcType="VARCHAR"/>
<result property="flavorExecutionStatus" column="flavor_execution_status" jdbcType="VARCHAR"/>
<result property="totalCost" column="total_cost" jdbcType="DECIMAL"/>
......@@ -35,23 +40,19 @@
<result property="plannedPromotionFormat" column="planned_promotion_format" jdbcType="VARCHAR"/>
<result property="plannedVerificationMethod" column="planned_verification_method" jdbcType="VARCHAR"/>
<result property="plannedPromotionRules" column="planned_promotion_rules" jdbcType="VARCHAR"/>
<result property="plannedPrePromotionAdjustDays" column="planned_pre_promotion_adjust_days"
jdbcType="INTEGER"/>
<result property="plannedPostPromotionAdjustDays" column="planned_post_promotion_adjust_days"
jdbcType="INTEGER"/>
<result property="plannedPrePromotionAdjustDays" column="planned_pre_promotion_adjust_days" jdbcType="INTEGER"/>
<result property="plannedPostPromotionAdjustDays" column="planned_post_promotion_adjust_days" jdbcType="INTEGER"/>
<result property="plannedPromotionStartDate" column="planned_promotion_start_date" jdbcType="DATE"/>
<result property="actualPromotionStartDate" column="actual_promotion_start_date" jdbcType="DATE"/>
<result property="plannedPromotionEndDate" column="planned_promotion_end_date" jdbcType="DATE"/>
<result property="actualPromotionEndDate" column="actual_promotion_end_date" jdbcType="DATE"/>
<result property="promotionImplementationStatus" column="promotion_implementation_status"
jdbcType="VARCHAR"/>
<result property="promotionImplementationStatus" column="promotion_implementation_status" jdbcType="VARCHAR"/>
<result property="timeExecutionStatus" column="time_execution_status" jdbcType="VARCHAR"/>
<result property="plannedAdjustmentStartDate" column="planned_adjustment_start_date" jdbcType="DATE"/>
<result property="plannedAdjustmentEndDate" column="planned_adjustment_end_date" jdbcType="DATE"/>
<result property="plannedPromotionMechanism" column="planned_promotion_mechanism" jdbcType="VARCHAR"/>
<result property="actualPromotionMechanism" column="actual_promotion_mechanism" jdbcType="VARCHAR"/>
<result property="promotionMechanismExecutionStatus" column="promotion_mechanism_execution_status"
jdbcType="VARCHAR"/>
<result property="promotionMechanismExecutionStatus" column="promotion_mechanism_execution_status" jdbcType="VARCHAR"/>
<result property="estimatedBagCount" column="estimated_bag_count" jdbcType="INTEGER"/>
<result property="promotionStockQuantity" column="promotion_stock_quantity" jdbcType="INTEGER"/>
<result property="unitFactoryPrice" column="unit_factory_price" jdbcType="DECIMAL"/>
......@@ -59,15 +60,12 @@
<result property="regularRetailPrice" column="regular_retail_price" jdbcType="DECIMAL"/>
<result property="plannedPromotionPrice" column="planned_promotion_price" jdbcType="DECIMAL"/>
<result property="actualPromotionPrice" column="actual_promotion_price" jdbcType="DECIMAL"/>
<result property="promotionPriceExecutionStatus" column="promotion_price_execution_status"
jdbcType="VARCHAR"/>
<result property="promotionPriceExecutionStatus" column="promotion_price_execution_status" jdbcType="VARCHAR"/>
<result property="actualPromotionPriceRe" column="actual_promotion_price_re" jdbcType="VARCHAR"/>
<result property="normalDealerMarginStatus" column="normal_dealer_margin_status" jdbcType="VARCHAR"/>
<result property="systemFrontendMarginGuarantee" column="system_frontend_margin_guarantee"
jdbcType="VARCHAR"/>
<result property="systemBackendMarginGuarantee" column="system_backend_margin_guarantee"
jdbcType="VARCHAR"/>
<result property="systemPromotionMarginGuarantee" column="system_promotion_margin_guarantee"
jdbcType="VARCHAR"/>
<result property="systemFrontendMarginGuarantee" column="system_frontend_margin_guarantee" jdbcType="VARCHAR"/>
<result property="systemBackendMarginGuarantee" column="system_backend_margin_guarantee" jdbcType="VARCHAR"/>
<result property="systemPromotionMarginGuarantee" column="system_promotion_margin_guarantee" jdbcType="VARCHAR"/>
<result property="dealerMarginGuarantee" column="dealer_margin_guarantee" jdbcType="VARCHAR"/>
<result property="unitBagAdjustmentAmount" column="unit_bag_adjustment_amount" jdbcType="DECIMAL"/>
<result property="adjustmentCostRatio" column="adjustment_cost_ratio" jdbcType="FLOAT"/>
......@@ -80,6 +78,9 @@
<result property="storeCountInt" column="store_count_int" jdbcType="INTEGER"/>
<result property="averageStoreCost" column="average_store_cost" jdbcType="DECIMAL"/>
<result property="cost" column="cost" jdbcType="DECIMAL"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
<update id="putById" parameterType="com.sfa.operation.domain.sales.entity.SalesApPromotion">
......@@ -89,9 +90,15 @@
<if test="actualPromotionSpec != null">
actual_promotion_spec = #{actualPromotionSpec},
</if>
<if test="actualPromotionSpecRe != null">
actual_promotion_spec_re = #{actualPromotionSpecRe},
</if>
<if test="actualPromotionFlavor != null">
actual_promotion_flavor = #{actualPromotionFlavor},
</if>
<if test="actualPromotionFlavorRe != null">
actual_promotion_flavor_re = #{actualPromotionFlavorRe},
</if>
<if test="flavorExecutionStatus != null">
flavor_execution_status = #{flavorExecutionStatus},
</if>
......@@ -122,6 +129,9 @@
<if test="actualPromotionPrice != null">
actual_promotion_price = #{actualPromotionPrice},
</if>
<if test="actualPromotionPriceRe != null">
actual_promotion_price_re = #{actualPromotionPriceRe},
</if>
<if test="promotionPriceExecutionStatus != null">
promotion_price_execution_status = #{promotionPriceExecutionStatus},
</if>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论