diff --git a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java index b48a3f9..2c0a139 100644 --- a/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java +++ b/src/main/java/com/peanut/modules/book/controller/BuyOrderController.java @@ -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 buyOrderPage = buyOrderService.orderList(requestVo); + HttpServletRequest request = HttpContextUtil.getHttpServletRequest(); + Boolean isHT = request.getHeader("appType")==null?true:false; + Page buyOrderPage = buyOrderService.orderList(requestVo, isHT); return R.ok().put("result", buyOrderPage); } //导出名医精彩订单 diff --git a/src/main/java/com/peanut/modules/book/service/BuyOrderService.java b/src/main/java/com/peanut/modules/book/service/BuyOrderService.java index c9a9a65..c6710ec 100644 --- a/src/main/java/com/peanut/modules/book/service/BuyOrderService.java +++ b/src/main/java/com/peanut/modules/book/service/BuyOrderService.java @@ -55,6 +55,8 @@ public interface BuyOrderService extends IService { */ R delivery(String expressCompanyCode, List buyOrderDetailId); + Page orderList(BuyOrderListRequestVo requestVo, Boolean isHT); + Page getUserOrderList(UserOrderDto userOrderDto); List getUserOrderStatusNum(Integer userId); diff --git a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java index 2fe57a3..ff8357f 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java @@ -383,6 +383,15 @@ public class BuyOrderServiceImpl extends ServiceImpl impl @Override public Page orderList(BuyOrderListRequestVo requestVo) { + Page buyOrderPage = this.getOrderList(requestVo,null); + return buyOrderPage; + } + @Override + public Page orderList(BuyOrderListRequestVo requestVo, Boolean isHT) { + Page buyOrderPage = this.getOrderList(requestVo,isHT); + return buyOrderPage; + } + public Page getOrderList(BuyOrderListRequestVo requestVo,Boolean isHT){ MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); wrapper.selectAll(BuyOrder.class); wrapper.leftJoin(MyUserEntity.class, MyUserEntity::getId,BuyOrder::getUserId); @@ -443,6 +452,7 @@ public class BuyOrderServiceImpl extends ServiceImpl 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 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;