修改vipprice,用户会员类型修改
This commit is contained in:
@@ -2,7 +2,13 @@ package com.peanut.modules.common.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.peanut.common.utils.R;
|
||||
import com.peanut.modules.book.service.BuyOrderProductService;
|
||||
import com.peanut.modules.book.service.ShopProductService;
|
||||
import com.peanut.modules.common.entity.BuyOrder;
|
||||
import com.peanut.modules.common.entity.BuyOrderProduct;
|
||||
import com.peanut.modules.common.entity.ShopProduct;
|
||||
import com.peanut.modules.common.entity.TransactionDetailsEntity;
|
||||
import com.peanut.modules.common.service.BuyOrderService;
|
||||
import com.peanut.modules.common.service.TransactionDetailsService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
@@ -24,6 +30,12 @@ public class TransactionDetailsController {
|
||||
|
||||
@Autowired
|
||||
private TransactionDetailsService transactionDetailsService;
|
||||
@Autowired
|
||||
private BuyOrderService buyOrderService;
|
||||
@Autowired
|
||||
private BuyOrderProductService buyOrderProductService;
|
||||
@Autowired
|
||||
private ShopProductService shopProductService;
|
||||
|
||||
/**
|
||||
* 获取付款记录列表
|
||||
@@ -37,6 +49,29 @@ public class TransactionDetailsController {
|
||||
}
|
||||
wrapper.orderByDesc(TransactionDetailsEntity::getCreateTime);
|
||||
List<TransactionDetailsEntity> list = transactionDetailsService.list(wrapper);
|
||||
for (TransactionDetailsEntity detail:list){
|
||||
if ("购买商品".equals(detail.getOrderType())){
|
||||
String productName = "";
|
||||
String orderSn = detail.getRemark().substring(8);
|
||||
BuyOrder buyOrder = buyOrderService.getOne(new LambdaQueryWrapper<BuyOrder>()
|
||||
.eq(BuyOrder::getOrderSn,orderSn));
|
||||
if (buyOrder!=null){
|
||||
List<BuyOrderProduct> products = buyOrderProductService.list(new LambdaQueryWrapper<BuyOrderProduct>()
|
||||
.eq(BuyOrderProduct::getOrderId,buyOrder.getOrderId()));
|
||||
for (BuyOrderProduct buyOrderProduct : products) {
|
||||
ShopProduct shopProduct = shopProductService.getById(buyOrderProduct.getProductId());
|
||||
if (shopProduct != null){
|
||||
if (StringUtils.isNotBlank(productName)){
|
||||
productName += ";"+shopProduct.getProductName();
|
||||
}else {
|
||||
productName += shopProduct.getProductName();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
detail.setProductName(productName);
|
||||
}
|
||||
}
|
||||
return R.ok().put("transactionDetailsList",list);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user