Commit 65c593af by huluobin

update

parent 31334e11
...@@ -366,7 +366,8 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order ...@@ -366,7 +366,8 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
wrapper.like(OrderManage::getTelephone, param.getCustomerPhone()); wrapper.like(OrderManage::getTelephone, param.getCustomerPhone());
} }
if (param.getCustomerId() != null) { if (param.getCustomerId() != null) {
wrapper.eq(OrderManage::getOrderUser, param.getCustomerId()); wrapper.and(wrapper2 -> wrapper.eq(OrderManage::getOrderUser, param.getCustomerId())
.or(wrapper3 -> wrapper3.eq(OrderManage::getPayUser, param.getCustomerId())));
} }
if (param.getDepartmentId() != null) { if (param.getDepartmentId() != null) {
wrapper.eq(OrderManage::getDepartmentId, param.getDepartmentId()); wrapper.eq(OrderManage::getDepartmentId, param.getDepartmentId());
......
...@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; ...@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.gogirl.application.order.serve.OrderManageService;
import com.gogirl.application.user.customer.CustomerBalanceService; import com.gogirl.application.user.customer.CustomerBalanceService;
import com.gogirl.domain.store.store.StoreUser; import com.gogirl.domain.store.store.StoreUser;
import com.gogirl.domain.user.customer.CustomerBalance; import com.gogirl.domain.user.customer.CustomerBalance;
...@@ -91,6 +92,7 @@ public class CustomerBalanceServiceImpl extends ServiceImpl<CustomerBalanceMappe ...@@ -91,6 +92,7 @@ public class CustomerBalanceServiceImpl extends ServiceImpl<CustomerBalanceMappe
} }
private final UserManageMapper userManageMapper; private final UserManageMapper userManageMapper;
private final OrderManageService orderManageService;
@Override @Override
public PageInfo<CustomerBalanceRecord> getBalanceRecordCard(Integer customerId, int pageNum, int pageSize) { public PageInfo<CustomerBalanceRecord> getBalanceRecordCard(Integer customerId, int pageNum, int pageSize) {
...@@ -102,7 +104,7 @@ public class CustomerBalanceServiceImpl extends ServiceImpl<CustomerBalanceMappe ...@@ -102,7 +104,7 @@ public class CustomerBalanceServiceImpl extends ServiceImpl<CustomerBalanceMappe
list.stream() list.stream()
.filter(balanceRecord -> balanceRecord.getType().equals(-1)) .filter(balanceRecord -> balanceRecord.getType().equals(-1))
.forEach(balanceRecord -> { .forEach(balanceRecord -> {
balanceRecord.setOrderManage(orderManageMapper.selectById(Integer.valueOf(balanceRecord.getOrderId()))); balanceRecord.setOrderManage(orderManageService.queryOrder(Integer.valueOf(balanceRecord.getOrderId())));
if (balanceRecord.getOrderAmount() != null && balanceRecord.getOrderAmount() != 0 && balanceRecord.getOrderManage() != null) { if (balanceRecord.getOrderAmount() != null && balanceRecord.getOrderAmount() != 0 && balanceRecord.getOrderManage() != null) {
balanceRecord.getOrderManage().setTotalPrice(new BigDecimal(balanceRecord.getOrderAmount()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP)); balanceRecord.getOrderManage().setTotalPrice(new BigDecimal(balanceRecord.getOrderAmount()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment