提交修改
This commit is contained in:
parent
2b2bde61cd
commit
5ee2b01bab
@ -93,7 +93,7 @@ public interface VvTradeOrderLineDao extends BaseMapper<VvTradeOrderLineEntity>
|
||||
|
||||
|
||||
|
||||
|
||||
@OrderBy(VvTradeOrderLineEntity.id_)
|
||||
List<VvTradeOrderLineEntity> selectByAdminConditionList(
|
||||
@IF @IN List<Long> tradeOrderIds,
|
||||
@IF @LIKE String buyerPhone,
|
||||
|
||||
@ -38,11 +38,11 @@ public class SanUtils {
|
||||
|
||||
List<R> list = list2list(values, function);
|
||||
|
||||
List<R> result = new ArrayList<>();
|
||||
List<R> result = new ArrayList<>();
|
||||
|
||||
if(CollectionUtils.isEmpty(list)){
|
||||
if (CollectionUtils.isNotEmpty(list)) {
|
||||
for (R r : list) {
|
||||
if(r!=null){
|
||||
if (r != null) {
|
||||
result.add(r);
|
||||
}
|
||||
}
|
||||
|
||||
@ -13,9 +13,14 @@ public class AppOrderRequest {
|
||||
|
||||
private int pageSize = 10;
|
||||
|
||||
|
||||
/***
|
||||
* 买家id
|
||||
*/
|
||||
private Long buyerId;
|
||||
|
||||
/***
|
||||
* 订单号id
|
||||
*/
|
||||
private List<Long> tradeOrderIds;
|
||||
|
||||
//商品名称 , 子单维度
|
||||
@ -27,7 +32,6 @@ public class AppOrderRequest {
|
||||
//创建时间撮 最小
|
||||
private Long maxCreateTimestamp;
|
||||
|
||||
|
||||
/**
|
||||
* 按时间排序
|
||||
*/
|
||||
|
||||
@ -99,6 +99,9 @@ public class OrderController {
|
||||
vvTradeOrderEntities.add(vvTradeOrderEntityMap.get(vvTradeOrderLineEntity.getTradeOrderId()));
|
||||
}
|
||||
|
||||
|
||||
vvOrderRequest.setTradeOrderIds(tradeOrderIds);
|
||||
|
||||
// 重新获取子单
|
||||
List<VvTradeOrderLineEntity> list = vvTradeOrderLineDao.selectByAdminConditionList(
|
||||
vvOrderRequest.getTradeOrderIds(),
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user