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 {
OrderBasicVo orderBasicVo = tbCfOrderListService.queryorderBasic(orderId);
orderBasicVo.setAtcTime("35天（day）");
// orderBasicVo.setCountry("赞比亚（Zambia）");
if (orderBasicVo.getOrderSource()!=null)
orderBasicVo.setSource(orderBasicVo.getOrderSource().toString());
orderBasicVo.setDeliveryOrderList(tbCfOrderListService.queryOrderDeliveryList(orderId));
return R.ok().put("orderBasicVo", orderBasicVo);
}
......
platform-admin/src/main/java/com/platform/entity/ActivityEntity.java
浏览文件 @ 6c7ff65f
package com.platform.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* 实体
* 表名 activity
*
* @author lipengjun
* @date 2020-11-28 16:30:49
* @date 2020-12-08 14:58:24
*/
public class ActivityEntity implements Serializable {
private static final long serialVersionUID = 1L;
......@@ -24,7 +22,7 @@ public class ActivityEntity implements Serializable {
*/
private String name;
/**
* 活动类型 1：满减 2：满折 3：满几件打折
* 活动类型 1：满减 2：满折 3：满件打折
*/
private Integer type;
/**
......@@ -40,21 +38,13 @@ public class ActivityEntity implements Serializable {
*/
private String picture;
/**
* 满减金额
* 活动条件（json）
*/
private BigDecimal fullAmount;
private String condition;
/**
* 抵扣金额
* 特定商品链接
*/
private BigDecimal reducedAmount;
/**
* 折扣率
*/
private Double discountRate;
/**
* 商品IDS
*/
private String itemIds;
private String link;
/**
* 活动状态 0：关闭 1：开启
*/
......@@ -76,8 +66,6 @@ public class ActivityEntity implements Serializable {
*/
private Date updateTime;
private List<TbCfStationItemEntity> itemList;
/**
* 设置：活动ID
*/
......@@ -91,7 +79,6 @@ public class ActivityEntity implements Serializable {
public String getId() {
return id;
}
/**
* 设置：活动名称
*/
......@@ -105,21 +92,19 @@ public class ActivityEntity implements Serializable {
public String getName() {
return name;
}
/**
* 设置：活动类型 1：满减 2：满折 3：满几件打折
* 设置：活动类型 1：满减 2：满折 3：满件打折
*/
public void setType(Integer type) {
this.type = type;
}
/**
* 获取：活动类型 1：满减 2：满折 3：满几件打折
* 获取：活动类型 1：满减 2：满折 3：满件打折
*/
public Integer getType() {
return type;
}
/**
* 设置：使用类型 1：全场 2：分类商品 3：特定商品
*/
......@@ -133,7 +118,6 @@ public class ActivityEntity implements Serializable {
public Integer getUseType() {
return useType;
}
/**
* 设置：商品分类ID
*/
......@@ -147,7 +131,6 @@ public class ActivityEntity implements Serializable {
public String getCategoryId() {
return categoryId;
}
/**
* 设置：活动图片
*/
......@@ -161,63 +144,32 @@ public class ActivityEntity implements Serializable {
public String getPicture() {
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) {
this.discountRate = discountRate;
public void setCondition(String condition) {
this.condition = condition;
}
/**
* 获取：折扣率
* 获取：活动条件（json）
*/
public Double getdiscountRate() {
return discountRate;
public String getCondition() {
return condition;
}
/**
* 设置：商品IDS
* 设置：特定商品链接
*/
public void setItemIds(String itemIds) {
this.itemIds = itemIds;
public void setLink(String link) {
this.link = link;
}
/**
* 获取：商品IDS
* 获取：特定商品链接
*/
public String getItemIds() {
return itemIds;
public String getLink() {
return link;
}
/**
* 设置：活动状态 0：关闭 1：开启
*/
......@@ -231,7 +183,6 @@ public class ActivityEntity implements Serializable {
public Integer getStatus() {
return status;
}
/**
* 设置：活动开始时间
*/
......@@ -245,7 +196,6 @@ public class ActivityEntity implements Serializable {
public Date getStartTime() {
return startTime;
}
/**
* 设置：活动结束时间
*/
......@@ -259,7 +209,6 @@ public class ActivityEntity implements Serializable {
public Date getEndTime() {
return endTime;
}
/**
* 设置：创建时间
*/
......@@ -273,7 +222,6 @@ public class ActivityEntity implements Serializable {
public Date getCreateTime() {
return createTime;
}
/**
* 设置：更新时间
*/
......@@ -287,13 +235,4 @@ public class ActivityEntity implements Serializable {
public Date getUpdateTime() {
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 {
public ActivityEntity queryObject(String 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;
}
......
platform-admin/src/main/java/com/platform/service/impl/TbCfOrderListServiceImpl.java
浏览文件 @ 6c7ff65f
......@@ -30,7 +30,7 @@ public class TbCfOrderListServiceImpl implements TbCfOrderListService {
@Autowired
private TbCfOrderDao tbCfOrderDao;
private final String PC_WEB_ORDER="2";
private final String PC_WEB_ORDER = "2";
@Override
public List<TbCfOrderListEntity> queryOrderList(Map<String, Object> map) {
......@@ -45,9 +45,12 @@ public class TbCfOrderListServiceImpl implements TbCfOrderListService {
@Override
public List<DeliveryOrderVo> queryOrderDeliveryList(String 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.queryOrderDeliveryList(orderId);
}
......@@ -110,15 +113,15 @@ public class TbCfOrderListServiceImpl implements TbCfOrderListService {
}
@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
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
......
platform-admin/src/main/resources/com/platform/dao/ActivityDao.xml
浏览文件 @ 6c7ff65f
......@@ -10,10 +10,8 @@
<result property="useType" column="use_type"/>
<result property="categoryId" column="category_id"/>
<result property="picture" column="picture"/>
<result property="fullAmount" column="full_amount"/>
<result property="reducedAmount" column="reduced_amount"/>
<result property="discountRate" column="discount_rate"/>
<result property="itemIds" column="item_ids"/>
<result property="condition" column="condition"/>
<result property="link" column="link"/>
<result property="status" column="status"/>
<result property="startTime" column="start_time"/>
<result property="endTime" column="end_time"/>
......@@ -29,10 +27,8 @@
`use_type`,
`category_id`,
`picture`,
`full_amount`,
`reduced_amount`,
`discount_rate`,
`item_ids`,
`condition`,
`link`,
`status`,
`start_time`,
`end_time`,
......@@ -50,10 +46,8 @@
`use_type`,
`category_id`,
`picture`,
`full_amount`,
`reduced_amount`,
`discount_rate`,
`item_ids`,
`condition`,
`link`,
`status`,
`start_time`,
`end_time`,
......@@ -93,10 +87,8 @@
`use_type`,
`category_id`,
`picture`,
`full_amount`,
`reduced_amount`,
`discount_rate`,
`item_ids`,
`condition`,
`link`,
`status`,
`start_time`,
`end_time`,
......@@ -109,11 +101,8 @@
#{useType},
#{categoryId},
#{picture},
#{fullAmount},
#{reducedAmount},
#{
discountRate},
#{itemIds},
#{condition},
#{link},
#{status},
#{startTime},
#{endTime},
......@@ -124,19 +113,17 @@ discountRate},
<update id="update" parameterType="com.platform.entity.ActivityEntity">
update activity
<set>
<if test="name != null">`name` = #{name},</if>
<if test="type != null">`type` = #{type},</if>
<if test="useType != null">`use_type` = #{useType},</if>
<if test="categoryId != null">`category_id` = #{categoryId},</if>
<if test="picture != null">`picture` = #{picture},</if>
<if test="fullAmount != null">`full_amount` = #{fullAmount},</if>
<if test="reducedAmount != null">`reduced_amount` = #{reducedAmount},</if>
<if test="discountRate != null">`discount_rate` = #{discountRate},</if>
<if test="itemIds != null">`item_ids` = #{itemIds},</if>
<if test="status != null">`status` = #{status},</if>
<if test="startTime != null">`start_time` = #{startTime},</if>
<if test="endTime != null">`end_time` = #{endTime},</if>
<if test="createTime != null">`create_time` = #{createTime},</if>
<if test="name != null">`name` = #{name}, </if>
<if test="type != null">`type` = #{type}, </if>
<if test="useType != null">`use_type` = #{useType}, </if>
<if test="categoryId != null">`category_id` = #{categoryId}, </if>
<if test="picture != null">`picture` = #{picture}, </if>
<if test="condition != null">`condition` = #{condition}, </if>
<if test="link != null">`link` = #{link}, </if>
<if test="status != null">`status` = #{status}, </if>
<if test="startTime != null">`start_time` = #{startTime}, </if>
<if test="endTime != null">`end_time` = #{endTime}, </if>
<if test="createTime != null">`create_time` = #{createTime}, </if>
<if test="updateTime != null">`update_time` = #{updateTime}</if>
</set>
where id = #{id}
......
platform-admin/src/main/resources/prod/platform.properties
浏览文件 @ 6c7ff65f
......@@ -6,7 +6,7 @@
#jdbc.username=root
#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.password: Diaoyunnuli.8
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论