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

合并主分支内容

Browse Source
This commit is contained in:
xiezhijun
2021-03-03 16:19:02 +08:00
parent 97deafb62d cc629ac18f
commit 4943af635f
28 changed files with 541 additions and 643 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrderPause.java
View File

@ -1,11 +1,12 @@
package com.stdiet.custom.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.stdiet.common.annotation.Excel;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.stdiet.common.annotation.Excel;
import com.stdiet.common.core.domain.BaseEntity;
import java.util.Date;
/**
* 订单服务暂停对象 sys_order_pause
@ -13,115 +14,59 @@ import com.stdiet.common.core.domain.BaseEntity;
* @author xzj
* @date 2021-01-07
*/
public class SysOrderPause extends BaseEntity
{
private static final long serialVersionUID = 1L;
@Data
public class SysOrderPause {
/** $column.columnComment */
/**
* $column.columnComment
*/
private Long id;
/** 订单id */
/**
* 订单id
*/
private Long orderId;
/** 服务暂停开始时间 */
private Long cusId;
/**
* 服务暂停开始时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "服务暂停开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date pauseStartDate;
/** 服务暂停结束时间 */
/**
* 服务暂停结束时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "服务暂停结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date pauseEndDate;
/** 服务暂停理由 */
/**
* 服务暂停理由
*/
@Excel(name = "服务暂停理由")
private String reason;
/** 备注 */
/**
* 备注
*/
@Excel(name = "备注")
private String remarks;
/** 删除标识 0未删除 1已删除，默认0 */
/**
* 删除标识 0未删除 1已删除，默认0
*/
private Integer delFlag;
public void setId(Long id)
{
this.id = id;
}
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
public Long getId()
{
return id;
}
public void setOrderId(Long orderId)
{
this.orderId = orderId;
}
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
public Long getOrderId()
{
return orderId;
}
public void setPauseStartDate(Date pauseStartDate)
{
this.pauseStartDate = pauseStartDate;
}
private String createBy;
public Date getPauseStartDate()
{
return pauseStartDate;
}
public void setPauseEndDate(Date pauseEndDate)
{
this.pauseEndDate = pauseEndDate;
}
public Date getPauseEndDate()
{
return pauseEndDate;
}
public void setReason(String reason)
{
this.reason = reason;
}
public String getReason()
{
return reason;
}
public void setRemarks(String remarks)
{
this.remarks = remarks;
}
public String getRemarks()
{
return remarks;
}
public void setDelFlag(Integer delFlag)
{
this.delFlag = delFlag;
}
public Integer getDelFlag()
{
return delFlag;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("orderId", getOrderId())
.append("pauseStartDate", getPauseStartDate())
.append("pauseEndDate", getPauseEndDate())
.append("reason", getReason())
.append("remarks", getRemarks())
.append("createTime", getCreateTime())
.append("createBy", getCreateBy())
.append("updateTime", getUpdateTime())
.append("updateBy", getUpdateBy())
.append("delFlag", getDelFlag())
.toString();
}
private String updateBy;
}

2
stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysOrderPauseMapper.java
View File

@ -74,6 +74,8 @@ public interface SysOrderPauseMapper
*/
int deletePauseByOrderId(Long[] orderIds);
long selectNearMainOrderIdByCusId(Long cusId);
/**
* 根据订单ID获取暂停计划
* @param orderId

2
stdiet-custom/src/main/java/com/stdiet/custom/service/ISysOrderPauseService.java
View File

@ -79,4 +79,6 @@ public interface ISysOrderPauseService
* @return
*/
List<SysOrderPause> getPauseListByOrderId(Long orderId);
long selectNearMainOrderIdByCusId(Long cusId);
}

5
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysOrderPauseServiceImpl.java
View File

@ -149,4 +149,9 @@ public class SysOrderPauseServiceImpl implements ISysOrderPauseService
public List<SysOrderPause> getPauseListByOrderId(Long orderId){
return sysOrderPauseMapper.getPauseListByOrderId(orderId);
}
@Override
public long selectNearMainOrderIdByCusId(Long cusId) {
return sysOrderPauseMapper.selectNearMainOrderIdByCusId(cusId);
}
}

11
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesTemplateServiceImpl.java
View File

@ -41,6 +41,7 @@ public class SysRecipesTemplateServiceImpl implements ISysRecipesTemplateService
sysRecipesPlan.setStartNumDay(1);
sysRecipesPlan.setEndNumDay(7);
sysRecipesPlan.setType(1);
sysRecipesPlan.setCusId(0L);
sysRecipesPlanMapper.insertSysRecipesPlan(sysRecipesPlan);
if (!StringUtils.isNull(sysRecipesPlan.getId())) {
sysRecipesTemplate.setCreateBy(SecurityUtils.getUsername());
@ -60,7 +61,15 @@ public class SysRecipesTemplateServiceImpl implements ISysRecipesTemplateService
@Override
public int removeRecipesTemplate(Long id) {
return sysRecipesTemplateMapper.removeRecipesTemplate(id);
SysRecipesTemplate sysRecipesTemplate= sysRecipesTemplateMapper.getRecipesTemplateById(id);
if(StringUtils.isNull(sysRecipesTemplate)) {
return 0;
}
int rows = sysRecipesTemplateMapper.removeRecipesTemplate(sysRecipesTemplate.getId());
if(rows > 0) {
return sysRecipesPlanMapper.deleteSysRecipesPlanById(sysRecipesTemplate.getPlanId());
}
return 0;
}
@Override

1
stdiet-custom/src/main/resources/mapper/custom/SysDishesMapper.xml
View File

@ -44,6 +44,7 @@
<if test="reviewStatus != null and type != ''"> and review_status = #{reviewStatus}</if>
<if test="isMain != null and type != ''"> and is_main = #{isMain}</if>
</where>
order by id desc
</select>
<sql id="selectSysIngreditentsByIdVo">

63
stdiet-custom/src/main/resources/mapper/custom/SysOrderPauseMapper.xml
View File

@ -5,39 +5,41 @@
<mapper namespace="com.stdiet.custom.mapper.SysOrderPauseMapper">
<resultMap type="SysOrderPause" id="SysOrderPauseResult">
<result property="id" column="id" />
<result property="orderId" column="order_id" />
<result property="pauseStartDate" column="pause_start_date" />
<result property="pauseEndDate" column="pause_end_date" />
<result property="reason" column="reason" />
<result property="remarks" column="remarks" />
<result property="createTime" column="create_time" />
<result property="createBy" column="create_by" />
<result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" />
<result property="delFlag" column="del_flag" />
<result property="id" column="id"/>
<result property="orderId" column="order_id"/>
<result property="cusId" column="cus_id"/>
<result property="pauseStartDate" column="pause_start_date"/>
<result property="pauseEndDate" column="pause_end_date"/>
<result property="reason" column="reason"/>
<result property="remarks" column="remarks"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
<result property="delFlag" column="del_flag"/>
</resultMap>
<sql id="baseSelectField">
id, order_id, pause_start_date, pause_end_date, reason, remarks, create_time, create_by, update_time, update_by, del_flag
id, order_id, cus_id, pause_start_date, pause_end_date, reason, remarks, create_time, create_by, update_time, update_by, del_flag
</sql>
<sql id="selectSysOrderPauseVo">
select id, order_id, pause_start_date, pause_end_date, reason, remarks, create_time, create_by, update_time, update_by, del_flag from sys_order_pause sop
select id, order_id, cus_id, pause_start_date, pause_end_date, reason, remarks, create_time, create_by, update_time, update_by, del_flag from sys_recipes_pause sop
</sql>
<select id="selectSysOrderPauseList" parameterType="SysOrderPause" resultMap="SysOrderPauseResult">
<!--select sop.id, sop.order_id, sop.pause_start_date, sop.pause_end_date, sop.reason, sop.remarks, sop.create_time, sop.create_by, sop.update_time, sop.update_by, sop.del_flag,
so.customer,so.order_time
from sys_order_pause sop
from sys_recipes_pause sop
left join sys_order so on so.order_id = sop.order_id-->
<include refid="selectSysOrderPauseVo"></include>
where sop.del_flag = 0
<if test="orderId != null "> and sop.order_id = #{orderId}</if>
<if test="pauseStartDate != null "> and sop.pause_start_date = #{pauseStartDate}</if>
<if test="pauseEndDate != null "> and sop.pause_end_date = #{pauseEndDate}</if>
<if test="reason != null and reason != ''"> and sop.reason = #{reason}</if>
<if test="remarks != null and remarks != ''"> and sop.remarks = #{remarks}</if>
<if test="orderId != null ">and sop.order_id = #{orderId}</if>
<if test="cusId != null ">and sop.cus_id = #{cusId}</if>
<if test="pauseStartDate != null ">and sop.pause_start_date = #{pauseStartDate}</if>
<if test="pauseEndDate != null ">and sop.pause_end_date = #{pauseEndDate}</if>
<if test="reason != null and reason != ''">and sop.reason = #{reason}</if>
<if test="remarks != null and remarks != ''">and sop.remarks = #{remarks}</if>
</select>
<select id="selectSysOrderPauseById" parameterType="Long" resultMap="SysOrderPauseResult">
@ -46,9 +48,10 @@
</select>
<insert id="insertSysOrderPause" parameterType="SysOrderPause" useGeneratedKeys="true" keyProperty="id">
insert into sys_order_pause
insert into sys_recipes_pause
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="orderId != null">order_id,</if>
<if test="cusId != null">cus_id,</if>
<if test="pauseStartDate != null">pause_start_date,</if>
<if test="pauseEndDate != null">pause_end_date,</if>
<if test="reason != null">reason,</if>
@ -61,6 +64,7 @@
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="orderId != null">#{orderId},</if>
<if test="cusId != null">#{cusId},</if>
<if test="pauseStartDate != null">#{pauseStartDate},</if>
<if test="pauseEndDate != null">#{pauseEndDate},</if>
<if test="reason != null">#{reason},</if>
@ -74,9 +78,10 @@
</insert>
<update id="updateSysOrderPause" parameterType="SysOrderPause">
update sys_order_pause
update sys_recipes_pause
<trim prefix="SET" suffixOverrides=",">
<if test="orderId != null">order_id = #{orderId},</if>
<if test="cusId != null">cus_id = #{cusId},</if>
<if test="pauseStartDate != null">pause_start_date = #{pauseStartDate},</if>
<if test="pauseEndDate != null">pause_end_date = #{pauseEndDate},</if>
<if test="reason != null">reason = #{reason},</if>
@ -91,11 +96,11 @@
</update>
<update id="deleteSysOrderPauseById" parameterType="Long">
update sys_order_pause set del_flag = 1 where id = #{id}
update sys_recipes_pause set del_flag = 1 where id = #{id}
</update>
<update id="deleteSysOrderPauseByIds" parameterType="String">
update sys_order_pause set del_flag = 1 where id in
update sys_recipes_pause set del_flag = 1 where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
@ -103,7 +108,7 @@
<!-- 根据订单ID、时间范围查询数量 -->
<select id="getCountByOrderIdAndPauseDate" parameterType="SysOrderPause" resultType="int">
select count(id) from sys_order_pause where del_flag = 0 and order_id = #{orderId}
select count(id) from sys_recipes_pause where del_flag = 0 and order_id = #{orderId}
AND (#{pauseStartDate} >= pause_start_date AND pause_end_date >= #{pauseStartDate}
OR #{pauseEndDate} >= pause_start_date AND pause_end_date >= #{pauseEndDate})
<if test="id != null">
@ -114,12 +119,20 @@
<!-- 根据订单ID删除暂停记录 -->
<update id="deletePauseByOrderId" parameterType="String">
update sys_order_pause set del_flag = 1 where order_id in
update sys_recipes_pause set del_flag = 1 where order_id in
<foreach item="orderId" collection="array" open="(" separator="," close=")">
#{orderId}
</foreach>
</update>
<select id="selectNearMainOrderIdByCusId" parameterType="Long" resultType="Long">
SELECT order_id
FROM sys_order
WHERE cus_id=#{cusId} AND del_flag = 0 AND order_type IN(0, 1) AND after_sale_commiss_order = 0
AND order_money_type IN(0, 2) AND main_order_id=0 AND server_end_time > NOW()
ORDER BY server_end_time ASC LIMIT 1
</select>
<!-- 根据订单ID获取暂停记录，根据暂停开始时间排序，用于生成食谱计划，不能随意修改排序方式 -->
<select id="getPauseListByOrderId" parameterType="Long" resultMap="SysOrderPauseResult">
<include refid="selectSysOrderPauseVo"></include>

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

@ -217,7 +217,7 @@
<!-- 根据cusId查询食谱计划-->
<select id="selectPlanListByCusId" parameterType="Long" resultMap="SysRecipesPlanResult">
select id, out_id, start_date, end_date, start_num_day, end_num_day, recipes_id, review_status from sys_recipes_plan
where cus_id=#{cusId} and del_flag = 0 order by id desc
where cus_id=#{cusId} and del_flag = 0 order by id asc
</select>
<select id="getCusIdByOutId" parameterType="String" resultType="Long">