代码修复

admin-pc/.env.development

@@ -1,5 +1,5 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=https://popularize-admin.hhlm1688.com/popularize-admin/
+VUE_APP_API_BASE_URL=http://localhost:8001/popularize-admin/
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
 

admin-pc/.env.production

@@ -1,4 +1,4 @@
 NODE_ENV=production
-VUE_APP_API_BASE_URL=https://popularize-admin.hhlm1688.com/popularize-admin/
+VUE_APP_API_BASE_URL=http://localhost:8001/popularize-admin/
 VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

admin-pc/src/views/popularizeOrder/PopularizeOrderList.vue

@@ -233,6 +233,11 @@
             align:"center",
             dataIndex: 'userId_dictText'
           },
+          {
+            title:'性别',
+            align:"center",
+            dataIndex: 'user_sex'
+          },
           {
             title:'支付金额',
             align:"center",

module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java

@@ -35,6 +35,8 @@ import org.jeecg.modules.popularizeInvoicing.entity.PopularizeInvoicing;
 import org.jeecg.modules.popularizeInvoicing.service.IPopularizeInvoicingService;
 import org.jeecg.modules.popularizeOrder.entity.PopularizeOrder;
 import org.jeecg.modules.popularizeOrder.service.IPopularizeOrderService;
+import org.jeecg.modules.popularizeOrderTuiLog.entity.PopularizeOrderTuiLog;
+import org.jeecg.modules.popularizeOrderTuiLog.service.IPopularizeOrderTuiLogService;
 import org.jeecg.modules.popularizeRecruit.entity.PopularizeRecruit;
 import org.jeecg.modules.popularizeRecruit.service.IPopularizeRecruitService;
 import org.jeecg.modules.popularizeRecruitLog.entity.PopularizeRecruitLog;
@@ -52,6 +54,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import javax.transaction.Transactional;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.util.*;
 
@@ -88,6 +91,8 @@ public class ApiIndexServiceImpl implements ApiIndexService {
     private IPopularizeActivityService popularizeActivityService;
     @Autowired
     private IPopularizeRecruitLogService popularizeRecruitLogService;
+    @Autowired
+    private IPopularizeOrderTuiLogService popularizeOrderTuiLogService;
 
 
     //支付接口
@@ -356,9 +361,28 @@ public class ApiIndexServiceImpl implements ApiIndexService {
     //获取旅行列表带分页
     @Override
     public Result<?> getTravelPageList(String title,String state, String timeStr,PageBean pageBean){
+
+
+        // 添加活动时间在当前时间之前的条件
+
+        List<PopularizeTravel> activityList = popularizeTravelService
+                .lambdaQuery()
+                .lt(PopularizeTravel::getStartTime, LocalDateTime.now())
+                .list(); // 这是一个假设的方法名，您需要根据实际情况调整
+
+        for (PopularizeTravel activity : activityList) {
+            activity.setType("1"); // 设置状态为往期活动
+            activity.setState(1); //设置活动已经结束
+            popularizeTravelService.updateById(activity);
+        }
+
+
+
+
         Page<PopularizeTravel> page = new Page<PopularizeTravel>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<PopularizeTravel> page1 = popularizeTravelService
                 .lambdaQuery()
+                .eq(PopularizeTravel::getIsOpen,"Y")
                 .orderByDesc(PopularizeTravel::getCreateTime)
                 .page(page);
         //如果标题不为空
@@ -367,6 +391,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                     .lambdaQuery()
                     .like(PopularizeTravel::getTitle,title)
                     .eq(PopularizeTravel::getState,state)
+                    .eq(PopularizeTravel::getIsOpen,"Y")
                     .orderByDesc(PopularizeTravel::getCreateTime)
                     .page(page);
         }
@@ -376,6 +401,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                     .lambdaQuery()
                     .like(PopularizeTravel::getStartTime,timeStr)
                     .eq(PopularizeTravel::getState,state)
+                    .eq(PopularizeTravel::getIsOpen,"Y")
                     .orderByDesc(PopularizeTravel::getCreateTime)
                     .page(page);
         }
@@ -392,6 +418,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                         .lambdaQuery()
                         .like(PopularizeTravel::getTitle,title)
                         .eq(PopularizeTravel::getState,state)
+                        .eq(PopularizeTravel::getIsOpen,"Y")
                         .orderByDesc(PopularizeTravel::getCreateTime)
                         .page(page);
             }
@@ -593,44 +620,128 @@ public class ApiIndexServiceImpl implements ApiIndexService {
         return Result.OK(map);
     }
 
+//
+//    //取消订单活动
+//    @Override
+//    public Result<?> cancelOrder(String token,String orderId){
+//        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+//        PopularizeOrder popularizeOrder = popularizeOrderService.getById(orderId);
+////        byId.setState("3");
+////        popularizeOrderService.updateById(byId);
+//
+//        //7天外退款时，退100%。
+//        //7天内至1天以外，退50%。
+//        //24小时以内，无法退款。
+//        String msg = "取消成功";
+//
+//        //获取退款当前时间
+//        long l = System.currentTimeMillis();
+//        //获取活动开始时间
+//
+//
+//
+//        if(popularizeOrder.getPayTime().getTime()+1000*60*60*24*7>System.currentTimeMillis()){
+//            popularizeOrder.setTuiPrice(popularizeOrder.getPayPrice());
+//
+//            RefundOrderReq req = new RefundOrderReq();
+//            req.setOutTradeNo(popularizeOrder.getOutTradeNo());
+//            req.setRefundAmount(popularizeOrder.getTuiPrice());
+//            req.setTotalAmount(popularizeOrder.getPayPrice());
+//            req.setTransactionId(popularizeOrder.getTransactionId());
+//            wxMiniappPayService.refund(req);
+//            msg = "取消成功,7天外退款时，退100%";
+//        }else if(popularizeOrder.getPayTime().getTime()+1000*60*60*24*7>System.currentTimeMillis()-1000*60*60*24) {
+//            popularizeOrder.setTuiPrice(popularizeOrder.getPayPrice().divide(new BigDecimal(2)));
+//            RefundOrderReq req = new RefundOrderReq();
+//            req.setOutTradeNo(popularizeOrder.getOutTradeNo());
+//            req.setRefundAmount(popularizeOrder.getTuiPrice());
+//            req.setTotalAmount(popularizeOrder.getPayPrice());
+//            req.setTransactionId(popularizeOrder.getTransactionId());
+//            wxMiniappPayService.refund(req);
+//            msg = "取消成功,7天内至1天以外，退50%";
+//        }else if(popularizeOrder.getPayTime().getTime()+1000*60*60*24>System.currentTimeMillis()){
+//            msg = "24小时以内，无法退款。";
+//        }
+//        return Result.OK("取消成功");
+//    }
+
+
 
-    //取消订单活动
     @Override
-    public Result<?> cancelOrder(String token,String orderId){
-        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        PopularizeOrder popularizeOrder = popularizeOrderService.getById(orderId);
-//        byId.setState("3");
-//        popularizeOrderService.updateById(byId);
-
-        //7天外退款时，退100%。
-        //7天内至1天以外，退50%。
-        //24小时以内，无法退款。
-        String msg = "取消成功";
-        if(popularizeOrder.getPayTime().getTime()+1000*60*60*24*7>System.currentTimeMillis()){
-            popularizeOrder.setTuiPrice(popularizeOrder.getPayPrice());
-
-            RefundOrderReq req = new RefundOrderReq();
-            req.setOutTradeNo(popularizeOrder.getOutTradeNo());
-            req.setRefundAmount(popularizeOrder.getTuiPrice());
-            req.setTotalAmount(popularizeOrder.getPayPrice());
-            req.setTransactionId(popularizeOrder.getTransactionId());
-            wxMiniappPayService.refund(req);
-            msg = "取消成功,7天外退款时，退100%";
-        }else if(popularizeOrder.getPayTime().getTime()+1000*60*60*24*7>System.currentTimeMillis()-1000*60*60*24) {
-            popularizeOrder.setTuiPrice(popularizeOrder.getPayPrice().divide(new BigDecimal(2)));
-            RefundOrderReq req = new RefundOrderReq();
-            req.setOutTradeNo(popularizeOrder.getOutTradeNo());
-            req.setRefundAmount(popularizeOrder.getTuiPrice());
-            req.setTotalAmount(popularizeOrder.getPayPrice());
-            req.setTransactionId(popularizeOrder.getTransactionId());
-            wxMiniappPayService.refund(req);
-            msg = "取消成功,7天内至1天以外，退50%";
-        }else if(popularizeOrder.getPayTime().getTime()+1000*60*60*24>System.currentTimeMillis()){
-            msg = "24小时以内，无法退款。";
+    public Result<?> cancelOrder(String token, String orderId) {
+        // 常量定义（提高可读性）
+        final long ONE_DAY_MS = 1000 * 60 * 60 * 24;
+        final long SEVEN_DAYS_MS = ONE_DAY_MS * 7;
+
+        HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        PopularizeOrder order = popularizeOrderService.getById(orderId);
+
+        // 安全校验（建议添加）
+        if (order == null || order.getStartTime() == null) {
+            return Result.error("订单不存在或未支付");
+        }
+
+        long currentTime = System.currentTimeMillis();
+        long payTime = order.getStartTime().getTime();
+
+        // 时间差计算
+        long timeDiff = currentTime - payTime;
+
+        String msg;
+        BigDecimal refundAmount = BigDecimal.ZERO;
+
+        // 优化后的时间判断逻辑（从大到小判断）
+        if (timeDiff > SEVEN_DAYS_MS) {
+            // 超过7天（退100%）
+            refundAmount = order.getPayPrice();
+            msg = "取消成功，超过7天全额退款";
+        } else if (timeDiff > ONE_DAY_MS) {
+            // 1-7天之间（退50%）
+            refundAmount = order.getPayPrice().divide(new BigDecimal(2), 2, RoundingMode.HALF_UP);
+            msg = "取消成功，1-7天内退50%";
+        } else {
+            // 24小时内（不可退款）
+            msg = "24小时内不可取消订单";
+            return Result.error(msg); // 直接返回错误
         }
-        return Result.OK("取消成功");
+
+        //创建退款记录订单
+        PopularizeOrderTuiLog tuiLog = new PopularizeOrderTuiLog();
+        tuiLog.setCreateTime(new Date());
+        tuiLog.setOrderId(order.getId());
+        tuiLog.setOrderPrice(order.getPayPrice());
+        tuiLog.setTuiPrice(refundAmount);
+        tuiLog.setUserId(member.getId());
+        tuiLog.setState(0);
+        popularizeOrderTuiLogService.save(tuiLog);
+
+
+        // 执行退款操作
+        RefundOrderReq req = new RefundOrderReq();
+        req.setOutTradeNo(order.getOutTradeNo());
+        req.setRefundAmount(refundAmount);
+        req.setTotalAmount(order.getPayPrice());
+        req.setTransactionId(order.getTransactionId());
+
+        // 添加退款结果校验（建议）
+        wxMiniappPayService.refund(req);
+
+
+        // 更新订单状态（建议添加）
+        order.setState("3"); // 假设3表示已取消
+        popularizeOrderService.updateById(order);
+
+        return Result.OK(msg);
     }
 
+
+
+
+
+
+
+
+
     //订单活动签到
     @Override
     public Result<?> signIn(String token,String orderId){
@@ -999,14 +1110,15 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                 );
                 recruitObj.setNum(recruitObj.getOrderList().size());
                 //创建一个签到人数
-                recruitObj.setDoNum(
-                        popularizeOrderService
-                                .lambdaQuery()
-                                .eq(PopularizeOrder::getTravelOrderId, recruit.getId())
-                                .eq(PopularizeOrder::getState, 2)
-                                .eq(PopularizeOrder::getOpen, "Y")
-                                .list().size()
-                );
+//                recruitObj.setDoNum(
+//                        popularizeOrderService
+//                                .lambdaQuery()
+//                                .eq(PopularizeOrder::getTravelOrderId, recruit.getId())
+//                                .eq(PopularizeOrder::getState, 2)
+//                                .eq(PopularizeOrder::getOpen, "Y")
+//                                .list().size()
+//                );
+                recruitObj.setDoNum(popularizeOrderService.sumNumByTravelOrderIdAndStateQD(recruit.getId()));
 
 
 
@@ -1080,14 +1192,18 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                 );
                 recruitObj.setNum(recruitObj.getPopularizeOrderList().size());
                 //创建一个签到人数
-                recruitObj.setDoNum(
-                        popularizeOrderService
-                                .lambdaQuery()
-                                .eq(PopularizeOrder::getActivityOrderId, recruit.getId())
-                                .eq(PopularizeOrder::getState, 2)
-                                .eq(PopularizeOrder::getOpen, "Y")
-                                .list().size()
-                );
+//                recruitObj.setDoNum(
+//                        popularizeOrderService
+//                                .lambdaQuery()
+//                                .eq(PopularizeOrder::getActivityOrderId, recruit.getId())
+//                                .eq(PopularizeOrder::getState, 2)
+//                                .eq(PopularizeOrder::getOpen, "Y")
+//                                .list().size()
+//                );
+
+                recruitObj.setDoNum(popularizeOrderService.sumNumByActivityOrderIdAndStateQD(recruit.getId()));
+
+
                 recruitList.add(recruitObj);
             }
 
@@ -1310,6 +1426,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
         popularizeOrder.setOpen("N");
         popularizeOrder.setName(hanHaiMember.getNickName());
         popularizeOrder.setPhone(hanHaiMember.getPhone());
+        popularizeOrder.setUserSex(hanHaiMember.getSex());
         popularizeOrderService.save(popularizeOrder);
 
 
@@ -1414,6 +1531,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
         popularizeOrder.setIsPj("N");
         popularizeOrder.setOpen("N");
         popularizeOrder.setDetails(byId.getOrderDetails());
+        popularizeOrder.setUserSex(hanHaiMember.getSex());
         popularizeOrderService.save(popularizeOrder);
 
 

module-common/src/main/java/org/jeecg/api/service/impl/WxMiniappPayServiceImpl.java

@@ -25,6 +25,8 @@ import org.jeecg.api.wxUtils.Response;
 import org.jeecg.api.wxUtils.WxPayConfig;
 import org.jeecg.modules.popularizeOrder.entity.PopularizeOrder;
 import org.jeecg.modules.popularizeOrder.service.IPopularizeOrderService;
+import org.jeecg.modules.popularizeOrderTuiLog.entity.PopularizeOrderTuiLog;
+import org.jeecg.modules.popularizeOrderTuiLog.service.IPopularizeOrderTuiLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -33,6 +35,7 @@ import org.springframework.stereotype.Service;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -109,7 +112,8 @@ public class WxMiniappPayServiceImpl implements WxMiniappPayService {
     @Autowired
     private IPopularizeOrderService popularizeOrderService;
 
-
+    @Autowired
+    private IPopularizeOrderTuiLogService popularizeOrderTuiLogService;
 
     /**
      * 退款
@@ -180,6 +184,16 @@ public class WxMiniappPayServiceImpl implements WxMiniappPayService {
         }
         if (Status.SUCCESS.equals(refund.getStatus())) {
             log.info("退款成功！-订单号：{}", req.getOutTradeNo());
+
+            //修改退款记录订单状态
+            PopularizeOrderTuiLog tuiLog = popularizeOrderTuiLogService.lambdaQuery()
+                    .eq(PopularizeOrderTuiLog::getOrderId, payOrder.getId())
+                    .one();
+
+            tuiLog.setTuiTime(new Date());
+            tuiLog.setState(1);
+            popularizeOrderTuiLogService.updateById(tuiLog);
+
             return Response.success("退款成功");
         } else if (Status.CLOSED.equals(refund.getStatus())) {
             log.info("退款关闭！-订单号：{}", req.getOutTradeNo());

module-common/src/main/java/org/jeecg/modules/popularizeOrder/entity/PopularizeOrder.java

@@ -152,5 +152,9 @@ public class PopularizeOrder implements Serializable {
     private String outTradeNo;
 
 
+    /**性别*/
+    @Excel(name = "性别", width = 15)
+    @ApiModelProperty(value = "性别")
+    private java.lang.String userSex;
 
 }

module-common/src/main/java/org/jeecg/modules/popularizeOrder/mapper/PopularizeOrderMapper.java

@@ -20,7 +20,12 @@ public interface PopularizeOrderMapper extends BaseMapper<PopularizeOrder> {
     @Select("SELECT SUM(num) FROM popularize_order WHERE travel_order_id = #{travelOrderId} AND state in(1,2)")
     Integer sumNumByTravelOrderIdAndState(@Param("travelOrderId") String travelOrderId);
 
+    @Select("SELECT SUM(num) FROM popularize_order WHERE activity_order_id = #{activityOrderId} AND state in(2) AND open = 'Y'")
+    Integer sumNumByActivityOrderIdAndStateQD(@Param("activityOrderId") String activityOrderId);
 
 
+    @Select("SELECT SUM(num) FROM popularize_order WHERE travel_order_id = #{travelOrderId} AND state in(2) AND open = 'Y'")
+    Integer sumNumByTravelOrderIdAndStateQD(@Param("travelOrderId") String travelOrderId);
+
 
 }

module-common/src/main/java/org/jeecg/modules/popularizeOrder/service/IPopularizeOrderService.java

@@ -15,5 +15,16 @@ public interface IPopularizeOrderService extends IService<PopularizeOrder> {
     Integer sumNumByActivityOrderIdAndState(String activityOrderId);
 
 
+
+
+
+
     Integer sumNumByTravelOrderIdAndState(String travelOrderId);
+
+
+    Integer sumNumByActivityOrderIdAndStateQD(String activityOrderId);
+
+    Integer sumNumByTravelOrderIdAndStateQD(String travelOrderId);
+
+
 }

module-common/src/main/java/org/jeecg/modules/popularizeOrder/service/impl/PopularizeOrderServiceImpl.java

@@ -36,4 +36,17 @@ public class PopularizeOrderServiceImpl extends ServiceImpl<PopularizeOrderMappe
         return popularizeOrderMapper.sumNumByTravelOrderIdAndState(travelOrderId);
     }
 
+
+    @Override
+    public Integer sumNumByActivityOrderIdAndStateQD(String activityOrderId){
+        return popularizeOrderMapper.sumNumByActivityOrderIdAndStateQD(activityOrderId);
+    }
+
+
+
+    @Override
+    public Integer sumNumByTravelOrderIdAndStateQD(String travelOrderId){
+        return popularizeOrderMapper.sumNumByTravelOrderIdAndStateQD(travelOrderId);
+    }
+
 }

module-common/src/main/java/org/jeecg/modules/popularizeOrderTuiLog/controller/PopularizeOrderTuiLogController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.popularizeOrderTuiLog.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.popularizeOrderTuiLog.entity.PopularizeOrderTuiLog;
+import org.jeecg.modules.popularizeOrderTuiLog.service.IPopularizeOrderTuiLogService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 退款记录表
+ * @Author: jeecg-boot
+ * @Date:   2025-03-23
+ * @Version: V1.0
+ */
+@Api(tags="退款记录表")
+@RestController
+@RequestMapping("/popularizeOrderTuiLog/popularizeOrderTuiLog")
+@Slf4j
+public class PopularizeOrderTuiLogController extends JeecgController<PopularizeOrderTuiLog, IPopularizeOrderTuiLogService> {
+	@Autowired
+	private IPopularizeOrderTuiLogService popularizeOrderTuiLogService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param popularizeOrderTuiLog
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "退款记录表-分页列表查询")
+	@ApiOperation(value="退款记录表-分页列表查询", notes="退款记录表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<PopularizeOrderTuiLog>> queryPageList(PopularizeOrderTuiLog popularizeOrderTuiLog,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<PopularizeOrderTuiLog> queryWrapper = QueryGenerator.initQueryWrapper(popularizeOrderTuiLog, req.getParameterMap());
+		Page<PopularizeOrderTuiLog> page = new Page<PopularizeOrderTuiLog>(pageNo, pageSize);
+		IPage<PopularizeOrderTuiLog> pageList = popularizeOrderTuiLogService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param popularizeOrderTuiLog
+	 * @return
+	 */
+	@AutoLog(value = "退款记录表-添加")
+	@ApiOperation(value="退款记录表-添加", notes="退款记录表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody PopularizeOrderTuiLog popularizeOrderTuiLog) {
+		popularizeOrderTuiLogService.save(popularizeOrderTuiLog);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param popularizeOrderTuiLog
+	 * @return
+	 */
+	@AutoLog(value = "退款记录表-编辑")
+	@ApiOperation(value="退款记录表-编辑", notes="退款记录表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody PopularizeOrderTuiLog popularizeOrderTuiLog) {
+		popularizeOrderTuiLogService.updateById(popularizeOrderTuiLog);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "退款记录表-通过id删除")
+	@ApiOperation(value="退款记录表-通过id删除", notes="退款记录表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		popularizeOrderTuiLogService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "退款记录表-批量删除")
+	@ApiOperation(value="退款记录表-批量删除", notes="退款记录表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.popularizeOrderTuiLogService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "退款记录表-通过id查询")
+	@ApiOperation(value="退款记录表-通过id查询", notes="退款记录表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<PopularizeOrderTuiLog> queryById(@RequestParam(name="id",required=true) String id) {
+		PopularizeOrderTuiLog popularizeOrderTuiLog = popularizeOrderTuiLogService.getById(id);
+		if(popularizeOrderTuiLog==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(popularizeOrderTuiLog);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param popularizeOrderTuiLog
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, PopularizeOrderTuiLog popularizeOrderTuiLog) {
+        return super.exportXls(request, popularizeOrderTuiLog, PopularizeOrderTuiLog.class, "退款记录表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, PopularizeOrderTuiLog.class);
+    }
+
+}

module-common/src/main/java/org/jeecg/modules/popularizeOrderTuiLog/entity/PopularizeOrderTuiLog.java

@@ -0,0 +1,74 @@
+package org.jeecg.modules.popularizeOrderTuiLog.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 退款记录表
+ * @Author: jeecg-boot
+ * @Date:   2025-03-23
+ * @Version: V1.0
+ */
+@Data
+@TableName("popularize_order_tui_log")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="popularize_order_tui_log对象", description="退款记录表")
+public class PopularizeOrderTuiLog implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**订单标识*/
+	@Excel(name = "订单标识", width = 15)
+    @ApiModelProperty(value = "订单标识")
+    private java.lang.String orderId;
+	/**订单价格*/
+	@Excel(name = "订单价格", width = 15)
+    @ApiModelProperty(value = "订单价格")
+    private java.math.BigDecimal orderPrice;
+	/**退款金额*/
+	@Excel(name = "退款金额", width = 15)
+    @ApiModelProperty(value = "退款金额")
+    private java.math.BigDecimal tuiPrice;
+	/**退款时间*/
+	@Excel(name = "退款时间", width = 15)
+    @ApiModelProperty(value = "退款时间")
+    private java.util.Date tuiTime;
+	/**退款状态*/
+	@Excel(name = "退款状态", width = 15)
+    @ApiModelProperty(value = "退款状态")
+    private java.lang.Integer state;
+	/**用户*/
+	@Excel(name = "用户", width = 15)
+    @ApiModelProperty(value = "用户")
+    private java.lang.String userId;
+}

module-common/src/main/java/org/jeecg/modules/popularizeOrderTuiLog/mapper/PopularizeOrderTuiLogMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.popularizeOrderTuiLog.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.popularizeOrderTuiLog.entity.PopularizeOrderTuiLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 退款记录表
+ * @Author: jeecg-boot
+ * @Date:   2025-03-23
+ * @Version: V1.0
+ */
+public interface PopularizeOrderTuiLogMapper extends BaseMapper<PopularizeOrderTuiLog> {
+
+}

module-common/src/main/java/org/jeecg/modules/popularizeOrderTuiLog/mapper/xml/PopularizeOrderTuiLogMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.popularizeOrderTuiLog.mapper.PopularizeOrderTuiLogMapper">
+
+</mapper>

module-common/src/main/java/org/jeecg/modules/popularizeOrderTuiLog/service/IPopularizeOrderTuiLogService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.popularizeOrderTuiLog.service;
+
+import org.jeecg.modules.popularizeOrderTuiLog.entity.PopularizeOrderTuiLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 退款记录表
+ * @Author: jeecg-boot
+ * @Date:   2025-03-23
+ * @Version: V1.0
+ */
+public interface IPopularizeOrderTuiLogService extends IService<PopularizeOrderTuiLog> {
+
+}

module-common/src/main/java/org/jeecg/modules/popularizeOrderTuiLog/service/impl/PopularizeOrderTuiLogServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.popularizeOrderTuiLog.service.impl;
+
+import org.jeecg.modules.popularizeOrderTuiLog.entity.PopularizeOrderTuiLog;
+import org.jeecg.modules.popularizeOrderTuiLog.mapper.PopularizeOrderTuiLogMapper;
+import org.jeecg.modules.popularizeOrderTuiLog.service.IPopularizeOrderTuiLogService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 退款记录表
+ * @Author: jeecg-boot
+ * @Date:   2025-03-23
+ * @Version: V1.0
+ */
+@Service
+public class PopularizeOrderTuiLogServiceImpl extends ServiceImpl<PopularizeOrderTuiLogMapper, PopularizeOrderTuiLog> implements IPopularizeOrderTuiLogService {
+
+}

module-common/src/main/java/org/jeecg/modules/popularizeOrderTuiLog/vue/PopularizeOrderTuiLogList.vue

@@ -0,0 +1,202 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('退款记录表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <popularize-order-tui-log-modal ref="modalForm" @ok="modalFormOk"></popularize-order-tui-log-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import PopularizeOrderTuiLogModal from './modules/PopularizeOrderTuiLogModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'PopularizeOrderTuiLogList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      PopularizeOrderTuiLogModal
+    },
+    data () {
+      return {
+        description: '退款记录表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'订单标识',
+            align:"center",
+            dataIndex: 'orderId'
+          },
+          {
+            title:'订单价格',
+            align:"center",
+            dataIndex: 'orderPrice'
+          },
+          {
+            title:'退款金额',
+            align:"center",
+            dataIndex: 'tuiPrice'
+          },
+          {
+            title:'退款时间',
+            align:"center",
+            dataIndex: 'tuiTime'
+          },
+          {
+            title:'退款状态',
+            align:"center",
+            dataIndex: 'state'
+          },
+          {
+            title:'用户',
+            align:"center",
+            dataIndex: 'userId'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/popularizeOrderTuiLog/popularizeOrderTuiLog/list",
+          delete: "/popularizeOrderTuiLog/popularizeOrderTuiLog/delete",
+          deleteBatch: "/popularizeOrderTuiLog/popularizeOrderTuiLog/deleteBatch",
+          exportXlsUrl: "/popularizeOrderTuiLog/popularizeOrderTuiLog/exportXls",
+          importExcelUrl: "popularizeOrderTuiLog/popularizeOrderTuiLog/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'orderId',text:'订单标识',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'orderPrice',text:'订单价格',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'tuiPrice',text:'退款金额',dictCode:''})
+        fieldList.push({type:'datetime',value:'tuiTime',text:'退款时间'})
+        fieldList.push({type:'int',value:'state',text:'退款状态',dictCode:''})
+        fieldList.push({type:'string',value:'userId',text:'用户',dictCode:"han_hai_member,nick_name,id"})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

module-common/src/main/java/org/jeecg/modules/popularizeOrderTuiLog/vue/modules/PopularizeOrderTuiLogForm.vue

@@ -0,0 +1,129 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="订单标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderId">
+              <a-input v-model="model.orderId" placeholder="请输入订单标识"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="订单价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderPrice">
+              <a-input-number v-model="model.orderPrice" placeholder="请输入订单价格" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="退款金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tuiPrice">
+              <a-input-number v-model="model.tuiPrice" placeholder="请输入退款金额" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="退款时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tuiTime">
+              <j-date placeholder="请选择退款时间"  v-model="model.tuiTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="退款状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
+              <a-input-number v-model="model.state" placeholder="请输入退款状态" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <a-input v-model="model.userId" placeholder="请输入用户"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'PopularizeOrderTuiLogForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/popularizeOrderTuiLog/popularizeOrderTuiLog/add",
+          edit: "/popularizeOrderTuiLog/popularizeOrderTuiLog/edit",
+          queryById: "/popularizeOrderTuiLog/popularizeOrderTuiLog/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

module-common/src/main/java/org/jeecg/modules/popularizeOrderTuiLog/vue/modules/PopularizeOrderTuiLogModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <popularize-order-tui-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></popularize-order-tui-log-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import PopularizeOrderTuiLogForm from './PopularizeOrderTuiLogForm'
+
+  export default {
+    name: 'PopularizeOrderTuiLogModal',
+    components: {
+      PopularizeOrderTuiLogForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

module-common/src/main/java/org/jeecg/modules/popularizeOrderTuiLog/vue/modules/PopularizeOrderTuiLogModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <popularize-order-tui-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></popularize-order-tui-log-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import PopularizeOrderTuiLogForm from './PopularizeOrderTuiLogForm'
+  export default {
+    name: 'PopularizeOrderTuiLogModal',
+    components: {
+      PopularizeOrderTuiLogForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

module-common/src/main/java/org/jeecg/modules/popularizeOrderTuiLog/vue3/PopularizeOrderTuiLog.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/popularizeOrderTuiLog/popularizeOrderTuiLog/list',
+  save='/popularizeOrderTuiLog/popularizeOrderTuiLog/add',
+  edit='/popularizeOrderTuiLog/popularizeOrderTuiLog/edit',
+  deleteOne = '/popularizeOrderTuiLog/popularizeOrderTuiLog/delete',
+  deleteBatch = '/popularizeOrderTuiLog/popularizeOrderTuiLog/deleteBatch',
+  importExcel = '/popularizeOrderTuiLog/popularizeOrderTuiLog/importExcel',
+  exportXls = '/popularizeOrderTuiLog/popularizeOrderTuiLog/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

module-common/src/main/java/org/jeecg/modules/popularizeOrderTuiLog/vue3/PopularizeOrderTuiLog.data.ts

@@ -0,0 +1,73 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '订单标识',
+    align:"center",
+    dataIndex: 'orderId'
+   },
+   {
+    title: '订单价格',
+    align:"center",
+    dataIndex: 'orderPrice'
+   },
+   {
+    title: '退款金额',
+    align:"center",
+    dataIndex: 'tuiPrice'
+   },
+   {
+    title: '退款时间',
+    align:"center",
+    dataIndex: 'tuiTime'
+   },
+   {
+    title: '退款状态',
+    align:"center",
+    dataIndex: 'state'
+   },
+   {
+    title: '用户',
+    align:"center",
+    dataIndex: 'userId'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '订单标识',
+    field: 'orderId',
+    component: 'Input',
+  },
+  {
+    label: '订单价格',
+    field: 'orderPrice',
+    component: 'InputNumber',
+  },
+  {
+    label: '退款金额',
+    field: 'tuiPrice',
+    component: 'InputNumber',
+  },
+  {
+    label: '退款时间',
+    field: 'tuiTime',
+    component: 'Input',
+  },
+  {
+    label: '退款状态',
+    field: 'state',
+    component: 'InputNumber',
+  },
+  {
+    label: '用户',
+    field: 'userId',
+    component: 'Input',
+  },
+];

module-common/src/main/java/org/jeecg/modules/popularizeOrderTuiLog/vue3/PopularizeOrderTuiLogList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <PopularizeOrderTuiLogModal @register="registerModal" @success="handleSuccess"></PopularizeOrderTuiLogModal>
+  </div>
+</template>
+
+<script lang="ts" name="popularizeOrderTuiLog-popularizeOrderTuiLog" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import PopularizeOrderTuiLogModal from './components/PopularizeOrderTuiLogModal.vue'
+  import {columns, searchFormSchema} from './popularizeOrderTuiLog.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './popularizeOrderTuiLog.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '退款记录表',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"退款记录表",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

module-common/src/main/java/org/jeecg/modules/popularizeOrderTuiLog/vue3/components/PopularizeOrderTuiLogModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../popularizeOrderTuiLog.data';
+    import {saveOrUpdate} from '../popularizeOrderTuiLog.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

module-system/src/main/resources/application-dev.yml

@@ -349,30 +349,30 @@ wechat-dm:
   notifyUrl:
 
 
-### 微信商户
-#wx:
-#  miniapp:
-#    appid: wx797abcfb479c75ec # 微信小程序appid
-#    secret: c4565acc18698a7000be1b2bb748be81 # 微信小程序密钥
-#    merchantId: 1659066870 # 商户号
-#    privateKeyPath: E:\\git_java\\api_java\\popularize-admin\\popularize-admin\\popularize-admin\\module-pay\\src\\main\\resources\\apiclient_key.pem
-#    merchantSerialNumber: 7BE56DC695B2B612BD1C6C710A7FBFA1AC46B10F  # 商户API证书序列号
-#    apiV3Key: vtribevtribevtribevtribevtribe12 # 商户APIV3密钥
-#    payNotifyUrl: http://h5.xzaiyp.top/popularize-admin/order_pay/refundNotify # 支付通知地址（测试环境）
-#    refundNotifyUrl: http://h5.xzaiyp.top/popularize-admin/order_pay/refundNotify # 退款通知地址（测试环境）
-
-
 ## 微信商户
 wx:
   miniapp:
     appid: wx797abcfb479c75ec # 微信小程序appid
     secret: c4565acc18698a7000be1b2bb748be81 # 微信小程序密钥
     merchantId: 1659066870 # 商户号
-    privateKeyPath: /root/api/pem/apiclient_key.pem
+    privateKeyPath: E:\\git_java\\api_java\\popularize-admin\\popularize-admin\\popularize-admin\\module-pay\\src\\main\\resources\\apiclient_key.pem
     merchantSerialNumber: 7BE56DC695B2B612BD1C6C710A7FBFA1AC46B10F  # 商户API证书序列号
     apiV3Key: vtribevtribevtribevtribevtribe12 # 商户APIV3密钥
-    payNotifyUrl: https://popularize-admin.hhlm1688.com/popularize-admin/order_pay/refundNotify # 支付通知地址（测试环境）
-    refundNotifyUrl: https://popularize-admin.hhlm1688.com/popularize-admin/order_pay/refundNotify # 退款通知地址（测试环境）
+    payNotifyUrl: http://h5.xzaiyp.top/popularize-admin/order_pay/refundNotify # 支付通知地址（测试环境）
+    refundNotifyUrl: http://h5.xzaiyp.top/popularize-admin/order_pay/refundNotify # 退款通知地址（测试环境）
+
+
+### 微信商户
+#wx:
+#  miniapp:
+#    appid: wx797abcfb479c75ec # 微信小程序appid
+#    secret: c4565acc18698a7000be1b2bb748be81 # 微信小程序密钥
+#    merchantId: 1659066870 # 商户号
+#    privateKeyPath: /root/api/pem/apiclient_key.pem
+#    merchantSerialNumber: 7BE56DC695B2B612BD1C6C710A7FBFA1AC46B10F  # 商户API证书序列号
+#    apiV3Key: vtribevtribevtribevtribevtribe12 # 商户APIV3密钥
+#    payNotifyUrl: https://popularize-admin.hhlm1688.com/popularize-admin/order_pay/refundNotify # 支付通知地址（测试环境）
+#    refundNotifyUrl: https://popularize-admin.hhlm1688.com/popularize-admin/order_pay/refundNotify # 退款通知地址（测试环境）
 
 
 #wxpay: