去除食谱生成的时间限制,小程序获取案例接口
This commit is contained in:
parent
f58668f01c
commit
9cc0ad82cd
@ -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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -36,6 +36,9 @@ public class SysCustomerCase extends BaseEntity
|
||||
@Excel(name = "所属客户")
|
||||
private String customerName;
|
||||
|
||||
//是否显示到微信小程序
|
||||
private Integer wxShow;
|
||||
|
||||
/** 删除标识 0未删除 1已删除,默认0 */
|
||||
private Long delFlag;
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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>
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user