Commit a716b031 by huluobin

用户消费记录

parent 264b2360
...@@ -25,12 +25,7 @@ import com.gogirl.domain.product.serve.BaseProduce; ...@@ -25,12 +25,7 @@ import com.gogirl.domain.product.serve.BaseProduce;
import com.gogirl.domain.product.serve.BaseServe; import com.gogirl.domain.product.serve.BaseServe;
import com.gogirl.domain.product.serve.BaseType; import com.gogirl.domain.product.serve.BaseType;
import com.gogirl.domain.store.store.StoreTechnician; import com.gogirl.domain.store.store.StoreTechnician;
import com.gogirl.domain.user.customer.Customer;
import com.gogirl.domain.user.customer.CustomerBalance;
import com.gogirl.domain.user.customer.CustomerDetail;
import com.gogirl.domain.user.customer.CustomerMessage;
import com.gogirl.domain.user.customer.*; import com.gogirl.domain.user.customer.*;
import com.gogirl.domain.xcx.GogirlToken;
import com.gogirl.infrastructure.common.exception.RRException; import com.gogirl.infrastructure.common.exception.RRException;
import com.gogirl.infrastructure.common.util.JsonUtilByFsJson; import com.gogirl.infrastructure.common.util.JsonUtilByFsJson;
import com.gogirl.infrastructure.common.util.ListUtil; import com.gogirl.infrastructure.common.util.ListUtil;
...@@ -733,7 +728,8 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order ...@@ -733,7 +728,8 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
List<CustomerBalanceRecord> customerBalanceRecordList = customerBalanceRecordMapper.selectList( List<CustomerBalanceRecord> customerBalanceRecordList = customerBalanceRecordMapper.selectList(
new LambdaQueryWrapper<CustomerBalanceRecord>().eq(CustomerBalanceRecord::getCustomerId, customerId) new LambdaQueryWrapper<CustomerBalanceRecord>().eq(CustomerBalanceRecord::getCustomerId, customerId)
.in(CustomerBalanceRecord::getType, Lists.newArrayList(1, 2)) .in(CustomerBalanceRecord::getType, Lists.newArrayList(1, 2))
) );
//7、聚合结果 //7、聚合结果
CustomerOrder customerOrder = new CustomerOrder(); CustomerOrder customerOrder = new CustomerOrder();
customerOrder.setPageInfo(page); customerOrder.setPageInfo(page);
......
...@@ -22,12 +22,6 @@ import com.gogirl.infrastructure.common.util.lock.OrderIdLock; ...@@ -22,12 +22,6 @@ import com.gogirl.infrastructure.common.util.lock.OrderIdLock;
import com.gogirl.infrastructure.mapper.order.serve.OrderCommentMapper; import com.gogirl.infrastructure.mapper.order.serve.OrderCommentMapper;
import com.gogirl.infrastructure.mapper.order.serve.OrderServeDescribeMapper; import com.gogirl.infrastructure.mapper.order.serve.OrderServeDescribeMapper;
import com.gogirl.infrastructure.mapper.product.purchase.PurchaseSkuMapper; import com.gogirl.infrastructure.mapper.product.purchase.PurchaseSkuMapper;
import com.gogirl.shared.order.ListOrderQuery;
import com.gogirl.shared.order.OrderManageDTO;
import com.gogirl.shared.order.OrderPhotoResp;
import com.gogirl.shared.order.RecordOrderDataRequest;
import com.gogirl.infrastructure.util.SessionUtils;
import com.gogirl.infrastructure.util.lock.OrderIdLock;
import com.gogirl.shared.order.*; import com.gogirl.shared.order.*;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
......
...@@ -33,5 +33,5 @@ public class CustomerOrder { ...@@ -33,5 +33,5 @@ public class CustomerOrder {
private Integer totalChargeTimes; private Integer totalChargeTimes;
@ApiModelProperty("累计充值金额") @ApiModelProperty("累计充值金额")
private BigDecimal totalChargeAmount private BigDecimal totalChargeAmount;
} }
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