产品管理
This commit is contained in:
@@ -136,6 +136,7 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
|
||||
if (StringUtils.isNotBlank(query.getState())) {
|
||||
qw.eq("s.state", query.getState());
|
||||
}
|
||||
qw.orderByDesc("s.id");
|
||||
String createStartTime = query.getStartDate();
|
||||
String createEndTime = query.getEndDate();
|
||||
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (s.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
|
||||
@@ -308,6 +309,7 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
|
||||
List<SmsSalesBillDetailDetailsVo> goodsList = new ArrayList<>();
|
||||
SmsSalesBill entity = fetchBySid(sid);
|
||||
BeanUtil.copyProperties(entity, vo);
|
||||
vo.setCreateTime(DateUtil.formatDate(entity.getCreateTime()));
|
||||
List<SmsSalesBillAccount> accounts = smsSalesBillAccountService.selByBillSid(sid);
|
||||
if (null != accounts && !accounts.isEmpty()) {
|
||||
if (accounts.size() > 1) {
|
||||
|
||||
Reference in New Issue
Block a user