|
|
@@ -85,7 +85,7 @@ public class OrderFeesServiceImpl extends ServiceImpl<OrderFeesMapper, OrderFees
|
|
|
*/
|
|
|
public List<OrderFees> getOrderFees(Order order){
|
|
|
List<OrderFees> orderFeesList = baseMapper.selectList(new QueryWrapper<OrderFees>().eq("pid", order.getId())
|
|
|
- .eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0).orderByAsc("sort"));
|
|
|
+ .orderByAsc("fees_type").eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0).orderByAsc("sort"));
|
|
|
if (CollectionUtils.isNotEmpty(orderFeesList)){
|
|
|
orderFeesList.stream().forEach(item ->{
|
|
|
if (item.getItemId() != null){
|
ioioio