zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/zcc'

Browse Source
This commit is contained in:
wangjinlei
2023-12-19 16:24:15 +08:00
parent d12949549d 9423e99e20
commit 032cfc9266
8 changed files with 85 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/peanut/modules/book/dao/BuyOrderDao.java
View File

@@ -18,7 +18,7 @@ import java.util.List;
@Mapper
public interface BuyOrderDao extends BaseMapper<BuyOrder> {
List<BuyOrder> orderList(BuyOrderListRequestVo requestVo);
List<BuyOrder> orderListCount(BuyOrderListRequestVo requestVo);
int orderListCount(BuyOrderListRequestVo requestVo);
List<BuyOrder> orderStatusNum(Integer userId);

8
src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java
View File

@@ -439,14 +439,17 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
List<BuyOrderResponseVo> data = new ArrayList<>();
requestVo.setIndex((requestVo.getPageIndex()-1)*10);
List<BuyOrder> buyOrderList = buyOrderDao.orderList(requestVo);
int count = buyOrderDao.orderListCount(requestVo).size();
int count = buyOrderDao.orderListCount(requestVo);
for (BuyOrder buyOrder : buyOrderList) {
BuyOrderResponseVo responseVo = setBuyOrderInfo(buyOrder);
data.add(responseVo);
}
Map<String, Object> result = new HashMap<>();
Integer totalSize = count;
Integer totalPage = totalSize / requestVo.getPageSize() + 1;
Integer totalPage = totalSize / requestVo.getPageSize();
if (totalSize % requestVo.getPageSize()!=0){
totalPage = totalPage + 1;
}
result.put("totalDataSize", totalSize);
result.put("totalPage", totalPage);
result.put("data", data);
@@ -614,6 +617,7 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
if ("2".equals(buyOrder.getPaymentMethod())){
LambdaQueryWrapper<PayZfbOrderEntity> w = new LambdaQueryWrapper<>();
w.eq(PayZfbOrderEntity::getRelevanceoid, orderSn);
w.ne(PayZfbOrderEntity::getTradeNo, "");
PayZfbOrderEntity p = payZfbOrderService.getOne(w);
if (p!=null){
outTradeNo = p.getOutTradeNo();