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

买课的订单状态归转

Browse Source
This commit is contained in:
wangjinlei
2024-04-28 17:55:46 +08:00
parent 57c2633990
commit 97e9aecd68
5 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
View File

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.peanut.common.utils.PageUtils;
import com.peanut.common.utils.R;
import com.peanut.config.Constants;
@@ -274,7 +275,12 @@ public class BuyOrderController {
MyUserEntity user = this.myUserService.getById(buyOrder.getUserId());
if (usePeanutCoin(user, totalPrice,sj_check,scqq_check,wylq_check,prescriot_b_check)) {
// 更新订单状态
buyOrderService.updateOrderStatus(user.getId(), buyOrder.getOrderSn(), "0");
if(buyOrderService.checkWlOrder(buyOrder.getOrderSn())){
buyOrderService.updateOrderStatus(user.getId(), buyOrder.getOrderSn(), "0");
}else{
buyOrderService.updateOrderStatus(user.getId(), buyOrder.getOrderSn(), "2");
}
recordTransaction(buyOrder, user, totalPrice);
addEbookToUser(buyOrderProductList, buyOrder, 0);
addCourseToUser(buyOrder);

3
src/main/java/com/peanut/modules/book/service/BuyOrderService.java
View File

@@ -64,4 +64,7 @@ public interface BuyOrderService extends IService<BuyOrder> {
String mytest() throws IOException;
List<ShopProductCourseEntity> getOrderCourse(String orderSn);
boolean checkWlOrder(String orderSn);
}

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

@@ -14,10 +14,7 @@ import com.peanut.common.utils.PageUtils;
import com.peanut.common.utils.Query;
import com.peanut.common.utils.R;
import com.peanut.config.Constants;
import com.peanut.modules.common.dao.BuyOrderDao;
import com.peanut.modules.common.dao.BuyOrderProductDao;
import com.peanut.modules.common.dao.ExpressOrderDao;
import com.peanut.modules.common.dao.ShopProductBookDao;
import com.peanut.modules.common.dao.*;
import com.peanut.modules.book.service.*;
import com.peanut.modules.book.to.UserOrderDto;
import com.peanut.modules.book.vo.ExpressOrderResponseVo;
@@ -74,7 +71,8 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
@Autowired
private ProvinceService provinceService;
@Autowired
private ShopProductDao shopProductDao;
@Autowired
private CityService cityService;
@Autowired
@@ -608,6 +606,14 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
return shopProductCourseEntities;
}
@Override
public boolean checkWlOrder(String orderSn) {
BuyOrder one = this.getOne(new LambdaQueryWrapper<BuyOrder>().eq(BuyOrder::getOrderSn, orderSn));
List<Integer> collect = buyOrderProductDao.selectList(new LambdaQueryWrapper<BuyOrderProduct>().eq(BuyOrderProduct::getOrderId, one.getOrderId())).stream().map(BuyOrderProduct::getProductId).collect(Collectors.toList());
List<ShopProduct> shopProducts = shopProductDao.selectList(new LambdaQueryWrapper<ShopProduct>().in(ShopProduct::getProductId, collect).ne(ShopProduct::getGoodsType,5));
return shopProducts.size()>0?true:false;
}
@Override
public BuyOrderResponseVo orderDetail(String orderSn) {
QueryWrapper<BuyOrder> buyOrderQueryWrapper = new QueryWrapper<>();

3
src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java
View File

@@ -198,7 +198,8 @@ public class AliPayServiceImpl implements AliPayService {
BuyOrder orderEntity = buyOrderService.getBaseMapper().selectOne(new QueryWrapper<BuyOrder>().eq("order_sn", oldPayZfbOrderEntity.getRelevanceoid()));
//更新 订单 记录
buyOrderService.updateOrderStatus(Integer.valueOf(customerid),oldPayZfbOrderEntity.getRelevanceoid(),"0");
String ActString = buyOrderService.checkWlOrder(orderEntity.getOrderSn())?"0":"2";
buyOrderService.updateOrderStatus(Integer.valueOf(customerid),oldPayZfbOrderEntity.getRelevanceoid(),ActString);
/* 记录用户购买的书籍 */
// 查询订单的所有 book_id

4
src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java
View File

@@ -205,8 +205,8 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
userService.updateById(userInfo);
}
buyOrderService.updateOrderStatus(order.getUserId(), order.getOrderSn(), "0");
String ActString = buyOrderService.checkWlOrder(order.getOrderSn())?"0":"2";
buyOrderService.updateOrderStatus(order.getUserId(), order.getOrderSn(), ActString);
}
if ("point".equals(order.getOrderType())) {
PayWechatOrderEntity buy_order_id = payWechatOrderService.getBaseMapper().selectOne(new QueryWrapper<PayWechatOrderEntity>().eq("order_sn", order.getOrderSn()));