给指定用户生成制定课程的证书

# Conflicts:
#	src/main/java/com/peanut/modules/common/service/CourseMedicineService.java

src/main/java/com/peanut/config/Constants.java

@@ -27,9 +27,17 @@ public class Constants {
      */
     public static final String ORDER_STATUS_FAIL = "4";
     /**
-     * 订单状态 - 交易失败
+     * 订单状态 - 交易超时
+     */
+    public static final String ORDER_STATUS_TIMEOUT = "5";
+    /**
+     * 订单状态 - 退款
      */
     public static final String ORDER_STATUS_REFUND = "6";
+    /**
+     * 订单状态 - 退款中
+     */
+    public static final String ORDER_STATUS_REFUNDING = "7";
 
     /**
      * 订单状态 - 全部

src/main/java/com/peanut/modules/book/controller/BuyOrderController.java

@@ -6,10 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
-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.alibaba.fastjson.JSONObject;
+import com.peanut.common.utils.*;
 import com.peanut.config.Constants;
 import com.peanut.config.DelayQueueConfig;
 import com.peanut.modules.book.service.*;
@@ -33,11 +31,16 @@ import com.peanut.modules.common.dao.UserCourseBuyDao;
 import com.peanut.modules.common.entity.*;
 import com.peanut.modules.common.service.*;
 import com.peanut.modules.master.service.CourseCatalogueService;
+import com.peanut.modules.pay.alipay.dto.ReFundDTO;
+import com.peanut.modules.pay.alipay.service.AliPayService;
+import com.peanut.modules.pay.weChatPay.dto.WeChatRefundInfo;
 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;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -122,6 +125,8 @@ public class BuyOrderController {
     private BuyOrderRefundService buyOrderRefundService;
     @Autowired
     private BuyOrderRefundLogService buyOrderRefundLogService;
+    @Autowired
+    private AliPayService aliPayService;
 
     @RequestMapping(value = "/decomposeShipment", method = RequestMethod.POST)
     public R decomposeShipment(@RequestBody BuyOrderListRequestVo requestVo) {
@@ -145,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);
     }
     //导出名医精彩订单
@@ -599,24 +606,28 @@ public class BuyOrderController {
             return R.error("退款信息不存在");
         }
         QueryWrapper<BuyOrderRefundLog> wapper2 = new QueryWrapper<>();
-        wapper2.eq("refund_id",refundInfo.getId()).orderByDesc("create_time");
+        wapper2.eq("refund_id",refundInfo.getId()).orderByDesc("id");
         List<BuyOrderRefundLog> list = buyOrderRefundLogService.list(wapper2);
         for (BuyOrderRefundLog log : list){
-            if(log.getType()==1){
+            if(log.getType()==4){
                 log.setTitle("天医币已退还");
                 log.setContent("天医币已退还到账户，可在我的->天医币中查看明细");
-            }else if(log.getType()==2){
+            }else if(log.getType()==5){
                 log.setTitle("积分已退还");
                 log.setContent("积分已退还到账户，可在我的->积分中查看明细");
-            }else if(log.getType()==3){
-                log.setTitle(log.getStatus()==1?"到账成功":"已退款，支付宝处理中");
-                log.setContent(log.getStatus()==1?"已退到您的支付宝，到账时间以支付宝处理时间为准，可前往「支付宝-账单」查看":"已将退款资金提交给支付宝处理，通常情况下，退款会原路退回您的支付账户，预计会在1-7天内到账");
-            }else if(log.getType()==4){
-                log.setTitle(log.getStatus()==1?"到账成功":"已退款，微信处理中");
-                log.setContent(log.getStatus()==1?"已退到您的微信，到账时间以微信处理时间为准，可前往「微信-账单」查看":"已将退款资金提交给微信处理，通常情况下，退款会原路退回您的支付账户，预计会在1-7天内到账");
+            }else if(log.getType()==2){
+                log.setTitle(log.getStatus()==1?"到账成功":(log.getStatus()==2?"支付宝处理中":"提交支付宝处理"));
+                log.setContent(log.getStatus()==1?"已退到您的支付宝，到账时间以支付宝处理时间为准，可前往「支付宝-账单」查看":(log.getStatus()==2?"已将退款提交给支付宝处理":"支付宝处理中，通常情况下，退款会原路退回您的支付账户，预计会在1-7天内到账"));
+            }else if(log.getType()==1){
+                log.setTitle(log.getStatus()==1?"到账成功":(log.getStatus()==2?"微信处理中":"提交微信处理"));
+                log.setContent(log.getStatus()==1?"已退到您的微信，到账时间以微信处理时间为准，可前往「微信-账单」查看":(log.getStatus()==2?"已将退款提交给微信处理":"微信处理中，通常情况下，退款会原路退回您的支付账户，预计会在1-7天内到账"));
+            }else if(log.getType()==0){
+                log.setTitle("发起退款");
+                log.setContent("系统会在1-2天内提交处理");
             }
+
         }
-        BuyOrderRefundLog log = new BuyOrderRefundLog();
+       /* BuyOrderRefundLog log = new BuyOrderRefundLog();
         log.setId(0);
         log.setRefundId(refundInfo.getId());
         log.setType(0);
@@ -624,7 +635,7 @@ public class BuyOrderController {
         log.setCreateTime(refundInfo.getCreateTime());
         log.setTitle("发起退款");
         log.setContent("系统会在1-2天内提交处理");
-        list.add(log);
+        list.add(log);*/
 
         Map<String,Object> result = new HashMap<>();
         BigDecimal shippingMoney = refundInfo.getDeductShipping()==1?refundInfo.getShippingMoney():BigDecimal.ZERO;
@@ -654,20 +665,19 @@ public class BuyOrderController {
         if (user == null) {
             return R.error("订单对应用户不存在");
         }
-
-        if (Constants.ORDER_STATUS_TO_BE_PAID.equals(buyOrder.getOrderStatus())
+        if(Constants.ORDER_STATUS_REFUND.equals(buyOrder.getOrderStatus())
+                || Constants.ORDER_STATUS_REFUNDING.equals(buyOrder.getOrderStatus())){
+            return R.error("请勿重复提交退款");
+        }else if (Constants.ORDER_STATUS_TO_BE_PAID.equals(buyOrder.getOrderStatus())
                 || Constants.ORDER_STATUS_FAIL.equals(buyOrder.getOrderStatus())
-                || Constants.ORDER_STATUS_REFUND.equals(buyOrder.getOrderStatus())
                 || Constants.ORDER_STATUS_OUT_OF_TIME.equals(buyOrder.getOrderStatus())) {
             return R.error("当前订单状态不支持退单");
         }
-//        QueryWrapper<BuyOrderRefund> refundQueryWrapper = new QueryWrapper<>();
-//        refundQueryWrapper.eq("order_id",buyOrder.getOrderId());
-//        long refundOrderNums = buyOrderRefundService.count(refundQueryWrapper);
-        if(buyOrder.getOrderStatus().equals(Constants.ORDER_STATUS_REFUND)){
-            return R.error("请勿重复申请退款");
+        if(buyOrder.getOrderType().equals("vip")&& buyOrderService.hasYQOrder(buyOrder)){
+            return R.error("需要先退掉当前VIP下的延期");
         }
-        buyOrder.setOrderStatus(Constants.ORDER_STATUS_REFUND);
+        //设置状态为退款中
+        buyOrder.setOrderStatus(Constants.ORDER_STATUS_REFUNDING);
         buyOrderService.updateById(buyOrder);
 
         BigDecimal refundFee = buyOrder.getRealMoney();
@@ -679,13 +689,13 @@ public class BuyOrderController {
         }
         String remark = params.containsKey("remark") && params.get("remark").toString()!=null?params.get("remark").toString():"";
 
-        String refundNo = buyOrderRefundService.genRefundNo();
         BuyOrderRefund buyOrderRefund = new BuyOrderRefund();
+        String refundNo = buyOrderRefundService.genRefundNo();
         buyOrderRefund.setRefundNo(refundNo);
         buyOrderRefund.setOrderId(buyOrder.getOrderId());
         buyOrderRefund.setOrderSn(buyOrder.getOrderSn());
         buyOrderRefund.setUserId(buyOrder.getUserId());
-        buyOrderRefund.setType("线上"); //id
+        buyOrderRefund.setType(params.containsKey("deductShipping")?"后台":"线上"); //id
         buyOrderRefund.setPayType(buyOrder.getPaymentMethod());
         buyOrderRefund.setFee(refundFee);
         buyOrderRefund.setJfDeduction(buyOrder.getJfDeduction());
@@ -694,20 +704,79 @@ public class BuyOrderController {
         buyOrderRefund.setRemark(remark);
         buyOrderRefundService.save(buyOrderRefund);
 
-        int refundId = buyOrderRefund.getId();
+        buyOrderRefundLogService.insertRefundLog(buyOrderRefund.getId(),0,1);
 
+        int refundId = buyOrderRefund.getId();
         if (Constants.PAYMENT_METHOD_VIRTUAL.equals(buyOrder.getPaymentMethod())) {
-            //BigDecimal refundPeanutCoin = buyOrder.getRealMoney() == null?BigDecimal.ZERO : buyOrder.getRealMoney();
-            if(refundFee.compareTo(BigDecimal.ZERO)>0){
+            //if(refundFee.compareTo(BigDecimal.ZERO)>0){
+                //退还虚拟币
                 transactionDetailsService.refundRecord(buyOrder,user,refundFee);
                 user.setPeanutCoin(user.getPeanutCoin().add(refundFee));
                 myUserService.updateById(user);
-                buyOrderRefundLogService.insertRefundLog(refundId,1,1);
+                //记录退款进度
+                buyOrderRefundLogService.insertRefundLog(refundId,4,1);
+                //积分、其他权益退回
+                buyOrderService.refundOrder(buyOrder,user,refundId);
+                //更改订单状态为已退款
+                buyOrder.setOrderStatus(Constants.ORDER_STATUS_REFUND);
+                buyOrderService.updateById(buyOrder);
+                return R.ok("ok");
+            //}
+        } else if (Constants.PAYMENT_METHOD_WECHAT_PAY.equals(buyOrder.getPaymentMethod())) {
+            buyOrderRefundLogService.insertRefundLog(refundId,1,0);
+            if (refundFee.compareTo(BigDecimal.ZERO) > 0) {
+                WeChatRefundInfo weChatRefundInfo = new WeChatRefundInfo();
+                weChatRefundInfo.setOrderSn(buyOrder.getOrderSn());
+                weChatRefundInfo.setOrderId(buyOrder.getOrderId());
+                weChatRefundInfo.setOrderType(buyOrder.getOrderType());
+                weChatRefundInfo.setRefundNo(buyOrderRefund.getRefundNo());
+                weChatRefundInfo.setTotalAmount(buyOrder.getRealMoney());
+                weChatRefundInfo.setRefundAmount(buyOrderRefund.getFee());
+                weChatRefundInfo.setRemark("用户申请退款");
+                weChatRefundInfo.setRefundId(buyOrderRefund.getId());
+                if(buyOrder.getCome()==null||buyOrder.getCome()==0){
+                    weChatRefundInfo.setAppName(buyOrder.getAppName());
+                } else if (buyOrder.getCome()==2){
+                    weChatRefundInfo.setAppName("wumen");
+                } else if (buyOrder.getCome()==1) {
+                    weChatRefundInfo.setAppName("zmzm");
+                } else if (buyOrder.getCome()==3) {
+                    weChatRefundInfo.setAppName("xlkj");
+                } else if (buyOrder.getCome()==4) {
+                    weChatRefundInfo.setAppName("thyy");
+                }
+                try {
+                    wxpayService.refund(weChatRefundInfo);
+                } catch (Exception e) {
+                    System.out.println("msg=" + e.getMessage());
+                }
+            }
+        }else if (Constants.PAYMENT_METHOD_ALI_PAY.equals(buyOrder.getPaymentMethod())) {
+            buyOrderRefundLogService.insertRefundLog(refundId,2,0);
+            if (refundFee.compareTo(BigDecimal.ZERO) > 0) {
+                aliPayService.refund(buyOrder,user,buyOrderRefund);
             }
         }
-
-        buyOrderService.refundOrder(buyOrder,user,refundId);
+//        else if (Constants.PAYMENT_METHOD_ALI_PAY.equals(buyOrder.getPaymentMethod())) {
+//            buyOrderRefundLogService.insertRefundLog(refundId,2,0);
+//            if (refundFee.compareTo(BigDecimal.ZERO) > 0) {
+//                Map<String, Object> refundParams = new HashMap<>();
+//                refundParams.put("orderSn", buyOrder.getOrderSn());
+//                refundParams.put("refundFee", refundFee);
+//                String refundResult = aliPayService.refund(refundParams);
+//                JSONObject resultJson = JSONObject.parseObject(refundResult);
+//                JSONObject responseJson = resultJson.getJSONObject("alipay_trade_refund_response");
+//                if (responseJson == null
+//                        || !"10000".equals(responseJson.getString("code"))
+//                        || !"Y".equals(responseJson.getString("fund_change"))) {
+//                    return R.error("支付宝退款申请失败");
+//                }else{
+//                    buyOrderRefundLogService.insertRefundLog(refundId,3,2);
+//                }
+//            }
+//        }
         return R.ok("ok");
+
     }
     @RequestMapping("/llll")
     public R ls(){

src/main/java/com/peanut/modules/book/controller/ShopProductController.java

@@ -388,10 +388,12 @@ public class ShopProductController {
             shopProduct.setBookId("");
         }
         shopProductService.save(shopProduct);
-        ShopProductBookEntity shopProductBookEntity = new ShopProductBookEntity();
+
         for (String s : shopProduct.getBookids()) {
             String bookIdList = s;
             if (bookIdList != null) {
+                ShopProductBookEntity shopProductBookEntity = new ShopProductBookEntity();
+
                 Integer product = shopProduct.getProductId();
                 shopProductBookEntity.setProductId(product);
                 shopProductBookEntity.setBookId(Integer.valueOf(bookIdList));

src/main/java/com/peanut/modules/book/service/BuyOrderService.java

@@ -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);
@@ -74,4 +76,6 @@ public interface BuyOrderService extends IService<BuyOrder> {
     BigDecimal getRefundFee(Map<String, Object> params, BuyOrder buyOrder);
 
     void refundOrder(BuyOrder buyOrder, MyUserEntity user, int refundId);
+
+    boolean hasYQOrder(BuyOrder buyOrder);
 }

src/main/java/com/peanut/modules/book/service/MyUserService.java

@@ -35,7 +35,8 @@ public interface MyUserService extends IService<MyUserEntity> {
 
     boolean checkUserTelOrEmail(MyUserEntity user);
 
-    void rollbackUserPowers(BuyOrder order, List<BuyOrderProduct> orderProducts);
+    //void rollbackUserPowers(BuyOrder order, List<BuyOrderProduct> orderProducts);
 
+    void rollbackUserPowers(BuyOrder order, MyUserEntity user, List<BuyOrderProduct> orderProducts);
 }
 

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

@@ -17,7 +17,6 @@ import com.peanut.modules.book.service.CountyService;
 import com.peanut.modules.book.service.ExpressOrderService;
 import com.peanut.modules.book.service.MyUserService;
 import com.peanut.modules.book.service.ProvinceService;
-import com.peanut.modules.book.vo.UserVipYearVo;
 import com.peanut.modules.common.dao.*;
 import com.peanut.modules.book.service.*;
 import com.peanut.modules.book.to.UserOrderDto;
@@ -29,9 +28,7 @@ import com.peanut.modules.common.entity.*;
 import com.peanut.modules.common.service.*;
 import com.peanut.modules.common.vo.CourseCatalogueVo;
 import com.peanut.modules.oss.service.OssService;
-import com.qiniu.util.Json;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.time.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -119,6 +116,8 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
     private UserVipLogDao userVipLogDao;
     @Autowired
     private UserVipDao userVipDao;
+    @Autowired
+    private VipBuyConfigDao vipBuyConfigDao;
 
     // TODO 新版本上线后删除
     @Override
@@ -223,6 +222,8 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
         } else if (type.equals("2")) {
             orderEntity.setPaymentDate(new Date());
             orderEntity.setOrderStatus("3");
+        }else if (type.equals("6")) {
+            orderEntity.setOrderStatus("6");
         }
         updateById(orderEntity);
     }
@@ -384,6 +385,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);
@@ -444,6 +454,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()));
             }
             //添加商品信息
@@ -461,9 +472,9 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
                     b1.setProduct(byId);
                     b1.setExpressOrder(expressOrderDao.selectById(b1.getExpressOrderId()));
                     boolean refundableStatusProduct = false;
-                    if(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().getGoodsType().equals("05") && b.getOrderStatus().equals("1")){
+                    }else if(b1.getProduct()!=null && !b1.getProduct().getGoodsType().equals("05") && b.getOrderStatus().equals("1") && b1.getExpressOrderId()==0){
                         refundableStatusProduct = true;
                     }
                     refundableStatusArr[i] = refundableStatusProduct;
@@ -478,12 +489,10 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
                 }
             }
             if(b.getOrderStatus().equals(Constants.ORDER_STATUS_REFUND)){
-                QueryWrapper<BuyOrderRefund> wrapperRefund = new QueryWrapper<>();
-                wrapperRefund.eq("order_id",b.getOrderId());
-                BuyOrderRefund refundInfo = buyOrderRefundService.getOne(wrapperRefund);
+                BuyOrderRefund refundInfo = buyOrderRefundService.getRefundInfoByOrderId(b.getOrderId());
                 b.setRefundRemark(refundInfo.getRemark());
             }
-            b.setRefundableStatus(b.getOrderStatus().equals("6")?false:refundableStatus);
+            b.setRefundableStatus(b.getOrderStatus().equals("6")|| b.getOrderStatus().equals("7")?false:refundableStatus);
             b.setProductList(buyOrderProducts);
             //设置快递信息传递给前端
             ConsigneeVo consigneeVo = new ConsigneeVo();
@@ -539,7 +548,7 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
         wrapper.eq(BuyOrder::getUserId,userOrderDto.getUserId());
 //        wrapper.eq(BuyOrder::getOrderType,"order");//这里有点问题
         if(userOrderDto.getOrderStatus()==null){
-            Integer[] sts = {0,1,2,3,6};
+            Integer[] sts = {0,1,2,3,6,7};
             wrapper.in(BuyOrder::getOrderStatus,sts);
         }else{
             wrapper.eq(BuyOrder::getOrderStatus,userOrderDto.getOrderStatus());
@@ -572,9 +581,9 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
                         bb.setRecordId(userRecord.getId());
                     }
                     boolean refundableStatusProduct = false;
-                    if (bb.getProduct().getGoodsType().equals("05") && paymentDateTime > timestamp - 7 * 24 * 60 * 60 * 1000) {
+                    if (bb.getProduct()!=null && bb.getProduct().getGoodsType().equals("05") && paymentDateTime > timestamp - 7 * 24 * 60 * 60 * 1000) {
                         refundableStatusProduct = true;
-                    } else if (!bb.getProduct().getGoodsType().equals("05") && b.getOrderStatus().equals(Constants.ORDER_STATUS_TO_BE_SHIPPED)){
+                    } else if (bb.getProduct()!=null && !bb.getProduct().getGoodsType().equals("05") && b.getOrderStatus().equals(Constants.ORDER_STATUS_TO_BE_SHIPPED) && bb.getExpressOrderId()==0){
                         refundableStatusProduct = true;
                     }
                     refundableStatusArr[i] = refundableStatusProduct;
@@ -588,7 +597,7 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
                     }
                 }
             }
-            b.setRefundableStatus(b.getOrderStatus().equals("6")?false:refundableStatus);
+            b.setRefundableStatus(b.getOrderStatus().equals("6") || b.getOrderStatus().equals("7")?false:refundableStatus);
             b.setProductList(buyOrderProducts);
             b.setTimestamp(b.getCreateTime().getTime()/1000);
             //充值订单填充充值商品信息
@@ -737,10 +746,14 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
     public void removeCourseToUser(BuyOrder orderEntity){
         QueryWrapper<UserCourseBuyLog> buyLogQueryWrapper = new QueryWrapper<>();
         buyLogQueryWrapper.eq("order_sn",orderEntity.getOrderSn());
+        log.info("order+sn===="+orderEntity.getOrderSn());
         List<UserCourseBuyLog> userCourseBuyLogList = userCourseBuyLogDao.selectList(buyLogQueryWrapper);
+        log.info("size===="+userCourseBuyLogList.size());
         for (UserCourseBuyLog userCourseBuyLog:userCourseBuyLogList){
-            userCourseBuyDao.deleteById(userCourseBuyLog.getUserCourseBuyId());
-            userCourseBuyLogDao.deleteById(userCourseBuyLog.getId());
+            log.info("===delete====="+userCourseBuyLog.getUserCourseBuyId());
+            log.info("===delete2====="+userCourseBuyLog.getId());
+            userCourseBuyDao.realDeleteById(userCourseBuyLog.getUserCourseBuyId());
+            userCourseBuyLogDao.realDeleteById(userCourseBuyLog.getId());
         }
     }
     @Override
@@ -1062,7 +1075,7 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
         return refundFee;
     }
     @Override
-    public void refundOrder(BuyOrder buyOrder, MyUserEntity user, int refundId){
+    public void  refundOrder(BuyOrder buyOrder, MyUserEntity user, int refundId){
         if(buyOrder.getCouponId()!=null && buyOrder.getCouponId()!=0){
             couponService.rollbackCoupon(buyOrder.getCouponId());
         }
@@ -1076,23 +1089,53 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
             jfTransactionDetailsService.refundJfTransaction(buyOrder,user);
             user.setJf(jf.add(user.getJf()));
             myUserService.updateById(user);
-            buyOrderRefundLogService.insertRefundLog(refundId,2,1);
+            buyOrderRefundLogService.insertRefundLog(refundId,5,1);
         }
         if(buyOrder.getOrderType().equals("vip")){
             userVipService.refundVip(buyOrder);
         }else{
+            //恢复用户权益（点穴/时辰取穴/五运六气/肿瘤古方）
+            myUserService.rollbackUserPowers(buyOrder,user, orderProducts);
             //撤回本订单购买赠送的优惠券
             couponService.refundZSCouponHistoryByOrder(buyOrder);
-            /*//恢复用户权益（点穴/时辰取穴/五运六气/肿瘤古方）
-            myUserService.rollbackUserPowers(buyOrder, orderProducts);*/
             //撤回电子书权限
             userEbookBuyService.rollbackUserEbooks(buyOrder, orderProducts);
             //撤回课程权限
+            log.info("====remove========="+buyOrder.getOrderSn());
             removeCourseToUser(buyOrder);
             //回滚库存
             shopProductService.rollbackStock(buyOrder);
         }
-
     }
 
+    /**
+     * 判断该VIP后，是否办理过延期VIP,退VIP时，如果在此VIP后办理过延期，需要把延期退掉才可以退此订单
+     * @param buyOrder
+     * @return
+     */
+    @Override
+    public boolean hasYQOrder(BuyOrder buyOrder){
+        VipBuyConfigEntity vipBuyConfig = vipBuyConfigService.getById(buyOrder.getVipBuyConfigId());
+        if(vipBuyConfig.getType()<=10){
+            List<String> typeStrs = new ArrayList<>();
+            if(vipBuyConfig.getType()==1){
+                typeStrs.add("41");
+                typeStrs.add("91");
+                typeStrs.add("51");
+                typeStrs.add("41");
+                typeStrs.add("61");
+                typeStrs.add("101");
+            }else if(vipBuyConfig.getType()==2){
+                typeStrs.add("71");
+                typeStrs.add("81");
+            }else{
+                typeStrs.add(vipBuyConfig.getType()+"1");
+            }
+            List<Integer> vipBuyConfigIdList = vipBuyConfigDao.selectList(new LambdaQueryWrapper<VipBuyConfigEntity>().in(VipBuyConfigEntity::getType,typeStrs)).stream().map(VipBuyConfigEntity::getId).collect(Collectors.toList());
+            Long nums = buyOrderDao.selectCount(new LambdaQueryWrapper<BuyOrder>().in(BuyOrder::getVipBuyConfigId,vipBuyConfigIdList).eq(BuyOrder::getOrderStatus,3).gt(BuyOrder::getCreateTime, buyOrder.getCreateTime()));
+            log.info("=====hasYQOrder===="+nums);
+            return nums>0?true:false;
+        }
+        return false;
+    }
 }

src/main/java/com/peanut/modules/book/service/impl/MyUserServiceImpl.java

@@ -102,9 +102,8 @@ public class MyUserServiceImpl extends ServiceImpl<MyUserDao, MyUserEntity> impl
         MyUserEntity one = getOne(wrapper);
         return one == null;
     }
-
-    public void rollbackUserPowers(BuyOrder order, List<BuyOrderProduct> orderProducts) {
-        MyUserEntity user = getById(order.getUserId());
+    @Override
+    public void rollbackUserPowers(BuyOrder order, MyUserEntity user, List<BuyOrderProduct> orderProducts) {
         if(user == null){
             return;
         }

src/main/java/com/peanut/modules/book/service/impl/TransactionDetailsServiceImpl.java

@@ -88,6 +88,7 @@ public class TransactionDetailsServiceImpl extends ServiceImpl<TransactionDetail
         TransactionDetailsEntity transactionDetailsEntity = new TransactionDetailsEntity();
         transactionDetailsEntity.setUserId(user.getId());
         transactionDetailsEntity.setOrderType("订单退款");
+        transactionDetailsEntity.setPayNo(buyOrder.getOrderSn());
         transactionDetailsEntity.setChangeAmount(refundPrice);
         transactionDetailsEntity.setUserBalance(user.getPeanutCoin().add(refundPrice));
         transactionDetailsEntity.setRelationId(buyOrder.getOrderId());

src/main/java/com/peanut/modules/book/vo/UserVipYearVo.java

@@ -1,7 +1,5 @@
 package com.peanut.modules.book.vo;
 
-import com.spire.ms.System.DateTime;
-
 import java.io.Serializable;
 import java.util.Date;
 

src/main/java/com/peanut/modules/common/controller/ClassController.java

@@ -494,7 +494,6 @@ public class ClassController {
             }
         }
     }
-
     //结班
     @RequestMapping("/closeClass")
     @Transactional
@@ -641,7 +640,4 @@ public class ClassController {
         List<UserCertificate> userCertificate = userCertificateService.list(wrapper);
         return R.ok().put("userCertificate",userCertificate);
     }
-
-
-
 }

src/main/java/com/peanut/modules/common/controller/TransactionDetailsController.java

@@ -55,7 +55,7 @@ public class TransactionDetailsController {
             BuyOrder buyOrder = buyOrderService.getOne(new LambdaQueryWrapper<BuyOrder>()
                     .eq(BuyOrder::getOrderSn,orderSn));
             if (buyOrder!=null){
-                if ("购买商品".equals(detail.getOrderType())){
+                if ("购买商品".equals(detail.getOrderType())||"订单退款".equals(detail.getOrderType())){
                     List<BuyOrderProduct> products = buyOrderProductService.list(new LambdaQueryWrapper<BuyOrderProduct>()
                             .eq(BuyOrderProduct::getOrderId,buyOrder.getOrderId()));
                     for (BuyOrderProduct buyOrderProduct : products) {

src/main/java/com/peanut/modules/common/controller/UserVipController.java

@@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.transaction.Transactional;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -70,12 +71,14 @@ public class UserVipController {
             List<UserVip> l9 = userVipService.list(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId,ShiroUtils.getUId()).eq(UserVip::getType,9).orderByDesc(UserVip::getEndTime));
             List<UserVip> l5 = userVipService.list(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId,ShiroUtils.getUId()).eq(UserVip::getType,5).orderByDesc(UserVip::getEndTime));
             List<UserVip> l6 = userVipService.list(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId,ShiroUtils.getUId()).eq(UserVip::getType,6).orderByDesc(UserVip::getEndTime));
-            if (l4.size()>0&&l9.size()>0&&l5.size()>0&&l6.size()>0){
+            List<UserVip> l10 = userVipService.list(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId,ShiroUtils.getUId()).eq(UserVip::getType,10).orderByDesc(UserVip::getEndTime));
+            if (l4.size()>0&&l9.size()>0&&l5.size()>0&&l6.size()>0&&l10.size()>0){
                 Date t4 = l4.get(0).getEndTime();
                 Date t9 = l9.get(0).getEndTime();
                 Date t5 = l5.get(0).getEndTime();
                 Date t6 = l6.get(0).getEndTime();
-                if (t4.getTime()==t9.getTime()&&t9.getTime()==t5.getTime()&&t5.getTime()==t6.getTime()){
+                Date t10 = l10.get(0).getEndTime();
+                if (t4.getTime()==t9.getTime()&&t9.getTime()==t5.getTime()&&t5.getTime()==t6.getTime()&&t6.getTime()==t10.getTime()){
                     Map map = new HashMap();
                     map.put("type",1);
                     map.put("endTime",t4);
@@ -98,6 +101,10 @@ public class UserVipController {
                     map6.put("type",6);
                     map6.put("endTime",t6);
                     tempList.add(map6);
+                    Map map10 = new HashMap();
+                    map10.put("type",10);
+                    map10.put("endTime",t10);
+                    tempList.add(map10);
                     tempList = tempList.stream().sorted((map1,map2)->{
                         return Long.compare(((Date)map1.get("endTime")).getTime(),((Date)map2.get("endTime")).getTime());
                     }).collect(Collectors.toList());
@@ -133,6 +140,13 @@ public class UserVipController {
                     resList.add(map);
 
                 }
+                if (l10.size()>0){
+                    Map map = new HashMap();
+                    map.put("type",10);
+                    map.put("endTime",l10.get(0).getEndTime());
+                    resList.add(map);
+
+                }
             }
         }
         List<UserVip> l7 = userVipService.list(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId,ShiroUtils.getUId()).eq(UserVip::getType,7).orderByDesc(UserVip::getEndTime));
@@ -201,6 +215,7 @@ public class UserVipController {
             ll.add(Arrays.asList(9));
             ll.add(Arrays.asList(5));
             ll.add(Arrays.asList(6));
+            ll.add(Arrays.asList(10));
             ll.add(Arrays.asList(2));
             ll.add(Arrays.asList(7,8));
         }
@@ -311,6 +326,7 @@ public class UserVipController {
         ll.add(Arrays.asList(9));
         ll.add(Arrays.asList(5));
         ll.add(Arrays.asList(6));
+        ll.add(Arrays.asList(10));
         ll.add(Arrays.asList(2));
         ll.add(Arrays.asList(7,8));
         List<Map<String,Object>> resList = new ArrayList<>();
@@ -345,7 +361,22 @@ public class UserVipController {
     @RequestMapping("/ownCourseCatalogueByVip")
     public R ownCourseCatalogueByVip(@RequestBody Map<String,Object> params) {
         UserVip userVip = userVipService.ownCourseCatalogueByVip(Integer.parseInt(params.get("courseId").toString()));
-        return R.ok().put("userVip", userVip);
+        Map<String,Object> userVipInfo = new HashMap<>();
+        if(userVip!=null){
+            userVipInfo.put("id",userVip.getId());
+            userVipInfo.put("userId",userVip.getUserId());
+            userVipInfo.put("type",userVip.getType());
+            userVipInfo.put("startTime",userVip.getStartTime());
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            userVipInfo.put("endTime",sdf.format(userVip.getEndTime()));
+            userVipInfo.put("state",userVip.getState());
+            userVipInfo.put("delFlag",userVip.getDelFlag());
+            userVipInfo.put("user",userVip.getUser());
+            userVipInfo.put("userVipLogs",userVip.getUserVipLogs());
+        }else{
+            userVipInfo = null;
+        }
+        return R.ok().put("userVip", userVipInfo);
     }
 
     //当前课程属于什么会员
@@ -369,10 +400,12 @@ public class UserVipController {
     public R placeVipOrder(@RequestBody BuyOrder buyOrder){
         int uid = ShiroUtils.getUId();
         buyOrder.setOrderStatus("0");
+        buyOrder.setPaymentDate(new Date());
         buyOrder.setOrderType("vip");
         String timeId = IdWorker.getTimeId().substring(0, 32);
         buyOrder.setOrderSn(timeId);
         buyOrder.setUserId(uid);
+        buyOrder.setPaymentDate(new Date());
         buyOrderService.save(buyOrder);
         BigDecimal totalPrice = buyOrder.getRealMoney();
         if (Constants.PAYMENT_METHOD_VIRTUAL.equals(buyOrder.getPaymentMethod())) {
@@ -469,7 +502,7 @@ public class UserVipController {
         Map map = new HashMap();
         map.put("courseCount",0);
         map.put("originalPrice",0);
-        if ("4".equals(type)||"9".equals(type)||"5".equals(type)||"6".equals(type)){
+        if ("4".equals(type)||"9".equals(type)||"5".equals(type)||"6".equals(type)||"10".equals(type)){
             List list = new ArrayList<>();
             if ("4".equals(type)){
                 userVipService.bottomLabel(1,list);
@@ -479,6 +512,8 @@ public class UserVipController {
                 userVipService.bottomLabel(2,list);
             }else if ("6".equals(type)){
                 userVipService.bottomLabel(5,list);
+            }else if ("10".equals(type)){
+                userVipService.bottomLabel(109,list);
             }
             if (list.size()>0){
                 MPJLambdaWrapper<CourseCatalogueEntity> wrapper = new MPJLambdaWrapper();

src/main/java/com/peanut/modules/common/dao/ClassExamOptionDao.java

@@ -2,9 +2,12 @@ package com.peanut.modules.common.dao;
 
 import com.github.yulichang.base.MPJBaseMapper;
 import com.peanut.modules.common.entity.ClassExamOption;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface ClassExamOptionDao extends MPJBaseMapper<ClassExamOption> {
+    @Delete("DELETE FROM class_exam_option WHERE subject_id = #{subjectId}")
+    int realDeleteClassExamOption(int subjectId);
 }
 

src/main/java/com/peanut/modules/common/dao/UserCourseBuyDao.java

@@ -2,6 +2,7 @@ package com.peanut.modules.common.dao;
 
 import com.github.yulichang.base.MPJBaseMapper;
 import com.peanut.modules.common.entity.UserCourseBuyEntity;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -18,4 +19,7 @@ public interface UserCourseBuyDao extends MPJBaseMapper<UserCourseBuyEntity> {
     List<Map<String,Object>> getIncome(@Param("date") String date);
 
     List<Map<String,Object>> getCoursePurchaseDetails(int courseId,int catalogueId,Integer limit,Integer offset);
+
+    @Delete("DELETE FROM user_course_buy WHERE id = #{userCourseBuyId}")
+    int realDeleteById(int userCourseBuyId);
 }

src/main/java/com/peanut/modules/common/dao/UserCourseBuyLogDao.java

@@ -2,8 +2,11 @@ package com.peanut.modules.common.dao;
 
 import com.github.yulichang.base.MPJBaseMapper;
 import com.peanut.modules.common.entity.UserCourseBuyLog;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface UserCourseBuyLogDao extends MPJBaseMapper<UserCourseBuyLog> {
+    @Delete("DELETE FROM user_course_buy_log WHERE id = #{userCourseBuyLogId}")
+    int realDeleteById(int userCourseBuyLogId);
 }

src/main/java/com/peanut/modules/common/dao/UserVipLogDao.java

@@ -1,6 +1,5 @@
 package com.peanut.modules.common.dao;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.peanut.modules.common.entity.UserVipLog;
 import org.apache.ibatis.annotations.Mapper;
@@ -15,4 +14,6 @@ public interface UserVipLogDao extends MPJBaseMapper<UserVipLog> {
     List<Map<String,Object>> getUserVipLogInfo(@Param("date") String date);
 
     Map<String,Object> getUserVipLogInfoTotal(@Param("date") String date);
+
+    List<Map<String,Object>> getUserVipRefundInfo(@Param("date") String last_l_date,@Param("date") String last_date);
 }

src/main/java/com/peanut/modules/common/entity/BuyOrderRefund.java

@@ -29,6 +29,8 @@ public class BuyOrderRefund implements Serializable {
     private int deductShipping;
     //商品名称
     private String title;
+    private int status;
     private String remark;
     private Date createTime;
+    private String wxRefundNo;
 }

src/main/java/com/peanut/modules/common/entity/BuyOrderRefundLog.java

@@ -27,7 +27,7 @@ public class BuyOrderRefundLog implements Serializable {
     private Date createTime;
     private int type;
     private int status;
-
+    private int reason;
     @TableField(exist = false)
     private String title;
 

src/main/java/com/peanut/modules/common/service/BuyOrderRefundLogService.java

@@ -6,4 +6,5 @@ import com.peanut.modules.common.entity.BuyOrderRefundLog;
 
 public interface BuyOrderRefundLogService extends IService<BuyOrderRefundLog> {
     void insertRefundLog(int buyOrderRefundId, int type, int status);
+    void insertRefundLog(int buyOrderRefundId, int type, int status, String reason);
 }

src/main/java/com/peanut/modules/common/service/BuyOrderRefundService.java

@@ -9,4 +9,6 @@ import java.math.BigDecimal;
 public interface BuyOrderRefundService extends IService<BuyOrderRefund> {
     int insertBuyOrderRefund(BuyOrder buyOrder, BigDecimal refundFee, int deductShipping,String remark);
     String genRefundNo();
+
+    BuyOrderRefund getRefundInfoByOrderId(int orderId);
 }

src/main/java/com/peanut/modules/common/service/ClassEntityService.java

@@ -105,7 +105,9 @@ public interface ClassEntityService extends IService<ClassEntity> {
 
     List userScoreList(Map<String,Object> params);
 
-    List<Map<String,Object>> classCourseInfoClassId(int classId,int courseId);
+    Map<String,Object> getClassCourseInfoByClassId(int classId, int courseId);
+
+    List<Map<String,Object>> classCourseInfoClassId(int classId, int courseId);
 
     R closeClass(Map<String,Object> params);
 

src/main/java/com/peanut/modules/common/service/CourseMedicineService.java

@@ -0,0 +1,7 @@
+package com.peanut.modules.common.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.peanut.modules.common.entity.CourseMedicine;
+
+public interface CourseMedicineService extends IService<CourseMedicine> {
+}

src/main/java/com/peanut/modules/common/service/UserVipLogService.java

@@ -22,6 +22,8 @@ public interface UserVipLogService extends IService<UserVipLog> {
 
     List<Map<String,Object>> getUserVipLogInfo(String date);
 
+    List<Map<String, Object>> getUserVipRefundInfo(String last_l_date, String last_date);
+
     Map<String, Object> getUserVipLogInfoTotal(String date);
 
 }

src/main/java/com/peanut/modules/common/service/impl/BuyOrderRefundLogServiceImpl.java

@@ -2,6 +2,7 @@ package com.peanut.modules.common.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.peanut.modules.common.dao.BuyOrderRefundLogDao;
+import com.peanut.modules.common.entity.BuyOrder;
 import com.peanut.modules.common.entity.BuyOrderRefund;
 import com.peanut.modules.common.entity.BuyOrderRefundLog;
 import com.peanut.modules.common.service.BuyOrderRefundLogService;
@@ -19,4 +20,12 @@ public class BuyOrderRefundLogServiceImpl extends ServiceImpl<BuyOrderRefundLogD
         log.setStatus(status);
         this.save(log);
     }
+    @Override
+    public void insertRefundLog(int refundId, int type, int status, String reason){
+        BuyOrderRefundLog log = new BuyOrderRefundLog();
+        log.setRefundId(refundId);
+        log.setType(type);
+        log.setStatus(status);
+        this.save(log);
+    }
 }

src/main/java/com/peanut/modules/common/service/impl/BuyOrderRefundServiceImpl.java

@@ -1,5 +1,6 @@
 package com.peanut.modules.common.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.peanut.modules.common.dao.BuyOrderRefundDao;
 import com.peanut.modules.common.entity.BuyOrder;
@@ -37,4 +38,11 @@ public class BuyOrderRefundServiceImpl extends ServiceImpl<BuyOrderRefundDao, Bu
         int random = new Random().nextInt(900) + 100; // 100~999
         return "RF" + time + random;
     }
+    @Override
+    public BuyOrderRefund getRefundInfoByOrderId(int orderId){
+        QueryWrapper<BuyOrderRefund> wrapperRefund = new QueryWrapper<>();
+        wrapperRefund.eq("order_id",orderId).last("LIMIT 1");
+        BuyOrderRefund refundInfo = this.getOne(wrapperRefund);
+        return refundInfo;
+    }
 }

src/main/java/com/peanut/modules/common/service/impl/BuyOrderServiceImpl.java

@@ -7,8 +7,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.peanut.common.utils.ExpressOrderUtil;
 import com.peanut.common.utils.Query;
+import com.peanut.config.Constants;
 import com.peanut.modules.common.dao.*;
 import com.peanut.modules.common.entity.*;
+import com.peanut.modules.common.service.BuyOrderRefundService;
 import com.peanut.modules.common.service.BuyOrderService;
 import com.peanut.modules.common.to.PrepareOrderDto;
 import com.peanut.modules.common.vo.UserBaseVo;
@@ -18,10 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.Instant;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -44,6 +43,8 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
     private AiBuyConfigDao aiBuyConfigDao;
     @Autowired
     private ShopProductCourseDao shopProductCourseDao;
+    @Autowired
+    private BuyOrderRefundService buyOrderRefundService;
 
     @Override
     public Map<String, Object> initPrepareOrder(PrepareOrderDto prepareOrderDto) {
@@ -75,7 +76,7 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
         wrapper.eq(BuyOrder::getUserId,params.get("userId"));
         wrapper.eq(BuyOrder::getCome,params.get("come"));
         if(StringUtils.isEmpty(params.get("orderStatus").toString())){
-            Integer[] sts = {0,1,2,3,6};
+            Integer[] sts = {0,1,2,3,6,7};
             wrapper.in(BuyOrder::getOrderStatus,sts);
         }else{
             wrapper.eq(BuyOrder::getOrderStatus,params.get("orderStatus").toString());
@@ -122,9 +123,9 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
                         w.disableLogicDel().eq(ShopProduct::getProductId,bb.getProductId());
                         bb.setProduct(shopProductDao.selectOne(w));
                         boolean refundableStatusProduct = false;
-                        if(bb.getProduct().getGoodsType().equals("05") && (paymentDateTime > timestamp-7*24*60*60*1000)){
+                        if(bb.getProduct()!=null && bb.getProduct().getGoodsType().equals("05") && (paymentDateTime > timestamp-7*24*60*60*1000)){
                             refundableStatusProduct = true;
-                        }else if(!bb.getProduct().getGoodsType().equals("05") && b.getOrderStatus().equals("1")){
+                        }else if(bb.getProduct()!=null && !bb.getProduct().getGoodsType().equals("05") && b.getOrderStatus().equals("1") && bb.getExpressOrderId()==0){
                             refundableStatusProduct = true;
                         }
                         refundableStatusArr[i] = refundableStatusProduct;
@@ -147,7 +148,7 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
                         b.setExpressList(expressOrders);
                     }
                 }
-                b.setRefundableStatus(b.getOrderStatus().equals("6")?false:refundableStatus);
+                b.setRefundableStatus(b.getOrderStatus().equals("6") || b.getOrderStatus().equals("7")?false:refundableStatus);
             }
         }
         return page;
@@ -256,7 +257,24 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
 
     @Override
     public List<Map<String, Object>> exportPhysicalBuyOrderInfo(String date,String orderType) {
-        return this.baseMapper.exportPhysicalBuyOrderInfo(date, orderType);
+        List<Map<String, Object>> list = this.baseMapper.exportPhysicalBuyOrderInfo(date, orderType);
+        List<Map<String, Object>> newList = new ArrayList<>();
+        for (Map<String, Object> map:list){
+
+            if(map.get("orderStatus").toString().equals("已退款")){
+                Map<String, Object> newMap = new HashMap<>(map);
+                map.put("orderStatus","已付款");
+                newList.add(map);
+
+                newMap.put("orderPrice","-"+map.get("orderPrice").toString());
+                newMap.put("price","-"+map.get("price").toString());
+                newList.add(newMap);
+            }else{
+                newList.add(map);
+            }
+
+        }
+        return newList;
     }
 
     @Override

src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java

@@ -1396,7 +1396,7 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
                 .eq(ClassTaskAndQuesReply::getUserId,params.get("userId").toString()));
         for (ClassTaskAndQuesReply reply:classTaskAndQuesReplys){
             ClassEntity classEntity = this.getById(reply.getClassId());
-            if (!"2".equals(classEntity.getState())){
+            if (classEntity!=null && !"2".equals(classEntity.getState())){
                 res = reply;
             }
         }
@@ -1692,7 +1692,37 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
         }
         return resultList;
     }
+    @Override
+    public Map<String,Object> getClassCourseInfoByClassId(int classId, int courseId) {
+        ClassEntity classEntity = this.baseMapper.selectById(classId);
 
+        MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>();
+        wrapper.selectAll(CourseEntity.class);
+        wrapper.leftJoin(ClassCourse.class, ClassCourse::getCourseId, CourseEntity::getId);
+        wrapper.leftJoin(ClassModel.class, ClassModel::getId, ClassCourse::getModelId);
+        wrapper.eq(ClassModel::getId, classEntity.getModelId());
+        if (courseId!=0){
+            wrapper.eq(CourseEntity::getId,courseId);
+        }
+        CourseEntity course = courseDao.selectOne(wrapper);
+
+        Map<String,Object> candk = new HashMap<>();
+        MPJLambdaWrapper<CourseCatalogueChapterEntity> w = new MPJLambdaWrapper<>();
+        w.leftJoin(CourseCatalogueChapterVideoEntity.class,CourseCatalogueChapterVideoEntity::getChapterId,CourseCatalogueChapterEntity::getId);
+        w.eq(CourseCatalogueChapterEntity::getCourseId,course.getId());
+        w.selectSum(CourseCatalogueChapterVideoEntity::getDuration);
+        Map<String,Object> map = courseCatalogueChapterDao.selectJoinMap(w);
+        double duration = Double.parseDouble(map.get("duration").toString());
+        double minute = duration/60;
+        double keshi = Math.ceil(minute/45);
+        candk.put("courseId",course.getId());
+        candk.put("courseTitle",course.getTitle());
+        candk.put("courseETitle",course.getEtitle());
+        candk.put("titleAbbr",course.getTitleAbbr());
+        candk.put("keshi",keshi);
+
+        return candk;
+    }
     @Override
     public List<Map<String,Object>> classCourseInfoClassId(int classId,int courseId) {
         List<Map<String,Object>> res = new ArrayList<>();

src/main/java/com/peanut/modules/common/service/impl/ClassExamServiceImpl.java

@@ -74,7 +74,7 @@ public class ClassExamServiceImpl extends ServiceImpl<ClassExamDao, ClassExam> i
     public void updateClassExamSubject(ClassExamSubject classExamSubject) {
         classExamSubjectDao.updateById(classExamSubject);
         if (classExamSubject.getOptions()!=null&&classExamSubject.getOptions().size() > 0){
-            classExamOptionDao.delete(new LambdaQueryWrapper<ClassExamOption>().eq(ClassExamOption::getSubjectId,classExamSubject.getId()));
+            classExamOptionDao.realDeleteClassExamOption(classExamSubject.getId());
             for (ClassExamOption option:classExamSubject.getOptions()){
                 option.setSubjectId(classExamSubject.getId());
                 classExamOptionDao.insert(option);

src/main/java/com/peanut/modules/common/service/impl/CouponServiceImpl.java

@@ -304,6 +304,19 @@ public class CouponServiceImpl extends ServiceImpl<CouponDao, CouponEntity> impl
 
     @Override
     public void refundZSCouponHistoryByOrder(BuyOrder order){
+        MyUserEntity userEntity = userDao.selectById(order.getUserId());
+        BigDecimal refundAllJF = BigDecimal.ZERO;
+        List<JfTransactionDetails> grantJfList = jfTransactionDetailsDao.selectList(new LambdaQueryWrapper<JfTransactionDetails>()
+                .eq(JfTransactionDetails::getRelationId, order.getOrderId())
+                .eq(JfTransactionDetails::getUserId, order.getUserId())
+                .eq(JfTransactionDetails::getActType, 0)
+                .gt(JfTransactionDetails::getChangeAmount, BigDecimal.ZERO)
+                .like(JfTransactionDetails::getRemark, "优惠券换积分"));
+        for (JfTransactionDetails grantJf : grantJfList) {
+            refundAllJF = refundAllJF.add(grantJf.getChangeAmount());
+        }
+        boolean orderGrantedJf = refundAllJF.compareTo(BigDecimal.ZERO) > 0;
+
         MPJLambdaWrapper<CouponToProduct> wrapper = new MPJLambdaWrapper();
         wrapper.leftJoin(BuyOrderProduct.class,BuyOrderProduct::getProductId,CouponToProduct::getProductId);
         wrapper.leftJoin(CouponEntity.class,CouponEntity::getId,CouponToProduct::getCouponId);
@@ -314,51 +327,42 @@ public class CouponServiceImpl extends ServiceImpl<CouponDao, CouponEntity> impl
         wrapper.select(BuyOrderProduct::getQuantity);
         List<Map<String,Object>> buyOrderProducts = couponToProductDao.selectJoinMaps(wrapper);
 
-        MyUserEntity userEntity = userDao.selectById(order.getUserId());
-        List<UserVip> userVipList = userVipDao.selectList(new LambdaQueryWrapper<UserVip>()
-                .eq(UserVip::getUserId, userEntity.getId())
-                .eq(UserVip::getState,0)
-                .lt(UserVip::getStartTime,order.getPaymentDate()));
-        boolean isVip = false;
-        if (userVipList.size() > 0) {
-            isVip = true;
-        }
-        System.out.println("isVip:"+isVip);
-        BigDecimal refundAllJF = BigDecimal.ZERO;
         Boolean isRefundCoupon = false;
         for (Map<String,Object> map : buyOrderProducts) {
             ShopProduct shopProduct = shopProductDao.selectById(map.get("product_id").toString());
-            System.out.println("goodsType:"+shopProduct.getGoodsType());
-            if ("03".equals(shopProduct.getGoodsType())){
-                int couponId = Integer.parseInt(map.get("coupon_id").toString());
-                CouponEntity couponEntity = couponDao.selectById(couponId);
-                //现金券
-                if (couponEntity.getCouponType()==0 && isVip){
-                    BigDecimal quantity = new BigDecimal(map.get("quantity").toString());
-                    BigDecimal sumRefundJF = couponEntity.getCouponAmount().multiply(quantity);
-                    refundAllJF = refundAllJF.add(sumRefundJF);
-
-                    QueryWrapper<CouponHistory> couponHistoryRemoveWrapper = new QueryWrapper<>();
-                    couponHistoryRemoveWrapper.eq("order_id",order.getOrderId());
-                    couponHistoryRemoveWrapper.eq("status",1);
-                    couponHistoryService.remove(couponHistoryRemoveWrapper);
-                }else{
+            if ("03".equals(shopProduct.getGoodsType())) {
+                if (!orderGrantedJf) {
                     isRefundCoupon = true;
                 }
-            }else{
+            } else {
                 isRefundCoupon = true;
             }
         }
-        if(refundAllJF.compareTo(BigDecimal.ZERO)>0 && userEntity.getJf().compareTo(refundAllJF)>=0){
-            BigDecimal userJF = userEntity.getJf().subtract(refundAllJF);
-            userEntity.setJf(userJF.compareTo(BigDecimal.ZERO)>=0?userJF:BigDecimal.ZERO);
-            userDao.updateById(userEntity);
-            jfTransactionDetailsService.recordZsJfTransaction(order,userEntity, refundAllJF);
+
+        if (orderGrantedJf) {
+            BigDecimal userJf = userEntity.getJf() == null ? BigDecimal.ZERO : userEntity.getJf();
+            BigDecimal actualDeduct;
+            if (userJf.compareTo(refundAllJF) >= 0) {
+                actualDeduct = refundAllJF;
+            } else if (userJf.compareTo(BigDecimal.ZERO) > 0) {
+                actualDeduct = userJf;
+            } else {
+                actualDeduct = BigDecimal.ZERO;
+            }
+            if (actualDeduct.compareTo(BigDecimal.ZERO) > 0) {
+                userEntity.setJf(userJf.subtract(actualDeduct));
+                userDao.updateById(userEntity);
+                jfTransactionDetailsService.recordZsJfTransaction(order, userEntity, actualDeduct);
+                QueryWrapper<CouponHistory> couponHistoryRemoveWrapper = new QueryWrapper<>();
+                couponHistoryRemoveWrapper.eq("order_id", order.getOrderId());
+                couponHistoryRemoveWrapper.eq("status", 1);
+                couponHistoryService.remove(couponHistoryRemoveWrapper);
+            }
         }
-        if(isRefundCoupon){
+        if (isRefundCoupon) {
             QueryWrapper<CouponHistory> couponHistoryRemoveWrapper = new QueryWrapper<>();
-            couponHistoryRemoveWrapper.eq("order_id",order.getOrderId());
-            couponHistoryRemoveWrapper.eq("status",0);
+            couponHistoryRemoveWrapper.eq("order_id", order.getOrderId());
+            couponHistoryRemoveWrapper.eq("status", 0);
             couponHistoryService.remove(couponHistoryRemoveWrapper);
         }
 
@@ -376,17 +380,18 @@ public class CouponServiceImpl extends ServiceImpl<CouponDao, CouponEntity> impl
         List<Map<String,Object>> buyOrderProducts = couponToProductDao.selectJoinMaps(wrapper);
         for (Map<String,Object> map : buyOrderProducts) {
             ShopProduct shopProduct = shopProductDao.selectById(map.get("product_id").toString());
-            //vip身份用户，买送优惠券的预售书时候，不送优惠券改自动送积分
+            //预售书+赠送现金券：VIP用户将券额转为积分；仅产品id=2023时需为妇幼生殖vip(type=10)
             if ("03".equals(shopProduct.getGoodsType())){
                 MyUserEntity userEntity = userDao.selectById(order.getUserId());
                 List<UserVip> userVipList = userVipDao.selectList(new LambdaQueryWrapper<UserVip>()
                         .eq(UserVip::getUserId, userEntity.getId())
                         .eq(UserVip::getState,0));
-                if (userVipList.size() > 0) {
-                    int couponId = Integer.parseInt(map.get("coupon_id").toString());
-                    CouponEntity couponEntity = couponDao.selectById(couponId);
-                    //现金券
-                    if (couponEntity.getCouponType()==0){
+                int productId = Integer.parseInt(map.get("product_id").toString());
+                int couponId = Integer.parseInt(map.get("coupon_id").toString());
+                CouponEntity couponEntity = couponDao.selectById(couponId);
+                boolean isFyszVip = userVipList.stream().anyMatch(userVip -> Integer.valueOf(10).equals(userVip.getType()));
+                boolean couponToJf = couponEntity.getCouponType() == 0 && (productId == 2023 ? isFyszVip : userVipList.size() > 0);
+                if (couponToJf){
                         BigDecimal jf = BigDecimal.ZERO;
                         for (int i=0;i<Integer.parseInt(map.get("quantity").toString());i++){
                             R res = insertCouponHistory(order,couponId,order.getUserId(), 1,1,
@@ -407,12 +412,6 @@ public class CouponServiceImpl extends ServiceImpl<CouponDao, CouponEntity> impl
                             jfTransactionDetails.setRemark("vip用户买预售书送的优惠券换积分,订单号:"+order.getOrderSn());
                             jfTransactionDetailsDao.insert(jfTransactionDetails);
                         }
-                    }else {
-                        for (int i=0;i<Integer.parseInt(map.get("quantity").toString());i++){
-                            insertCouponHistory(Integer.parseInt(map.get("coupon_id").toString()),
-                                    order.getUserId(), 1,0,"购买商品"+shopProduct.getProductName()+"赠送");
-                        }
-                    }
                 }else {
                     for (int i=0;i<Integer.parseInt(map.get("quantity").toString());i++){
                         insertCouponHistory(Integer.parseInt(map.get("coupon_id").toString()),

src/main/java/com/peanut/modules/common/service/impl/CourseMedicineServiceImpl.java

@@ -0,0 +1,16 @@
+package com.peanut.modules.common.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.peanut.modules.common.dao.CourseMedicineDao;
+import com.peanut.modules.common.dao.CourseToMedicineDao;
+import com.peanut.modules.common.entity.CourseMedicine;
+import com.peanut.modules.common.entity.CourseToMedicine;
+import com.peanut.modules.common.service.CourseMedicineService;
+import com.peanut.modules.common.service.CourseToMedicineService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service("commonCourseMedicineService")
+public class CourseMedicineServiceImpl extends ServiceImpl<CourseMedicineDao, CourseMedicine> implements CourseMedicineService {
+}

src/main/java/com/peanut/modules/common/service/impl/JfTransactionDetailsServiceImpl.java

@@ -37,7 +37,7 @@ public class JfTransactionDetailsServiceImpl extends ServiceImpl<JfTransactionDe
     public void recordZsJfTransaction(BuyOrder buyOrder, MyUserEntity user, BigDecimal refundJF) {
         JfTransactionDetails jfTransactionDetails = new JfTransactionDetails();
         jfTransactionDetails.setUserId(buyOrder.getUserId());
-        jfTransactionDetails.setChangeAmount(refundJF);
+        jfTransactionDetails.setChangeAmount(refundJF.abs().negate());
         jfTransactionDetails.setActType(1);
         jfTransactionDetails.setUserBalance(user.getJf());
         jfTransactionDetails.setRelationId(buyOrder.getOrderId());

src/main/java/com/peanut/modules/common/service/impl/TrainingClassServiceImpl.java

@@ -55,6 +55,8 @@ public class TrainingClassServiceImpl extends ServiceImpl<TrainingClassDao, Trai
                             identity = "心理学vip";
                         }else if ("9".equals(vipType)) {
                             identity = "中西汇通vip";
+                        }else if ("10".equals(vipType)) {
+                            identity = "妇幼生殖vip";
                         }
                         break;
                     }

src/main/java/com/peanut/modules/common/service/impl/UserVipLogServiceImpl.java

@@ -93,6 +93,11 @@ public class UserVipLogServiceImpl extends ServiceImpl<UserVipLogDao, UserVipLog
         return this.baseMapper.getUserVipLogInfo(date);
     }
 
+    @Override
+    public List<Map<String, Object>> getUserVipRefundInfo(String last_l_date, String last_date) {
+        return this.baseMapper.getUserVipRefundInfo(last_l_date,last_date);
+    }
+
     @Override
     public Map<String, Object> getUserVipLogInfoTotal(String date) {
         return this.baseMapper.getUserVipLogInfoTotal(date);

src/main/java/com/peanut/modules/common/service/impl/UserVipServiceImpl.java

@@ -108,7 +108,7 @@ public class UserVipServiceImpl extends ServiceImpl<UserVipDao, UserVip> impleme
 
     @Override
     public boolean is4569SVip(int uid) {
-        if (isVipByType(4,uid)&&isVipByType(9,uid)&&isVipByType(5,uid)&&isVipByType(6,uid)){
+        if (isVipByType(4,uid)&&isVipByType(9,uid)&&isVipByType(5,uid)&&isVipByType(6,uid)&&isVipByType(10,uid)){
             return true;
         }
         return false;
@@ -139,8 +139,9 @@ public class UserVipServiceImpl extends ServiceImpl<UserVipDao, UserVip> impleme
         List<UserVip> userVipList = userVipDao.selectList(new LambdaQueryWrapper<UserVip>()
                 .eq(UserVip::getUserId, u==null?ShiroUtils.getUId():u.getId())
                 .eq(UserVip::getState,0));
+
         for (UserVip userVip : userVipList) {
-            if (userVip.getType()==4||userVip.getType()==9||userVip.getType()==5||userVip.getType()==6) {
+            if (userVip.getType()==4||userVip.getType()==9||userVip.getType()==5||userVip.getType()==6||userVip.getType()==10) {
                 List<CourseToMedicine> list = courseToMedicalDao.selectList(new LambdaQueryWrapper<CourseToMedicine>()
                         .eq(CourseToMedicine::getCourseId,courseId));
                 for (CourseToMedicine ctm:list) {
@@ -149,7 +150,9 @@ public class UserVipServiceImpl extends ServiceImpl<UserVipDao, UserVip> impleme
                         if ((cm.getId()==1&&userVip.getType()==4)||//中医学
                                 (cm.getId()==74&&userVip.getType()==9)||//中西汇通
                                 (cm.getId()==2&&userVip.getType()==5)||//针灸学
+                                (cm.getId()==109&&userVip.getType()==10)||//妇幼生殖
                                 (cm.getId()==5&&userVip.getType()==6)){//肿瘤学
+
                             return userVip;
                         }
                     }
@@ -205,6 +208,8 @@ public class UserVipServiceImpl extends ServiceImpl<UserVipDao, UserVip> impleme
                     set.add(6);
                 }else if (cm.getId() == 4) {//心身医学
                     set.add(8);
+                }else if (cm.getId() == 109){//妇幼生殖
+                    set.add(10);
                 }
             }
         }
@@ -221,7 +226,8 @@ public class UserVipServiceImpl extends ServiceImpl<UserVipDao, UserVip> impleme
         return set;
     }
 
-    public CourseMedicine topLabel(int labelId) {
+    public CourseMedicine
+    topLabel(int labelId) {
         CourseMedicine cm = courseMedicineDao.selectById(labelId);
         if (cm != null) {
             CourseMedicine pcm = courseMedicineDao.selectById(cm.getPid());
@@ -258,8 +264,9 @@ public class UserVipServiceImpl extends ServiceImpl<UserVipDao, UserVip> impleme
         List<UserVip> resList = new ArrayList();
         if(vipBuyConfigEntity.getType()==1){//医学超级
             List<UserVip> userVipList = userVipDao.selectList(new LambdaQueryWrapper<UserVip>()
-                    .eq(UserVip::getUserId,buyOrder.getUserId()).eq(UserVip::getState,0).in(UserVip::getType,4,9,5,6));
-            for (int i=4;i<=7;i++){
+                    .eq(UserVip::getUserId,buyOrder.getUserId()).eq(UserVip::getState,0).in(UserVip::getType,4,9,5,6,10));
+            for (int i=4;i<=10;i++){
+                log.info("openVipForUser====i:"+i);
                 if (i==7){
                     i=9;
                 }
@@ -289,7 +296,7 @@ public class UserVipServiceImpl extends ServiceImpl<UserVipDao, UserVip> impleme
                 }
             }
         }else if(vipBuyConfigEntity.getType()==11){//延期医学超级
-            for (int i=4;i<=7;i++){
+            for (int i=4;i<=10;i++){
                 if (i==7){
                     i=9;
                 }
@@ -367,7 +374,7 @@ public class UserVipServiceImpl extends ServiceImpl<UserVipDao, UserVip> impleme
                 }
             }
         }else if (vipBuyConfigEntity.getType()==4||vipBuyConfigEntity.getType()==9||vipBuyConfigEntity.getType()==5||vipBuyConfigEntity.getType()==6||
-                vipBuyConfigEntity.getType()==7||vipBuyConfigEntity.getType()==8){
+                vipBuyConfigEntity.getType()==7||vipBuyConfigEntity.getType()==8 || vipBuyConfigEntity.getType()==10){
             UserVip userVip = new UserVip();
             userVip.setUserId(buyOrder.getUserId());
             userVip.setType(vipBuyConfigEntity.getType());
@@ -376,10 +383,10 @@ public class UserVipServiceImpl extends ServiceImpl<UserVipDao, UserVip> impleme
             userVipDao.insert(userVip);
             resList.add(userVip);
         }else if (vipBuyConfigEntity.getType()==41||vipBuyConfigEntity.getType()==91||vipBuyConfigEntity.getType()==51||vipBuyConfigEntity.getType()==61||
-                vipBuyConfigEntity.getType()==71||vipBuyConfigEntity.getType()==81){
+                vipBuyConfigEntity.getType()==71||vipBuyConfigEntity.getType()==81 ||vipBuyConfigEntity.getType()==101){
             List<UserVip> userVipList = userVipDao.selectList(new LambdaQueryWrapper<UserVip>()
                     .eq(UserVip::getUserId,buyOrder.getUserId())
-                    .eq(UserVip::getType,vipBuyConfigEntity.getType().toString().substring(0,1))
+                    .eq(UserVip::getType,vipBuyConfigEntity.getType().toString().substring(0,vipBuyConfigEntity.getType()==101?2:1))
                     .orderByDesc(UserVip::getEndTime));
             UserVip userVip = userVipList.get(0);
             if (userVip.getState()==0) {

src/main/java/com/peanut/modules/master/controller/StatisticsBusinessVipController.java

@@ -63,7 +63,7 @@ public class StatisticsBusinessVipController {
                     .stream().map(UserVip::getType).collect(Collectors.toList());
             // 定义复购规则
             Map<String, List<Integer>> reBuyRules = new HashMap<>();
-            reBuyRules.put("医学超级", Arrays.asList(4, 5, 6, 9));
+            reBuyRules.put("医学超级", Arrays.asList(4, 5, 6, 9, 10));
             reBuyRules.put("国学心理学超级", Arrays.asList(7, 8));
             reBuyRules.put("中医学", Arrays.asList(4));
             reBuyRules.put("针灸学", Arrays.asList(5));
@@ -71,6 +71,7 @@ public class StatisticsBusinessVipController {
             reBuyRules.put("国学", Arrays.asList(7));
             reBuyRules.put("心理学", Arrays.asList(8));
             reBuyRules.put("中西汇通学", Arrays.asList(9));
+            reBuyRules.put("妇幼生殖", Arrays.asList(10));
             // 判断是否复购
             List<Integer> required = reBuyRules.get(vipType);
             if (required != null && state1UserVips.containsAll(required)) {
@@ -141,14 +142,17 @@ public class StatisticsBusinessVipController {
             row5.createCell(0).setCellValue("肿瘤学");row5.createCell(1).setCellValue(state1Counts.getOrDefault("肿瘤学", 0).toString());
             row5.createCell(2).setCellValue("肿瘤学");row5.createCell(3).setCellValue(state0Counts.getOrDefault("肿瘤学", 0).toString());
             Row row6 = sheet.createRow(rowNum++);
-            row6.createCell(0).setCellValue("国学");row6.createCell(1).setCellValue(state1Counts.getOrDefault("国学",0).toString());
-            row6.createCell(2).setCellValue("国学");row6.createCell(3).setCellValue(state0Counts.getOrDefault("国学", 0).toString());
+            row6.createCell(0).setCellValue("妇幼生殖");row6.createCell(1).setCellValue(state1Counts.getOrDefault("妇幼生殖",0).toString());
+            row6.createCell(2).setCellValue("妇幼生殖");row6.createCell(3).setCellValue(state0Counts.getOrDefault("妇幼生殖", 0).toString());
             Row row7 = sheet.createRow(rowNum++);
-            row7.createCell(0).setCellValue("心理学");row7.createCell(1).setCellValue(state1Counts.getOrDefault("心理学", 0).toString());
-            row7.createCell(2).setCellValue("心理学");row7.createCell(3).setCellValue(state0Counts.getOrDefault("心理学", 0).toString());
+            row7.createCell(0).setCellValue("国学");row7.createCell(1).setCellValue(state1Counts.getOrDefault("国学",0).toString());
+            row7.createCell(2).setCellValue("国学");row7.createCell(3).setCellValue(state0Counts.getOrDefault("国学", 0).toString());
             Row row8 = sheet.createRow(rowNum++);
-            row8.createCell(0).setCellValue("中西汇通学");row8.createCell(1).setCellValue(state1Counts.getOrDefault("中西汇通学", 0).toString());
-            row8.createCell(2).setCellValue("中西汇通学");row8.createCell(3).setCellValue(state0Counts.getOrDefault("中西汇通学", 0).toString());
+            row8.createCell(0).setCellValue("心理学");row8.createCell(1).setCellValue(state1Counts.getOrDefault("心理学", 0).toString());
+            row8.createCell(2).setCellValue("心理学");row8.createCell(3).setCellValue(state0Counts.getOrDefault("心理学", 0).toString());
+            Row row9 = sheet.createRow(rowNum++);
+            row9.createCell(0).setCellValue("中西汇通学");row9.createCell(1).setCellValue(state1Counts.getOrDefault("中西汇通学", 0).toString());
+            row9.createCell(2).setCellValue("中西汇通学");row9.createCell(3).setCellValue(state0Counts.getOrDefault("中西汇通学", 0).toString());
 
             sheet.createRow(rowNum++);
             String[] header = {"时间","姓名","电话","VIP类型","是否延期", "本次年限","本次金额","本次开始时间","本次结束时间","到期时间","是否复购"};
@@ -316,14 +320,17 @@ public class StatisticsBusinessVipController {
             row5.createCell(0).setCellValue("肿瘤学");row5.createCell(1).setCellValue(state1Counts.getOrDefault("肿瘤学", 0).toString());
             row5.createCell(2).setCellValue("肿瘤学");row5.createCell(3).setCellValue(state0Counts.getOrDefault("肿瘤学", 0).toString());
             Row row6 = sheet.createRow(rowNum++);
-            row6.createCell(0).setCellValue("国学");row6.createCell(1).setCellValue(state1Counts.getOrDefault("国学",0).toString());
-            row6.createCell(2).setCellValue("国学");row6.createCell(3).setCellValue(state0Counts.getOrDefault("国学", 0).toString());
+            row6.createCell(0).setCellValue("妇幼生殖");row6.createCell(1).setCellValue(state1Counts.getOrDefault("妇幼生殖",0).toString());
+            row6.createCell(2).setCellValue("妇幼生殖");row6.createCell(3).setCellValue(state0Counts.getOrDefault("妇幼生殖", 0).toString());
             Row row7 = sheet.createRow(rowNum++);
-            row7.createCell(0).setCellValue("心理学");row7.createCell(1).setCellValue(state1Counts.getOrDefault("心理学", 0).toString());
-            row7.createCell(2).setCellValue("心理学");row7.createCell(3).setCellValue(state0Counts.getOrDefault("心理学", 0).toString());
+            row7.createCell(0).setCellValue("国学");row7.createCell(1).setCellValue(state1Counts.getOrDefault("国学",0).toString());
+            row7.createCell(2).setCellValue("国学");row7.createCell(3).setCellValue(state0Counts.getOrDefault("国学", 0).toString());
             Row row8 = sheet.createRow(rowNum++);
-            row8.createCell(0).setCellValue("中西汇通学");row8.createCell(1).setCellValue(state1Counts.getOrDefault("中西汇通学", 0).toString());
-            row8.createCell(2).setCellValue("中西汇通学");row8.createCell(3).setCellValue(state0Counts.getOrDefault("中西汇通学", 0).toString());
+            row8.createCell(0).setCellValue("心理学");row8.createCell(1).setCellValue(state1Counts.getOrDefault("心理学", 0).toString());
+            row8.createCell(2).setCellValue("心理学");row8.createCell(3).setCellValue(state0Counts.getOrDefault("心理学", 0).toString());
+            Row row9 = sheet.createRow(rowNum++);
+            row9.createCell(0).setCellValue("中西汇通学");row9.createCell(1).setCellValue(state1Counts.getOrDefault("中西汇通学", 0).toString());
+            row9.createCell(2).setCellValue("中西汇通学");row9.createCell(3).setCellValue(state0Counts.getOrDefault("中西汇通学", 0).toString());
 
             sheet.createRow(rowNum++);
             String[] header2 = {"","首次办理三年","首次办理四年","其他","延期一年", "延期三年","延期四年","其他"};
@@ -339,6 +346,7 @@ public class StatisticsBusinessVipController {
             fillRow(sheet.createRow(rowNum++), 0, "中医学", banCounts, yanCounts);
             fillRow(sheet.createRow(rowNum++), 0, "针灸学", banCounts, yanCounts);
             fillRow(sheet.createRow(rowNum++), 0, "肿瘤学", banCounts, yanCounts);
+            fillRow(sheet.createRow(rowNum++), 0, "妇幼生殖", banCounts, yanCounts);
             fillRow(sheet.createRow(rowNum++), 0, "国学", banCounts, yanCounts);
             fillRow(sheet.createRow(rowNum++), 0, "心理学", banCounts, yanCounts);
             fillRow(sheet.createRow(rowNum++), 0, "中西汇通学", banCounts, yanCounts);
@@ -352,6 +360,7 @@ public class StatisticsBusinessVipController {
             sheet.createRow(rowNum++).createCell(0).setCellValue("中医学");sheet.getRow(rowNum-1).createCell(1).setCellValue(banTypeRatios.getOrDefault("中医学",0).toString());
             sheet.createRow(rowNum++).createCell(0).setCellValue("针灸学");sheet.getRow(rowNum-1).createCell(1).setCellValue(banTypeRatios.getOrDefault("针灸学",0).toString());
             sheet.createRow(rowNum++).createCell(0).setCellValue("肿瘤学");sheet.getRow(rowNum-1).createCell(1).setCellValue(banTypeRatios.getOrDefault("肿瘤学",0).toString());
+            sheet.createRow(rowNum++).createCell(0).setCellValue("妇幼生殖");sheet.getRow(rowNum-1).createCell(1).setCellValue(banTypeRatios.getOrDefault("妇幼生殖",0).toString());
             sheet.createRow(rowNum++).createCell(0).setCellValue("国学");sheet.getRow(rowNum-1).createCell(1).setCellValue(banTypeRatios.getOrDefault("国学",0).toString());
             sheet.createRow(rowNum++).createCell(0).setCellValue("心理学");sheet.getRow(rowNum-1).createCell(1).setCellValue(banTypeRatios.getOrDefault("心理学",0).toString());
             sheet.createRow(rowNum++).createCell(0).setCellValue("中西汇通学");sheet.getRow(rowNum-1).createCell(1).setCellValue(banTypeRatios.getOrDefault("中西汇通学",0).toString());

src/main/java/com/peanut/modules/master/controller/UserCertificateController.java

@@ -1,5 +1,6 @@
 package com.peanut.modules.master.controller;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -38,6 +39,10 @@ public class UserCertificateController {
     private CourseMedicalService courseMedicalService;
     @Autowired
     private CourseToMedicalService courseToMedicalService;
+    @Autowired
+    private MyUserService userService;
+    @Autowired
+    private ClassEntityService classEntityService;
 
     //小班自考证书列表
     @RequestMapping("/userClassAndZKCertificateList")
@@ -278,6 +283,56 @@ public class UserCertificateController {
     }
 
 
+    @RequestMapping("/createCertificateNo")
+    public R createCertificateNo(@RequestBody Map<String,Object> params){
+        ClassEntity classEntity = classEntityService.getById(params.get("classId").toString());
+        String type = params.get("type").toString();
+        List<String> certificateNoList = new ArrayList<>();
+        Map<String,Object> classCourseInfo = classEntityService.getClassCourseInfoByClassId(classEntity.getId(),0);
+        String pinyin = classCourseInfo.get("titleAbbr").toString();
 
+        String tels = params.get("tels").toString();
+        List<String> telList = Arrays.asList(tels.split(","));
+        List<MyUserEntity> userList = userService.list(new LambdaQueryWrapper<MyUserEntity>()
+                .in(MyUserEntity::getTel, telList));
+
+        for (int i=0;i<userList.size();i++){
+            MyUserEntity user = userList.get(i);
+            UserCertificate userCertificate = new UserCertificate();
+            userCertificate.setTitle(classEntity.getTitle());
+            userCertificate.setType(type);
+            userCertificate.setLabelId(5);
+            userCertificate.setUserId(user.getId());
+            userCertificate.setClassId(classEntity.getId());
+
+            String certificateNo = classEntityService.getNextCertificateNo(type,pinyin);
+            userCertificate.setCertificateNo(certificateNo);
+            userCertificate.setCourseId((Integer) classCourseInfo.get("courseId"));
+
+            if (StringUtils.isNotEmpty(user.getPhoto())&&StringUtils.isNotEmpty(user.getName())){
+                String startYear = DateUtil.year(classEntity.getStartTime())+"";
+                String startMonth = DateUtil.month(classEntity.getStartTime())+1+"";
+                String startDay = DateUtil.dayOfMonth(classEntity.getStartTime())+"";
+                String endYear = DateUtil.year(classEntity.getEndTime())+"";
+                String endMonth = DateUtil.month(classEntity.getEndTime())+1+"";
+                String endDay = DateUtil.dayOfMonth(classEntity.getEndTime())+"";
+                double keshiTotal = (double)classCourseInfo.get("keshi");
+                String keshi = (keshiTotal+"").replace(".0","");
+                String courseTitle = classCourseInfo.get("courseTitle").toString();
+                if (courseTitle.contains("【")){
+                    courseTitle = courseTitle.substring(0,courseTitle.indexOf("【"));
+                }
+                String[] des = {startYear,startMonth,startDay,endYear,endMonth,endDay,
+                        classEntity.getTitle(),courseTitle,keshi};
+                String[] edes = {classCourseInfo.get("courseETitle").toString(),keshi};
+                String url = userCertificateService.generateCertificate(type,certificateNo,user.getPhoto(),user.getName(),
+                        des, edes, endYear,endMonth,endDay);
+                userCertificate.setCertificateUrl(url);
+            }
+            userCertificateService.save(userCertificate);
+            certificateNoList.add(user.getTel());
+        }
+        return R.ok().put("certificateNoList",certificateNoList);
+    }
 
 }

src/main/java/com/peanut/modules/master/service/impl/UserCourseBuyServiceImpl.java

@@ -19,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.*;
@@ -221,18 +222,21 @@ public class UserCourseBuyServiceImpl extends ServiceImpl<UserCourseBuyDao, User
                     continue;
                 }
                 CellType cellTypeEnum = cell.getCellTypeEnum();
-//                if(cellTypeEnum==CellType.NUMERIC){
-                    String phone = cell.toString();
-                    MyUserEntity myUserEntity = userDao.selectOne(new LambdaQueryWrapper<MyUserEntity>().select(MyUserEntity::getId,MyUserEntity::getName,MyUserEntity::getTel).eq(MyUserEntity::getTel, phone));
-                    if(myUserEntity!=null){
-                        has.add(myUserEntity);
-                    }else{
-                        HashMap<String, String> stringStringHashMap = new HashMap<>();
-                        stringStringHashMap.put("name",row.getCell(0)==null?"":row.getCell(0).toString());
-                        stringStringHashMap.put("phone",phone);
-                        nohas.add(stringStringHashMap);
-                    }
-//                }
+                String phone = cell.toString().trim();
+                if(cellTypeEnum==CellType.NUMERIC){
+                    BigInteger bigInteger = BigInteger.valueOf((long) cell.getNumericCellValue());
+                    phone = bigInteger.toString();
+                }
+
+                MyUserEntity myUserEntity = userDao.selectOne(new LambdaQueryWrapper<MyUserEntity>().select(MyUserEntity::getId,MyUserEntity::getName,MyUserEntity::getTel).eq(MyUserEntity::getTel, phone));
+                if(myUserEntity!=null){
+                    has.add(myUserEntity);
+                }else{
+                    HashMap<String, String> stringStringHashMap = new HashMap<>();
+                    stringStringHashMap.put("name",row.getCell(0)==null?"":row.getCell(0).toString());
+                    stringStringHashMap.put("phone",phone);
+                    nohas.add(stringStringHashMap);
+                }
             }
             stringArrayListMap.put("has",has);
             stringArrayListMap.put("no",nohas);

src/main/java/com/peanut/modules/pay/alipay/controller/AliPayController.java

@@ -50,6 +50,7 @@ public class AliPayController {
      */
     @RequestMapping("/refund")
     public R refund(@RequestBody Map<String,Object> params) {
+        log.info("in=====refund=========");
         String refund = aliPayService.refund(params);
         return R.ok().put("msg",refund);
     }

src/main/java/com/peanut/modules/pay/alipay/service/AliPayService.java

@@ -2,8 +2,13 @@ package com.peanut.modules.pay.alipay.service;
 
 
 
+import com.peanut.modules.common.entity.BuyOrder;
+import com.peanut.modules.common.entity.BuyOrderRefund;
+import com.peanut.modules.common.entity.MyUserEntity;
 import com.peanut.modules.pay.alipay.dto.AlipayDTO;
 import jakarta.servlet.http.HttpServletRequest;
+import org.springframework.transaction.annotation.Transactional;
+
 import java.util.Map;
 
 
@@ -30,4 +35,5 @@ public interface AliPayService {
     String refund(Map<String,Object> params);
 
 
+    String refund(BuyOrder buyOrder, MyUserEntity user, BuyOrderRefund buyOrderRefund);
 }

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

@@ -7,8 +7,9 @@ import com.alipay.api.internal.util.AlipaySignature;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.google.gson.JsonObject;
 import com.peanut.common.utils.CopyUtils;
-import com.peanut.common.utils.OrderUtils;
+import com.peanut.config.Constants;
 import com.peanut.modules.book.service.BookBuyConfigService;
 import com.peanut.modules.book.service.BuyOrderService;
 import com.peanut.modules.book.service.MyUserService;
@@ -25,6 +26,7 @@ import com.peanut.modules.pay.alipay.dto.ReFundDTO;
 import com.peanut.modules.pay.alipay.service.AliPayService;
 import com.peanut.modules.pay.refund.entity.PayRefundOrder;
 import com.peanut.modules.pay.refund.service.PayRefundOrderService;
+import com.qiniu.util.Json;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +35,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -81,6 +84,10 @@ public class AliPayServiceImpl  implements AliPayService {
     private TrainingClassService trainingClassService;
     @Autowired
     private AiVipLogService aiVipLogService;
+    @Autowired
+    private BuyOrderRefundService buyOrderRefundService;
+    @Autowired
+    private BuyOrderRefundLogService buyOrderRefundLogService;
 
     @Override
     public String pay(AlipayDTO payDto) {
@@ -143,6 +150,7 @@ public class AliPayServiceImpl  implements AliPayService {
             }
             log.info(">>>>>>>>>>支付宝回调 sign = {}, trade_status = {}, out_trade_no = {}, 参数 = {}", params.get("sign"),
                     params.get("trade_status"), params.get("out_trade_no"), params.toString());
+            log.info(params.get("out_trade_no"), params.toString());
             //调用SDK验证签名，验证是阿里回调，而不是其他恶意回调
             BuyOrder buyOrder = buyOrderService.getOne(new LambdaQueryWrapper<BuyOrder>()
                     .eq(BuyOrder::getOrderSn,params.get("out_trade_no")));
@@ -156,6 +164,31 @@ public class AliPayServiceImpl  implements AliPayService {
                 log.info(">>>>>>>>>>验签通过");
                 //验签通过 获取交易状态
                 String tradeStatus = params.get("trade_status");
+                if(params.containsKey("out_biz_no") && params.containsKey("gmt_refund") && params.containsKey("refund_fee")){
+
+                    PayRefundOrder refund = new PayRefundOrder();
+                    refund.setPayType("2");
+                    refund.setRefundId(params.get("out_biz_no").toString());
+                    refund.setTradeNo(params.get("trade_no").toString());
+                    refund.setOrderSn(params.get("out_trade_no").toString());
+                    refund.setRefundFee(params.get("refund_fee").toString());
+                    refundOrderService.save(refund);
+
+                    String toJSON = JSONObject.toJSONString(params);
+                    PayZfbOrderEntity aliNotifyDto = JSONObject.toJavaObject(JSON.parseObject(toJSON), PayZfbOrderEntity.class);
+
+                    PayZfbOrderEntity payZfbOrderEntity = payZfbOrderService.getOne(new QueryWrapper<PayZfbOrderEntity>().eq("trade_no", aliNotifyDto.getTradeNo()));
+                    payZfbOrderEntity.setOutBizNo(refund.getRefundId());
+                    payZfbOrderEntity.setTradeStatus(tradeStatus);
+                    payZfbOrderEntity.setRefundFee(refund.getRefundFee());
+                    String PATTERN = "yyyy-MM-dd HH:mm:ss";
+                    SimpleDateFormat sdf = new SimpleDateFormat(PATTERN);
+                    payZfbOrderEntity.setGmtCreate(sdf.parse(params.get("gmt_create").toString()));
+                    payZfbOrderEntity.setGmtRefund(sdf.parse(params.get("gmt_refund").toString()));
+                    payZfbOrderEntity.setGmtClose(sdf.parse(params.get("gmt_close").toString()));
+                    payZfbOrderService.updateById(payZfbOrderEntity);
+                    return "success";
+                }
                 //只处理支付成功的订单: 修改交易表状态,支付成功
                 //只有交易通知状态为TRADE_SUCCESS或TRADE_FINISHED时，支付宝才会认定为买家付款成功。
                 if (tradeStatus.equals("TRADE_SUCCESS") || tradeStatus.equals("TRADE_FINISHED")) {
@@ -323,7 +356,6 @@ public class AliPayServiceImpl  implements AliPayService {
             return "fail";
         }
     }
-
     @Override
     @Transactional
     public String refund(Map<String,Object> params) {
@@ -331,6 +363,7 @@ public class AliPayServiceImpl  implements AliPayService {
         LambdaQueryWrapper<PayZfbOrderEntity> wrapper = new LambdaQueryWrapper();
         wrapper.eq(PayZfbOrderEntity::getRelevanceoid,params.get("orderSn").toString());
         PayZfbOrderEntity payZfbOrder = payZfbOrderService.getOne(wrapper);
+
         ReFundDTO reFundDTO = new ReFundDTO();
         reFundDTO.setOutTrandeNo(payZfbOrder.getOutTradeNo());
         reFundDTO.setTradeNo(payZfbOrder.getTradeNo());
@@ -339,6 +372,7 @@ public class AliPayServiceImpl  implements AliPayService {
         reFundDTO.setRefundAmount(new BigDecimal(params.get("refundFee").toString()));
 //        reFundDTO.setOutRequestNo(params.get("outRequestNo").toString());
         reFundDTO.setOutRequestNo(UUID.randomUUID().toString());
+
         BuyOrder buyOrder = buyOrderService.getOne(new LambdaQueryWrapper<BuyOrder>()
                 .eq(BuyOrder::getOrderSn,params.get("orderSn")));
         String mchName = "";
@@ -359,6 +393,7 @@ public class AliPayServiceImpl  implements AliPayService {
             MPJLambdaWrapper<BuyOrder> w = new MPJLambdaWrapper();
             w.leftJoin(PayZfbOrderEntity.class,PayZfbOrderEntity::getRelevanceoid, BuyOrder::getOrderSn);
             w.eq("trade_no",((Map)res.get("alipay_trade_refund_response")).get("trade_no"));
+
             BuyOrder order = buyOrderService.getOne(w);
             PayRefundOrder refund = new PayRefundOrder();
             refund.setPayType("2");
@@ -367,11 +402,81 @@ public class AliPayServiceImpl  implements AliPayService {
             refund.setOutTradeNo(((Map)res.get("alipay_trade_refund_response")).get("out_trade_no").toString());
             refund.setRefundFee(((Map)res.get("alipay_trade_refund_response")).get("refund_fee").toString());
             refundOrderService.save(refund);
-            refundOrderService.businessOpt(order);
+            if (Constants.ORDER_STATUS_REFUND.equals(order.getOrderStatus())) {
+                BuyOrderRefund buyOrderRefund = buyOrderRefundService.getOne(new LambdaQueryWrapper<BuyOrderRefund>()
+                        .eq(BuyOrderRefund::getOrderId, order.getOrderId())
+                        .orderByDesc(BuyOrderRefund::getId)
+                        .last("limit 1"));
+                if (buyOrderRefund != null) {
+                    buyOrderRefundLogService.insertRefundLog(buyOrderRefund.getId(),3,1);
+                }
+            } else {
+                refundOrderService.businessOpt(order);
+            }
         }
         return resJson;
     }
 
+    @Override
+    @Transactional
+    public String refund(BuyOrder buyOrder, MyUserEntity user, BuyOrderRefund buyOrderRefund){
+
+        LambdaQueryWrapper<PayZfbOrderEntity> wrapper = new LambdaQueryWrapper();
+        wrapper.eq(PayZfbOrderEntity::getRelevanceoid,buyOrder.getOrderSn());
+        PayZfbOrderEntity payZfbOrder = payZfbOrderService.getOne(wrapper);
+        //组装退款参数
+        ReFundDTO reFundDTO = new ReFundDTO();
+        reFundDTO.setOutTrandeNo(buyOrder.getOrderSn());
+        reFundDTO.setTradeNo(payZfbOrder.getTradeNo());
+        reFundDTO.setCustomerId(user.getId().toString());
+        reFundDTO.setRefundReason("用户申请退款");
+        reFundDTO.setRefundAmount(buyOrderRefund.getFee());
+        reFundDTO.setOutRequestNo(buyOrderRefund.getRefundNo());
+
+
+
+        String mchName = "";
+        if (("trainingClass".equals(buyOrder.getOrderType())||"lsorder".equals(buyOrder.getOrderType()))) {
+            mchName = "LS";
+        }
+        reFundDTO.setMchName(mchName);
+        log.info("========refundDto", JSON.toJSONString(reFundDTO));
+
+        //请求支付宝退款
+        Map<String, Object> map = aliPayUtil.aliPayRefund(reFundDTO);
+
+        buyOrderRefundLogService.insertRefundLog(buyOrderRefund.getId(),2,2);
+
+        Object obj = map.get("msg");
+        String resJson = obj.toString();
+        log.info(">>>>>>>>>>>支付宝返回的信息是 resJson = {}", resJson);
+        Map<String,Object> res = JSONObject.parseObject(resJson);
+        //10000表示接口请求成功，Y表示资金变动成功
+        if ("10000".equals(((Map)res.get("alipay_trade_refund_response")).get("code"))&&
+                "Y".equals(((Map)res.get("alipay_trade_refund_response")).get("fund_change"))) {
+            log.info(">>>>>>>>>>>支付宝退款成功!<<<<<<<<<<<<<");
+
+           /* PayRefundOrder refund = new PayRefundOrder();
+            refund.setPayType("2");
+//            refund.setRefundId(((Map)res.get("alipay_trade_refund_response")).get("out_request_no").toString());
+            refund.setTradeNo(((Map)res.get("alipay_trade_refund_response")).get("trade_no").toString());
+            refund.setOrderSn(((Map)res.get("alipay_trade_refund_response")).get("out_trade_no").toString());
+            refund.setRefundFee(((Map)res.get("alipay_trade_refund_response")).get("refund_fee").toString());
+            refundOrderService.save(refund);*/
+
+            BuyOrderRefund refundInfo = buyOrderRefundService.getOne(new QueryWrapper<BuyOrderRefund>().eq("order_id",buyOrder.getOrderId()));
+            refundInfo.setStatus(1);
+            refundInfo.setWxRefundNo(refundInfo.getRefundNo());
+            buyOrderRefundService.updateById(refundInfo);
+
+            buyOrderService.refundOrder(buyOrder,user,refundInfo.getId());
+
+            buyOrderRefundLogService.insertRefundLog(refundInfo.getId(),2,1);
+
+            buyOrderService.updateOrderStatus(buyOrder.getUserId(),buyOrder.getOrderSn(),"6");
+        }
+        return resJson;
+    }
     private void userCoinJf(BuyOrder order){
         MyUserEntity userEntity = userService.getById(order.getUserId());
         userEntity.setJf(userEntity.getJf().subtract(order.getJfDeduction()));

src/main/java/com/peanut/modules/pay/refund/entity/PayRefundOrder.java

@@ -19,7 +19,9 @@ public class PayRefundOrder implements Serializable {
 
 
     @TableId
-    private Integer refundId;
+    private Integer id;
+
+    private String refundId;
 
     /**
      * 支付方式   1微信，2支付宝，3虚拟币
@@ -29,8 +31,9 @@ public class PayRefundOrder implements Serializable {
     /**
      * BuyOrder
      */
-    private Integer orderId;
+    private String orderSn;
 
+    private Integer orderId;
     /**
      * 微信支付宝订单号
      */

src/main/java/com/peanut/modules/pay/weChatPay/controller/WeChatPayController.java

@@ -126,6 +126,7 @@ public class WeChatPayController {
      */
     @RequestMapping("/refund" )
     public R refund(@RequestBody Map<String,Object> map){
+
         return R.ok(wxpayService.refund(map));
     }
 
@@ -135,10 +136,13 @@ public class WeChatPayController {
      */
     @PostMapping("/refundNotify")
     public void refundNotify(HttpServletRequest request){
+
         wxpayService.refundNotify(request);
     }
+
     @PostMapping("/lsRefundNotify")
     public void lsRefundNotify(HttpServletRequest request){
+
         wxpayService.lsRefundNotify(request);
     }
 

src/main/java/com/peanut/modules/pay/weChatPay/dto/WeChatRefundInfo.java

@@ -0,0 +1,21 @@
+package com.peanut.modules.pay.weChatPay.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class WeChatRefundInfo implements Serializable {
+    private String orderSn;
+    private Integer orderId;
+    private String orderType;
+    private String refundNo;
+    private BigDecimal totalAmount;
+    private BigDecimal refundAmount;
+    private String remark;
+    private String appName;
+    private String currency;
+    private String notify_url;
+    private int refundId;
+}

src/main/java/com/peanut/modules/pay/weChatPay/service/WxpayService.java

@@ -2,6 +2,7 @@ package com.peanut.modules.pay.weChatPay.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.peanut.modules.common.entity.PayWechatOrderEntity;
+import com.peanut.modules.pay.weChatPay.dto.WeChatRefundInfo;
 import com.peanut.modules.pay.weChatPay.dto.WechatPaymentInfo;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,8 @@ public interface WxpayService extends IService<PayWechatOrderEntity> {
 
     String refund(Map<String,Object> map);
 
+    void refund(WeChatRefundInfo refundInfo);
+
     void refundNotify(HttpServletRequest request);
 
     void lsRefundNotify(HttpServletRequest request);

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

@@ -20,11 +20,13 @@ import com.peanut.modules.master.service.UserCourseBuyService;
 import com.peanut.modules.pay.refund.entity.PayRefundOrder;
 import com.peanut.modules.pay.refund.service.PayRefundOrderService;
 import com.peanut.modules.pay.weChatPay.config.WechatPayConfig;
+import com.peanut.modules.pay.weChatPay.dto.WeChatRefundInfo;
 import com.peanut.modules.pay.weChatPay.dto.WechatPaymentInfo;
 import com.peanut.modules.pay.weChatPay.service.WxpayService;
 import com.peanut.modules.pay.weChatPay.util.HttpUtils;
 import com.peanut.modules.pay.weChatPay.util.WechatPayValidator;
 import com.peanut.modules.pay.weChatPay.util.WxPayUtil;
+import com.qiniu.util.Json;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -89,6 +91,12 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
     private AiVipLogService aiVipLogService;
     @Autowired
     private UserCourseBuyLogDao userCourseBuyLogDao;
+    @Autowired
+    private BuyOrderRefundLogService buyOrderRefundLogService;
+    @Autowired
+    private MyUserService myUserService;
+    @Autowired
+    private BuyOrderRefundService buyOrderRefundService;
 
     @Override
     public void prepay(WechatPaymentInfo paymentInfo){
@@ -136,6 +144,7 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
         }else {
             responseJson = wxPayUtil.doPostWexinV3(wechatPayConfig.getPayUrl(), json.toJSONString(),"");
         }
+        System.out.println(responseJson);
         String prepayId = responseJson.getString("prepay_id");
         if (paymentInfo.getBuyOrderId() == null) {
             payWechatOrderService.add(paymentInfo.getOrderSn(), prepayId);
@@ -350,6 +359,68 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
         return responseJson.toJSONString();
     }
 
+    @Override
+    public void refund(WeChatRefundInfo refundInfo) {
+        Map<String, Object> paramMap = new HashMap<>();
+
+        BigDecimal refund = new BigDecimal(refundInfo.getRefundAmount().toString());
+        //原订单总金额
+        BigDecimal total = refundInfo.getTotalAmount();
+        // 这里 * 100，微信支付单位为 ‘分’
+        BigDecimal hand = new BigDecimal("100");
+        Map<String, Object> amountMap = new HashMap<>();
+        amountMap.put("refund", refund.multiply(hand).intValue());
+        amountMap.put("total", total.multiply(hand).intValue());
+        amountMap.put("currency", "CNY");
+        paramMap.put("amount", amountMap);
+        paramMap.put("out_refund_no", refundInfo.getRefundNo());
+        //微信支付订单号
+        paramMap.put("out_trade_no", refundInfo.getOrderSn());
+        //退款原因
+        paramMap.put("reason", refundInfo.getRemark());
+
+        String appid = "";
+        if (refundInfo.getAppName()==null||"".equals(refundInfo.getAppName())){
+            appid =  wechatPayConfig.getAppId();
+        }else if ("zmzm".equals(refundInfo.getAppName())){
+            appid =  wechatPayConfig.getZmzmappId();
+        } else if ("wumen".equals(refundInfo.getAppName())) {
+            appid = wechatPayConfig.getWumenappId();
+        } else if ("xlkj".equals(refundInfo.getAppName())) {
+            appid = wechatPayConfig.getXlkjappId();
+        } else if ("thyy".equals(refundInfo.getAppName())) {
+            appid = wechatPayConfig.getThyyappId();
+        }
+        // app id
+//        paramMap.put("appid", appid);
+
+        String notify_url = wechatPayConfig.getRefundNotifyUrl();
+        String mchName = "";
+
+        String mchid = wechatPayConfig.getMchId();
+        if ("trainingClass".equals(refundInfo.getOrderType())||"lsorder".equals(refundInfo.getOrderType())) {
+            mchName = "LS";
+            mchid =  wechatPayConfig.getLsMchId();
+            notify_url = wechatPayConfig.getLsRefundNotifyUrl();
+        }
+//        paramMap.put("mchid", mchid);
+        paramMap.put("notify_url", notify_url);
+
+        JSONObject json = JSONObject.parseObject(JSON.toJSONString(paramMap));
+        log.info("=======微信退款申请请求参数:{}", json.toJSONString());
+        log.info(">>>>>>>>>>App请求微信退款申请接口");
+
+        JSONObject responseJson = wxPayUtil.doPostWexinV3(wechatPayConfig.getRefundUrl(), json.toJSONString(),mchName);
+
+        System.out.println(responseJson);
+        log.info(">>>>>>>>>>>微信退款返回的信息是 resJson = {}", responseJson.toJSONString());
+        buyOrderRefundLogService.insertRefundLog(refundInfo.getRefundId(),1,2);
+        if ("PROCESSING".equals(responseJson.get("status"))){
+            BuyOrderRefund buyOrderRefund = buyOrderRefundService.getById(refundInfo.getRefundId());
+            buyOrderRefund.setWxRefundNo(responseJson.getString("refund_id"));
+            buyOrderRefundService.updateById(buyOrderRefund);
+        }
+    }
     private void userCoinJf(BuyOrder order){
         MyUserEntity userEntity = userService.getById(order.getUserId());
         userEntity.setJf(userEntity.getJf().subtract(order.getJfDeduction()));
@@ -373,6 +444,18 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
         // 解密resource中的通知数据
         String resource = bodyMap.get("resource").toString();
         Map<String, Object> resourceMap = WechatPayValidator.decryptFromResource(resource, wechatPayConfig.getApiV3Key(), 2);
+        /*BuyOrder orderFalse = buyOrderService.getOne(new QueryWrapper<BuyOrder>().eq("user_id",149299).orderByDesc("order_id"));
+        BuyOrderRefund refundFalse = buyOrderRefundService.getOne(new QueryWrapper<BuyOrderRefund>().eq("user_id",149299).orderByDesc("id"));
+        Map<String, Object> resourceMap = new HashMap<>();
+        resourceMap.put("refund_status","SUCCESS");
+        resourceMap.put("out_trade_no",orderFalse.getOrderSn());
+        resourceMap.put("refund_id",System.currentTimeMillis());
+        resourceMap.put("out_refund_no",refundFalse.getRefundNo());
+        Map<String,BigDecimal> amount = new HashMap<>();
+        amount.put("refund",orderFalse.getRealMoney());
+        resourceMap.put("amount",amount);*/
+
+
         log.info("微信退款回调结果 msg={}",resourceMap);
         if ("SUCCESS".equals(resourceMap.get("refund_status").toString())){
             log.info(">>>>>>>>>>>微信退款成功!<<<<<<<<<<<<<");
@@ -381,14 +464,41 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
             w.leftJoin(PayWechatOrderEntity.class,PayWechatOrderEntity::getOrderSn, BuyOrder::getOrderSn);
             w.eq("t1.order_id",resourceMap.get("transaction_id").toString());
             BuyOrder order = buyOrderService.getOne(w);
+
             PayRefundOrder refund = new PayRefundOrder();
             refund.setPayType("1");
-            refund.setOrderId(order.getOrderId());
+            refund.setRefundId(resourceMap.get("refund_id").toString());
             refund.setTradeNo(resourceMap.get("transaction_id").toString());
-            refund.setOutTradeNo(resourceMap.get("out_trade_no").toString());
+            refund.setOrderSn(resourceMap.get("out_trade_no").toString());
+            String refundFeeStr = ((Map)resourceMap.get("amount")).get("refund").toString();
+            BigDecimal refundFee = new BigDecimal(refundFeeStr).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP);
             refund.setRefundFee(((Map)resourceMap.get("amount")).get("refund").toString());
             refundOrderService.save(refund);
-            refundOrderService.businessOpt(order);
+
+            MyUserEntity user = myUserService.getById(order.getUserId());
+
+            BuyOrderRefund refundInfo = buyOrderRefundService.getOne(new QueryWrapper<BuyOrderRefund>().eq("order_id",order.getOrderId()));
+            refundInfo.setStatus(1);
+            refundInfo.setWxRefundNo( resourceMap.get("refund_id").toString());
+            buyOrderRefundService.updateById(refundInfo);
+
+            buyOrderService.refundOrder(order,user,refundInfo.getId());
+
+            buyOrderRefundLogService.insertRefundLog(refundInfo.getId(),1,1);
+
+            buyOrderService.updateOrderStatus(order.getUserId(),order.getOrderSn(),"6");
+//            refundOrderService.businessOpt(order);
+        }else{
+            if(resourceMap.containsKey("out_refund_no")){
+                String refundNo = resourceMap.get("out_refund_no").toString();
+                BuyOrderRefund refundInfo = buyOrderRefundService.getOne(new QueryWrapper<BuyOrderRefund>().eq("refund_no",refundNo));
+                refundInfo.setStatus(2);
+                refundInfo.setWxRefundNo( resourceMap.get("refund_id").toString());
+                buyOrderRefundService.updateById(refundInfo);
+
+//                buyOrderRefundLogService.insertRefundLog(refundInfo.getId(),1,3,resourceMap.get("reason").toString());
+            }
+
         }
     }
     @Override
@@ -408,14 +518,40 @@ public class WxpayServiceImpl extends ServiceImpl<PayWechatOrderDao, PayWechatOr
             w.leftJoin(PayWechatOrderEntity.class,PayWechatOrderEntity::getOrderSn, BuyOrder::getOrderSn);
             w.eq("t1.order_id",resourceMap.get("transaction_id").toString());
             BuyOrder order = buyOrderService.getOne(w);
+
             PayRefundOrder refund = new PayRefundOrder();
             refund.setPayType("1");
-            refund.setOrderId(order.getOrderId());
+            refund.setRefundId(resourceMap.get("refund_id").toString());
             refund.setTradeNo(resourceMap.get("transaction_id").toString());
-            refund.setOutTradeNo(resourceMap.get("out_trade_no").toString());
+            refund.setOrderSn(resourceMap.get("out_trade_no").toString());
             refund.setRefundFee(((Map)resourceMap.get("amount")).get("refund").toString());
             refundOrderService.save(refund);
-            refundOrderService.businessOpt(order);
+
+            //refundOrderService.businessOpt(order);
+
+            MyUserEntity user = myUserService.getById(order.getUserId());
+
+            BuyOrderRefund refundInfo = buyOrderRefundService.getOne(new QueryWrapper<BuyOrderRefund>().eq("order_id",order.getOrderId()));
+            refundInfo.setStatus(1);
+            refundInfo.setWxRefundNo( resourceMap.get("refund_id").toString());
+            buyOrderRefundService.updateById(refundInfo);
+
+            buyOrderService.refundOrder(order,user,refundInfo.getId());
+
+            buyOrderRefundLogService.insertRefundLog(refundInfo.getId(),1,1);
+
+            buyOrderService.updateOrderStatus(order.getUserId(),order.getOrderSn(),"6");
+        }else{
+            if(resourceMap.containsKey("out_refund_no")){
+                String refundNo = resourceMap.get("out_refund_no").toString();
+                BuyOrderRefund refundInfo = buyOrderRefundService.getOne(new QueryWrapper<BuyOrderRefund>().eq("refund_no",refundNo));
+                refundInfo.setStatus(2);
+                refundInfo.setWxRefundNo( resourceMap.get("refund_id").toString());
+                buyOrderRefundService.updateById(refundInfo);
+
+//                buyOrderRefundLogService.insertRefundLog(refundInfo.getId(),1,3,resourceMap.get("reason").toString());
+            }
+
         }
     }
 

src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java

@@ -1,6 +1,7 @@
 package com.peanut.modules.sociology.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -10,9 +11,12 @@ import com.peanut.common.utils.ShiroUtils;
 import com.peanut.modules.book.service.ShopProductService;
 import com.peanut.modules.common.dao.*;
 import com.peanut.modules.common.entity.*;
+import com.peanut.modules.common.service.CourseMedicineService;
+import com.peanut.modules.common.service.CourseToMedicineService;
 import com.peanut.modules.common.service.MyUserService;
 import com.peanut.modules.common.service.UserVipService;
 import com.peanut.modules.common.to.ParamTo;
+import com.peanut.modules.master.service.CourseMedicalService;
 import com.peanut.modules.sociology.service.CourseService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
@@ -52,6 +56,10 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
     private UserVipDao userVipDao;
     @Autowired
     private UserCourseBuyLogDao userCourseBuyLogDao;
+    @Autowired
+    private CourseToMedicineService courseToMedicineService;
+    @Autowired
+    private CourseMedicineService courseMedicineService;
 
 
     //根据标签获取课程列表
@@ -117,7 +125,14 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
         Page<CourseEntity> courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()), CourseEntity.class, wrapper);
         return courseEntityPage;
     }
-
+    public CourseMedicine getCourseMedicinePid(int medicineId){
+        CourseMedicine courseMedicine = courseMedicineService.getById(medicineId);
+        if(courseMedicine.getPid()==0){
+            return courseMedicine;
+        }else{
+            return getCourseMedicinePid(courseMedicine.getPid());
+        }
+    }
     @Override
     public Map<String, Object> getCourseDetail(Integer id) {
         Map<String, Object> flag = new HashMap<>();
@@ -163,6 +178,26 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
                 }
             }
         }
+        QueryWrapper<CourseToMedicine> courseToMedicineWrapper = new QueryWrapper<CourseToMedicine>();
+        courseToMedicineWrapper.eq("course_id",course.getId());
+        List<CourseToMedicine> courseToMedicineList = courseToMedicineService.list(courseToMedicineWrapper);
+        String content = course.getContent();
+        List<Integer> medicinePids = new ArrayList<>();
+        for (CourseToMedicine courseToMedicine:courseToMedicineList){
+            CourseMedicine courseMedicine = getCourseMedicinePid(courseToMedicine.getMedicalId());
+            if(medicinePids.contains(courseMedicine.getId())){
+                continue;
+            }
+            if(courseMedicine!=null && courseMedicine.getId()==1){
+                content = content+"<img src=\"https://ehh-public-01.oss-cn-beijing.aliyuncs.com/image/zhong-yi-xue-ke-cheng-biao.jpg\"/>";
+            }else if(courseMedicine!=null && courseMedicine.getId()==74){
+                content = content+"<img src=\"https://ehh-public-01.oss-cn-beijing.aliyuncs.com/image/hui-tong-ke-cheng-biao.jpg\"/>";
+            }
+            if(courseMedicine!=null){
+                medicinePids.add(courseMedicine.getId());
+            }
+        }
+        course.setContent(content);
         flag.put("course",course);
         //课程关联商品
         if (StringUtils.isNotEmpty(course.getRelationProductIds())){

src/main/resources/application.yml

@@ -11,7 +11,7 @@ connection-timeout: 6000000ms
 spring:
   # 环境 /dev1|test|prod
   profiles:
-    active: dev1
+    active: prod
   # jackson时间格式化
   jackson:
     time-zone: GMT+8

src/main/resources/logback-spring.xml

@@ -210,8 +210,9 @@
 
     <!--    &lt;!&ndash; 4.2 生产环境:输出到文档&ndash;&gt;-->
     <springProfile name="test,prod">
-        <logger name="com.peanut" level="ERROR" additivity="false">
+        <logger name="com.peanut" level="INFO" additivity="false">
 <!--            <appender-ref ref="DEBUG_FILE"/>-->
+            <appender-ref ref="INFO_FILE"/>
             <appender-ref ref="ERROR_FILE"/>
         </logger>
         <root level="info">

src/main/resources/mapper/book/BuyOrderDao.xml

@@ -65,7 +65,8 @@
         left join user u on u.id = bo.user_id
         left join buy_order_product bop on bop.order_id = bo.order_id
         left join shop_product sp on sp.product_id = bop.product_id
-        where u.id not in (select id from user where tester_flag = 1)
+        where
+        ( u.id not in (select id from user where tester_flag = 1) or (u.id in (select id from user where tester_flag = 1) and (bo.payment_method='1' or bo.payment_method='2') and bo.create_time>='2026-05-06 00:00:00') )
         and bo.order_status in (1,2,3,4) and sp.goods_type != '05' and bo.real_money > 0
         <if test="orderType != null and orderType!= ''">
             <if test="orderType == 'lsorder' ">
@@ -99,13 +100,14 @@
                      from (
                               select bo.order_id,DATE_FORMAT(bo.create_time,'%Y-%m-%d %H:%i:%s') createTime,u.name,if(u.tel is null,if(u.email is null,'',u.email),u.tel) tel,bo.order_sn orderSn,
                                      IF(bo.payment_method=1,'微信',IF(bo.payment_method=2,'支付宝',IF(bo.payment_method=4,'天医币','0'))) payType,
-                                     IF(bo.order_status = 4,'已删除',IF(bo.order_status = 3,'已完成',IF(bo.order_status = 2,'已发货','已付款'))) orderStatus,bo.real_money orderPrice,if(bo.remark like '%退%',bo.remark,'') remark
+                                     IF(bo.order_status = 4,'已删除',IF(bo.order_status = 3,'已完成',IF(bo.order_status = 2,'已发货',IF(bo.order_status = 6,'已退款','已付款')))) orderStatus,bo.real_money orderPrice,if(bo.remark like '%退%',bo.remark,'') remark
                               from buy_order bo
                                        left join user u on u.id = bo.user_id
                                        left join buy_order_product bop on bop.order_id = bo.order_id
                                        left join shop_product sp on sp.product_id = bop.product_id
-                              where u.id not in (select id from user where tester_flag = 1)
-                                and bo.order_status in (1,2,3,4) and sp.goods_type != '05' and bo.real_money > 0
+                              where
+                                ( u.id not in (select id from user where tester_flag = 1) or (u.id in (select id from user where tester_flag = 1) and (bo.payment_method='1' or bo.payment_method='2') and bo.create_time>='2026-05-06 00:00:00') )
+                                and bo.order_status in (1,2,3,4,6) and sp.goods_type != '05' and bo.real_money > 0
                                 <if test="orderType != null and orderType!= ''">
                                     <if test="orderType == 'lsorder' ">
                                         and (bo.payment_method = '1' or (bo.payment_method = '2' and bo.order_id >37867))

src/main/resources/mapper/master/UserCourseBuyDao.xml

@@ -35,7 +35,7 @@
                                                                  left join course_catalogue cc on cc.id = ucb.catalogue_id
                                                                  left join pay_zfb_order pzo on pzo.relevanceOid = ucbl.order_sn and pzo.trade_no is not null
                                                         where ucbl.del_flag = 0 and ucbl.fee > 0 and DATE_FORMAT(ucbl.pay_time,'%Y-%m-%d') <= #{date}
-                                                          and u.id not in (select id from user where tester_flag = 1)
+                                                          and (u.id not in (select id from user where tester_flag = 1) or (u.id in (select id from user where tester_flag = 1 and ( ucbl.pay_type in ('微信','支付宝') and ucbl.create_time>='2026-05-06 00:00:00'))))
                                                         order by ucb.id
                                                     ) t) s) q) w) e) r
     </select>

src/main/resources/mapper/master/UserVipLogDao.xml

@@ -20,7 +20,8 @@
                           left join pay_zfb_order pzo on pzo.relevanceOid = uvl.order_sn and pzo.trade_no is not null
                  where u.del_flag = 0 and uvl.del_flag = 0 and uv.del_flag = 0
                    and DATE_FORMAT(IF(uvl.pay_time is NULL,uvl.start_time,uvl.pay_time), '%Y-%m') <= SUBSTR(#{date},1,7)
-                   and u.id not in (select id from user where tester_flag = 1)
+                   and
+                     (u.id not in (select id from user where tester_flag = 1) or (u.id in (select id from user where tester_flag = 1 and (uvl.pay_type in('微信','支付宝') and uvl.create_time>='2026-05-06 00:00:00'))))
                  order by uvl.end_time asc
              ) t  order by currentDays desc
     </select>
@@ -49,5 +50,25 @@
              ) s
     </select>
 
+    <select id="getUserVipRefundInfo" resultType="map">
+        select t.*,
+               IF(totalDays=alreadyDays,fee,dayAmount*alreadyDays) alreadyTanxiao,
+               dayAmount*currentDays currentTanxiao,
+               fee-IF(totalDays=alreadyDays,fee,dayAmount*alreadyDays)-(dayAmount*currentDays) notyetTanxiao
+        from (select uvl.*,c.create_time refund_time,u.name,if(u.tel is null,if(u.email is null,'',u.email),u.tel) tel, IF(uv.type=4,'中医学',IF(uv.type=5,'针灸学',IF(uv.type=6,'肿瘤学',IF(uv.type=7,'国学',IF(uv.type=8,'心理学','中西汇通学'))))) type,
+                     uvl.start_time startTime,uvl.end_time endTime,if(uvl.pay_time is null,'',uvl.pay_time) payTime,uvl.order_sn orderSn,pzo.trade_no zfbOrder,uvl.pay_type payType,uvl.remark,uvl.price,uvl.fee,DATEDIFF(uvl.end_time,uvl.start_time)+1 totalDays,ROUND(uvl.fee/(DATEDIFF(uvl.end_time,uvl.start_time)+1),2) dayAmount,
+                     IF(DATE_FORMAT(uvl.end_time, '%Y-%m') &lt; SUBSTR(#{date},1,7),DATEDIFF(uvl.end_time,uvl.start_time)+1,IF(DATE_FORMAT(uvl.start_time, '%Y-%m') > SUBSTR(#{date},1,7),0,IF(DATE_FORMAT(uvl.start_time, '%Y-%m') &lt; SUBSTR(#{date},1,7),DATEDIFF(concat(SUBSTR(#{date},1,7),'-01'),uvl.start_time),0))) alreadyDays,
+                     IF(DATE_FORMAT(uvl.start_time, '%Y-%m') > SUBSTR(#{date},1,7),0,IF(DATE_FORMAT(uvl.end_time, '%Y-%m') &lt; SUBSTR(#{date},1,7),0,IF(DATE_FORMAT(uvl.end_time, '%Y-%m') > SUBSTR(#{date},1,7),if(DATE_FORMAT(uvl.start_time, '%Y-%m') = SUBSTR(#{date},1,7),DATEDIFF(#{date},uvl.start_time)+1,DAY(#{date})),DATEDIFF(uvl.end_time,concat(SUBSTR(#{date},1,7),'-01'))+1))) currentDays,
+                     IF(DATE_FORMAT(uvl.start_time, '%Y-%m') > SUBSTR(#{date},1,7),DATEDIFF(uvl.end_time,uvl.start_time)+1,(IF(DATE_FORMAT(uvl.end_time, '%Y-%m') &lt;= SUBSTR(#{date},1,7),0,DATEDIFF(uvl.end_time,#{date})))) notyetDays
 
+              from buy_order a left join user_vip_log uvl on a.order_sn = uvl.order_sn
+                               left join user_vip vp on uvl.user_vip_id = vp.id
+                               left join buy_order_refund c on c.order_id=a.order_id left join user u on a.user_id=u.id
+                               left join pay_zfb_order pzo on pzo.relevanceOid = a.order_sn and pzo.trade_no is not null
+              where a.order_status='6' and
+                  DATE_FORMAT(a.create_time, '%Y-%m') = SUBSTR(#{last_l_date},1,7) and DATE_FORMAT(c.create_time, '%Y-%m') = SUBSTR(#{last_date},1,7) and a.order_type='vip' and a.del_flag=0 and uvl.del_flag=0 and c.del_flag=0
+
+             ) t  order by currentDays desc
+            ) s
+    </select>
 </mapper>