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

管理后台订单 VIP和课程不限制七天，后台都可以退款，app限制七天

Browse Source
This commit is contained in:
wyn
2026-05-15 14:42:40 +08:00
parent 8d0d503700
commit 99a873993d
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,10 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.alibaba.fastjson.JSONObject;
import com.peanut.common.utils.DateUtils;
import com.peanut.common.utils.PageUtils;
import com.peanut.common.utils.R;
import com.peanut.common.utils.ShiroUtils;
import com.peanut.common.utils.*;
import com.peanut.config.Constants;
import com.peanut.config.DelayQueueConfig;
import com.peanut.modules.book.service.*;
@@ -41,6 +38,7 @@ import com.peanut.modules.pay.weChatPay.dto.WechatPaymentInfo;
import com.peanut.modules.pay.weChatPay.service.WxpayService;
import com.peanut.modules.sys.entity.SysConfigEntity;
import com.peanut.modules.sys.service.SysConfigService;
import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j;
import org.apache.http.HttpException;
import org.apache.poi.ss.usermodel.Row;
@@ -152,7 +150,9 @@ public class BuyOrderController {
*/
@RequestMapping(path = "/orderList", method = RequestMethod.POST)
public R orderList(@RequestBody BuyOrderListRequestVo requestVo) {
Page<BuyOrder> buyOrderPage = buyOrderService.orderList(requestVo);
HttpServletRequest request = HttpContextUtil.getHttpServletRequest();
Boolean isHT = request.getHeader("appType")==null?true:false;
Page<BuyOrder> buyOrderPage = buyOrderService.orderList(requestVo, isHT);
return R.ok().put("result", buyOrderPage);
}
//导出名医精彩订单

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

@@ -55,6 +55,8 @@ public interface BuyOrderService extends IService<BuyOrder> {
*/
R delivery(String expressCompanyCode, List<Integer> buyOrderDetailId);
Page<BuyOrder> orderList(BuyOrderListRequestVo requestVo, Boolean isHT);
Page<BuyOrder> getUserOrderList(UserOrderDto userOrderDto);
List<BuyOrder> getUserOrderStatusNum(Integer userId);

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

@@ -383,6 +383,15 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
@Override
public Page<BuyOrder> orderList(BuyOrderListRequestVo requestVo) {
Page<BuyOrder> buyOrderPage = this.getOrderList(requestVo,null);
return buyOrderPage;
}
@Override
public Page<BuyOrder> orderList(BuyOrderListRequestVo requestVo, Boolean isHT) {
Page<BuyOrder> buyOrderPage = this.getOrderList(requestVo,isHT);
return buyOrderPage;
}
public Page<BuyOrder> getOrderList(BuyOrderListRequestVo requestVo,Boolean isHT){
MPJLambdaWrapper<BuyOrder> wrapper = new MPJLambdaWrapper<>();
wrapper.selectAll(BuyOrder.class);
wrapper.leftJoin(MyUserEntity.class, MyUserEntity::getId,BuyOrder::getUserId);
@@ -443,6 +452,7 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
if(paymentDateTime > timestamp-7*24*60*60*1000){
refundableStatus = true;
}
refundableStatus = isHT?true:refundableStatus;
b.setVipBuyConfigEntity(vipBuyConfigService.getById(b.getVipBuyConfigId()));
}
//添加商品信息
@@ -460,7 +470,7 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
b1.setProduct(byId);
b1.setExpressOrder(expressOrderDao.selectById(b1.getExpressOrderId()));
boolean refundableStatusProduct = false;
if(b1.getProduct()!=null && b1.getProduct().getGoodsType().equals("05") && (paymentDateTime > timestamp-7*24*60*60*1000)){
if(b1.getProduct()!=null && b1.getProduct().getGoodsType().equals("05") && (paymentDateTime > timestamp-7*24*60*60*1000 || isHT)){
refundableStatusProduct = true;
}else if(b1.getProduct()!=null && !b1.getProduct().getGoodsType().equals("05") && b.getOrderStatus().equals("1")){
refundableStatusProduct = true;