去除食谱生成的时间限制,小程序获取案例接口

This commit is contained in:
xiezhijun 2021-03-18 18:48:28 +08:00
parent f58668f01c
commit 9cc0ad82cd
4 changed files with 10 additions and 3 deletions

View File

@ -33,9 +33,10 @@ public class WxCustomerCaseController extends BaseController{
{
startPage();
sysCustomerCase.setKeywordArray(StringUtils.isNotEmpty(sysCustomerCase.getKeyword()) ? sysCustomerCase.getKeyword().split(",") : null);
//sysCustomerCase.setWxShow(1);
List<SysCustomerCase> list = sysCustomerCaseService.selectSysCustomerCaseList(sysCustomerCase);
List<CustomerCaseResponse> resultList = dealSysCustomerCase(list);
return getDataTable(resultList);
//List<CustomerCaseResponse> resultList = dealSysCustomerCase(list);
return getDataTable(list);
}
/**

View File

@ -36,6 +36,9 @@ public class SysCustomerCase extends BaseEntity
@Excel(name = "所属客户")
private String customerName;
//是否显示到微信小程序
private Integer wxShow;
/** 删除标识 0未删除 1已删除默认0 */
private Long delFlag;

View File

@ -132,7 +132,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService {
}
SysOrder sysOrder = sysOrderService.selectSysOrderById(orderId);
//订单为空金额小于0订单未审核不进行食谱生成更新只对2021年开始的订单进行食谱计划生成判断订单金额开始时间结束时间为空则直接返回不重新生成食谱计划
if (sysOrder == null || !sysOrder.getReviewStatus().equals("yes") || DateUtils.dateToLocalDate(sysOrder.getOrderTime()).getYear() < 2021
if (sysOrder == null || !sysOrder.getReviewStatus().equals("yes") /*|| DateUtils.dateToLocalDate(sysOrder.getOrderTime()).getYear() < 2021*/
|| sysOrder.getAmount().floatValue() <= 0 || sysOrder.getStartTime() == null || sysOrder.getServerEndTime() == null) {
return;
}

View File

@ -43,6 +43,9 @@
<if test="customerName != null and customerName != ''">
and sc.name like concat('%', #{customerName}, '%')
</if>
<if test="wxShow != null">
and scc.wx_show = #{wxShow}
</if>
order by id desc
</select>