Skip to content

C
chinafrica
提交 6c7ff65f authored 作者: 吴德鹏's avatar 吴德鹏
浏览文件
操作

活动管理

上级 774aa74e
隐藏空白字符变更
内嵌 并排
正在显示 包含 105 行增加 和 179 行删除
platform-admin/src/main/java/com/platform/controller/TbCfOrderController.java
浏览文件 @ 6c7ff65f
...@@ -248,7 +248,9 @@ public class TbCfOrderController extends AbstractController { ...@@ -248,7 +248,9 @@ public class TbCfOrderController extends AbstractController {
OrderBasicVo orderBasicVo = tbCfOrderListService.queryorderBasic(orderId); OrderBasicVo orderBasicVo = tbCfOrderListService.queryorderBasic(orderId);
orderBasicVo.setAtcTime("35天（day）"); orderBasicVo.setAtcTime("35天（day）");
// orderBasicVo.setCountry("赞比亚（Zambia）"); // orderBasicVo.setCountry("赞比亚（Zambia）");
orderBasicVo.setSource(orderBasicVo.getOrderSource().toString()); if (orderBasicVo.getOrderSource()!=null)
orderBasicVo.setSource(orderBasicVo.getOrderSource().toString());
orderBasicVo.setDeliveryOrderList(tbCfOrderListService.queryOrderDeliveryList(orderId)); orderBasicVo.setDeliveryOrderList(tbCfOrderListService.queryOrderDeliveryList(orderId));
return R.ok().put("orderBasicVo", orderBasicVo); return R.ok().put("orderBasicVo", orderBasicVo);
} }
......
platform-admin/src/main/java/com/platform/entity/ActivityEntity.java
浏览文件 @ 6c7ff65f
package com.platform.entity; package com.platform.entity;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* 实体 * 实体
* 表名 activity * 表名 activity
* *
* @author lipengjun * @author lipengjun
* @date 2020-11-28 16:30:49 * @date 2020-12-08 14:58:24
*/ */
public class ActivityEntity implements Serializable { public class ActivityEntity implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -24,7 +22,7 @@ public class ActivityEntity implements Serializable { ...@@ -24,7 +22,7 @@ public class ActivityEntity implements Serializable {
*/ */
private String name; private String name;
/** /**
* 活动类型 1：满减 2：满折 3：满几件打折 * 活动类型 1：满减 2：满折 3：满件打折
*/ */
private Integer type; private Integer type;
/** /**
...@@ -40,21 +38,13 @@ public class ActivityEntity implements Serializable { ...@@ -40,21 +38,13 @@ public class ActivityEntity implements Serializable {
*/ */
private String picture; private String picture;
/** /**
* 满减金额 * 活动条件（json）
*/ */
private BigDecimal fullAmount; private String condition;
/** /**
* 抵扣金额 * 特定商品链接
*/ */
private BigDecimal reducedAmount; private String link;
/**
* 折扣率
*/
private Double discountRate;
/**
* 商品IDS
*/
private String itemIds;
/** /**
* 活动状态 0：关闭 1：开启 * 活动状态 0：关闭 1：开启
*/ */
...@@ -76,8 +66,6 @@ public class ActivityEntity implements Serializable { ...@@ -76,8 +66,6 @@ public class ActivityEntity implements Serializable {
*/ */
private Date updateTime; private Date updateTime;
private List<TbCfStationItemEntity> itemList;
/** /**
* 设置：活动ID * 设置：活动ID
*/ */
...@@ -91,7 +79,6 @@ public class ActivityEntity implements Serializable { ...@@ -91,7 +79,6 @@ public class ActivityEntity implements Serializable {
public String getId() { public String getId() {
return id; return id;
} }
/** /**
* 设置：活动名称 * 设置：活动名称
*/ */
...@@ -105,21 +92,19 @@ public class ActivityEntity implements Serializable { ...@@ -105,21 +92,19 @@ public class ActivityEntity implements Serializable {
public String getName() { public String getName() {
return name; return name;
} }
/** /**
* 设置：活动类型 1：满减 2：满折 3：满几件打折 * 设置：活动类型 1：满减 2：满折 3：满件打折
*/ */
public void setType(Integer type) { public void setType(Integer type) {
this.type = type; this.type = type;
} }
/** /**
* 获取：活动类型 1：满减 2：满折 3：满几件打折 * 获取：活动类型 1：满减 2：满折 3：满件打折
*/ */
public Integer getType() { public Integer getType() {
return type; return type;
} }
/** /**
* 设置：使用类型 1：全场 2：分类商品 3：特定商品 * 设置：使用类型 1：全场 2：分类商品 3：特定商品
*/ */
...@@ -133,7 +118,6 @@ public class ActivityEntity implements Serializable { ...@@ -133,7 +118,6 @@ public class ActivityEntity implements Serializable {
public Integer getUseType() { public Integer getUseType() {
return useType; return useType;
} }
/** /**
* 设置：商品分类ID * 设置：商品分类ID
*/ */
...@@ -147,7 +131,6 @@ public class ActivityEntity implements Serializable { ...@@ -147,7 +131,6 @@ public class ActivityEntity implements Serializable {
public String getCategoryId() { public String getCategoryId() {
return categoryId; return categoryId;
} }
/** /**
* 设置：活动图片 * 设置：活动图片
*/ */
...@@ -161,63 +144,32 @@ public class ActivityEntity implements Serializable { ...@@ -161,63 +144,32 @@ public class ActivityEntity implements Serializable {
public String getPicture() { public String getPicture() {
return picture; return picture;
} }
/**
* 设置：满减金额
*/
public void setFullAmount(BigDecimal fullAmount) {
this.fullAmount = fullAmount;
}
/**
* 获取：满减金额
*/
public BigDecimal getFullAmount() {
return fullAmount;
}
/**
* 设置：抵扣金额
*/
public void setReducedAmount(BigDecimal reducedAmount) {
this.reducedAmount = reducedAmount;
}
/**
* 获取：抵扣金额
*/
public BigDecimal getReducedAmount() {
return reducedAmount;
}
/** /**
* 设置：折扣率 * 设置：活动条件（json）
*/ */
public void setdiscountRate(Double discountRate) { public void setCondition(String condition) {
this.discountRate = discountRate; this.condition = condition;
} }
/** /**
* 获取：折扣率 * 获取：活动条件（json）
*/ */
public Double getdiscountRate() { public String getCondition() {
return discountRate; return condition;
} }
/** /**
* 设置：商品IDS * 设置：特定商品链接
*/ */
public void setItemIds(String itemIds) { public void setLink(String link) {
this.itemIds = itemIds; this.link = link;
} }
/** /**
* 获取：商品IDS * 获取：特定商品链接
*/ */
public String getItemIds() { public String getLink() {
return itemIds; return link;
} }
/** /**
* 设置：活动状态 0：关闭 1：开启 * 设置：活动状态 0：关闭 1：开启
*/ */
...@@ -231,7 +183,6 @@ public class ActivityEntity implements Serializable { ...@@ -231,7 +183,6 @@ public class ActivityEntity implements Serializable {
public Integer getStatus() { public Integer getStatus() {
return status; return status;
} }
/** /**
* 设置：活动开始时间 * 设置：活动开始时间
*/ */
...@@ -245,7 +196,6 @@ public class ActivityEntity implements Serializable { ...@@ -245,7 +196,6 @@ public class ActivityEntity implements Serializable {
public Date getStartTime() { public Date getStartTime() {
return startTime; return startTime;
} }
/** /**
* 设置：活动结束时间 * 设置：活动结束时间
*/ */
...@@ -259,7 +209,6 @@ public class ActivityEntity implements Serializable { ...@@ -259,7 +209,6 @@ public class ActivityEntity implements Serializable {
public Date getEndTime() { public Date getEndTime() {
return endTime; return endTime;
} }
/** /**
* 设置：创建时间 * 设置：创建时间
*/ */
...@@ -273,7 +222,6 @@ public class ActivityEntity implements Serializable { ...@@ -273,7 +222,6 @@ public class ActivityEntity implements Serializable {
public Date getCreateTime() { public Date getCreateTime() {
return createTime; return createTime;
} }
/** /**
* 设置：更新时间 * 设置：更新时间
*/ */
...@@ -287,13 +235,4 @@ public class ActivityEntity implements Serializable { ...@@ -287,13 +235,4 @@ public class ActivityEntity implements Serializable {
public Date getUpdateTime() { public Date getUpdateTime() {
return updateTime; return updateTime;
} }
public List<TbCfStationItemEntity> getItemList() {
return itemList;
}
public void setItemList(List<TbCfStationItemEntity> itemList) {
this.itemList = itemList;
}
} }
platform-admin/src/main/java/com/platform/service/impl/ActivityServiceImpl.java
浏览文件 @ 6c7ff65f
...@@ -31,12 +31,7 @@ public class ActivityServiceImpl implements ActivityService { ...@@ -31,12 +31,7 @@ public class ActivityServiceImpl implements ActivityService {
public ActivityEntity queryObject(String id) { public ActivityEntity queryObject(String id) {
ActivityEntity activity = activityDao.queryObject(id); ActivityEntity activity = activityDao.queryObject(id);
//指定商品 && 查出所有的活动商品
if ("3".equals(activity.getUseType())) {
String[] idArr = activity.getItemIds().split(";");
List<TbCfStationItemEntity> itemList = itemDao.queryItemByIds(idArr);
activity.setItemList(itemList);
}
return activity; return activity;
} }
......
platform-admin/src/main/java/com/platform/service/impl/TbCfOrderListServiceImpl.java
浏览文件 @ 6c7ff65f
...@@ -30,7 +30,7 @@ public class TbCfOrderListServiceImpl implements TbCfOrderListService { ...@@ -30,7 +30,7 @@ public class TbCfOrderListServiceImpl implements TbCfOrderListService {
@Autowired @Autowired
private TbCfOrderDao tbCfOrderDao; private TbCfOrderDao tbCfOrderDao;
private final String PC_WEB_ORDER="2"; private final String PC_WEB_ORDER = "2";
@Override @Override
public List<TbCfOrderListEntity> queryOrderList(Map<String, Object> map) { public List<TbCfOrderListEntity> queryOrderList(Map<String, Object> map) {
...@@ -45,9 +45,12 @@ public class TbCfOrderListServiceImpl implements TbCfOrderListService { ...@@ -45,9 +45,12 @@ public class TbCfOrderListServiceImpl implements TbCfOrderListService {
@Override @Override
public List<DeliveryOrderVo> queryOrderDeliveryList(String orderId) { public List<DeliveryOrderVo> queryOrderDeliveryList(String orderId) {
TbCfOrderEntity order = tbCfOrderDao.queryOrderById(orderId); TbCfOrderEntity order = tbCfOrderDao.queryOrderById(orderId);
if(PC_WEB_ORDER.equals(order.getOrderSource().toString())){
if (order.getOrderSource() != null && PC_WEB_ORDER.equals(order.getOrderSource().toString())) {
return tbCfOrderListDao.queryOrderDeliveryWebList(orderId); return tbCfOrderListDao.queryOrderDeliveryWebList(orderId);
} }
return tbCfOrderListDao.queryOrderDeliveryList(orderId); return tbCfOrderListDao.queryOrderDeliveryList(orderId);
} }
...@@ -110,15 +113,15 @@ public class TbCfOrderListServiceImpl implements TbCfOrderListService { ...@@ -110,15 +113,15 @@ public class TbCfOrderListServiceImpl implements TbCfOrderListService {
} }
@Override @Override
public List<StatisticalVo> getOrderByDate(String start, String end,String flag) { public List<StatisticalVo> getOrderByDate(String start, String end, String flag) {
return tbCfOrderDao.getOrderByDate(start, end,flag); return tbCfOrderDao.getOrderByDate(start, end, flag);
} }
@Override @Override
public List<StatisticalVo> getOrderPaidByDate(String start, String end,String flag) { public List<StatisticalVo> getOrderPaidByDate(String start, String end, String flag) {
return tbCfOrderDao.getOrderPaidByDate(start, end,flag); return tbCfOrderDao.getOrderPaidByDate(start, end, flag);
} }
@Override @Override
......
platform-admin/src/main/resources/com/platform/dao/ActivityDao.xml
浏览文件 @ 6c7ff65f
...@@ -10,10 +10,8 @@ ...@@ -10,10 +10,8 @@
<result property="useType" column="use_type"/> <result property="useType" column="use_type"/>
<result property="categoryId" column="category_id"/> <result property="categoryId" column="category_id"/>
<result property="picture" column="picture"/> <result property="picture" column="picture"/>
<result property="fullAmount" column="full_amount"/> <result property="condition" column="condition"/>
<result property="reducedAmount" column="reduced_amount"/> <result property="link" column="link"/>
<result property="discountRate" column="discount_rate"/>
<result property="itemIds" column="item_ids"/>
<result property="status" column="status"/> <result property="status" column="status"/>
<result property="startTime" column="start_time"/> <result property="startTime" column="start_time"/>
<result property="endTime" column="end_time"/> <result property="endTime" column="end_time"/>
...@@ -21,7 +19,7 @@ ...@@ -21,7 +19,7 @@
<result property="updateTime" column="update_time"/> <result property="updateTime" column="update_time"/>
</resultMap> </resultMap>
<select id="queryObject" resultType="com.platform.entity.ActivityEntity"> <select id="queryObject" resultType="com.platform.entity.ActivityEntity">
select select
`id`, `id`,
`name`, `name`,
...@@ -29,10 +27,8 @@ ...@@ -29,10 +27,8 @@
`use_type`, `use_type`,
`category_id`, `category_id`,
`picture`, `picture`,
`full_amount`, `condition`,
`reduced_amount`, `link`,
`discount_rate`,
`item_ids`,
`status`, `status`,
`start_time`, `start_time`,
`end_time`, `end_time`,
...@@ -42,50 +38,48 @@ ...@@ -42,50 +38,48 @@
where id = #{id} where id = #{id}
</select> </select>
<select id="queryList" resultType="com.platform.entity.ActivityEntity"> <select id="queryList" resultType="com.platform.entity.ActivityEntity">
select select
`id`, `id`,
`name`, `name`,
`type`, `type`,
`use_type`, `use_type`,
`category_id`, `category_id`,
`picture`, `picture`,
`full_amount`, `condition`,
`reduced_amount`, `link`,
`discount_rate`, `status`,
`item_ids`, `start_time`,
`status`, `end_time`,
`start_time`, `create_time`,
`end_time`, `update_time`
`create_time`, from activity
`update_time` WHERE 1=1
from activity <if test="name != null and name.trim() != ''">
WHERE 1=1 AND name LIKE concat('%',#{name},'%')
<if test="name != null and name.trim() != ''"> </if>
AND name LIKE concat('%',#{name},'%')
</if>
<choose> <choose>
<when test="sidx != null and sidx.trim() != ''"> <when test="sidx != null and sidx.trim() != ''">
order by ${sidx} ${order} order by ${sidx} ${order}
</when> </when>
<otherwise> <otherwise>
order by id desc order by id desc
</otherwise> </otherwise>
</choose> </choose>
<if test="offset != null and limit != null"> <if test="offset != null and limit != null">
limit #{offset}, #{limit} limit #{offset}, #{limit}
</if> </if>
</select> </select>
<select id="queryTotal" resultType="int"> <select id="queryTotal" resultType="int">
select count(*) from activity select count(*) from activity
WHERE 1=1 WHERE 1=1
<if test="name != null and name.trim() != ''"> <if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%') AND name LIKE concat('%',#{name},'%')
</if> </if>
</select> </select>
<insert id="save" parameterType="com.platform.entity.ActivityEntity"> <insert id="save" parameterType="com.platform.entity.ActivityEntity">
insert into activity( insert into activity(
`id`, `id`,
`name`, `name`,
...@@ -93,10 +87,8 @@ ...@@ -93,10 +87,8 @@
`use_type`, `use_type`,
`category_id`, `category_id`,
`picture`, `picture`,
`full_amount`, `condition`,
`reduced_amount`, `link`,
`discount_rate`,
`item_ids`,
`status`, `status`,
`start_time`, `start_time`,
`end_time`, `end_time`,
...@@ -109,48 +101,43 @@ ...@@ -109,48 +101,43 @@
#{useType}, #{useType},
#{categoryId}, #{categoryId},
#{picture}, #{picture},
#{fullAmount}, #{condition},
#{reducedAmount}, #{link},
#{
discountRate},
#{itemIds},
#{status}, #{status},
#{startTime}, #{startTime},
#{endTime}, #{endTime},
#{createTime}, #{createTime},
#{updateTime}) #{updateTime})
</insert> </insert>
<update id="update" parameterType="com.platform.entity.ActivityEntity"> <update id="update" parameterType="com.platform.entity.ActivityEntity">
update activity update activity
<set> <set>
<if test="name != null">`name` = #{name},</if> <if test="name != null">`name` = #{name}, </if>
<if test="type != null">`type` = #{type},</if> <if test="type != null">`type` = #{type}, </if>
<if test="useType != null">`use_type` = #{useType},</if> <if test="useType != null">`use_type` = #{useType}, </if>
<if test="categoryId != null">`category_id` = #{categoryId},</if> <if test="categoryId != null">`category_id` = #{categoryId}, </if>
<if test="picture != null">`picture` = #{picture},</if> <if test="picture != null">`picture` = #{picture}, </if>
<if test="fullAmount != null">`full_amount` = #{fullAmount},</if> <if test="condition != null">`condition` = #{condition}, </if>
<if test="reducedAmount != null">`reduced_amount` = #{reducedAmount},</if> <if test="link != null">`link` = #{link}, </if>
<if test="discountRate != null">`discount_rate` = #{discountRate},</if> <if test="status != null">`status` = #{status}, </if>
<if test="itemIds != null">`item_ids` = #{itemIds},</if> <if test="startTime != null">`start_time` = #{startTime}, </if>
<if test="status != null">`status` = #{status},</if> <if test="endTime != null">`end_time` = #{endTime}, </if>
<if test="startTime != null">`start_time` = #{startTime},</if> <if test="createTime != null">`create_time` = #{createTime}, </if>
<if test="endTime != null">`end_time` = #{endTime},</if> <if test="updateTime != null">`update_time` = #{updateTime}</if>
<if test="createTime != null">`create_time` = #{createTime},</if> </set>
<if test="updateTime != null">`update_time` = #{updateTime}</if> where id = #{id}
</set> </update>
where id = #{id}
</update> <delete id="delete">
<delete id="delete">
delete from activity where id = #{value} delete from activity where id = #{value}
</delete> </delete>
<delete id="deleteBatch">
delete from activity where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<delete id="deleteBatch"> </mapper>
delete from activity where id in \ No newline at end of file
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>
platform-admin/src/main/resources/prod/platform.properties
浏览文件 @ 6c7ff65f
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#jdbc.username=root #jdbc.username=root
#jdbc.password=diaoyun666 #jdbc.password=diaoyun666
jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica_ref?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
jdbc.username: root jdbc.username: root
jdbc.password: Diaoyunnuli.8 jdbc.password: Diaoyunnuli.8
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论