From fc772cecd6b662204909b37c7a68e9e9906e0d57 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期一, 22 十二月 2025 18:05:26 +0800
Subject: [PATCH] feat:管理后台积分结算接口
---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TIntegralSettlementMapper.java | 13 +
ruoyi-system/src/main/java/com/ruoyi/system/vo/AppletOrderDetailVO.java | 4
ruoyi-system/src/main/java/com/ruoyi/system/model/TPhysicalGoodsOrder.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/model/TIntegralSettlement.java | 6
ruoyi-system/src/main/resources/mapper/system/TIntegralSettlementMapper.xml | 20 +
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/OrderController.java | 4
ruoyi-system/src/main/java/com/ruoyi/system/dto/TIntegralSettlementDTO.java | 30 ++
ruoyi-applet/src/main/resources/application-test.yml | 6
ruoyi-system/src/main/java/com/ruoyi/system/query/TIntegralSettlementQuery.java | 21 +
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java | 2
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 5
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppletOrderServiceImpl.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TIntegralSettlementController.java | 84 +++++++
ruoyi-system/src/main/java/com/ruoyi/system/export/IntegralSettlementImport.java | 19 +
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TIntegralSettlementServiceImpl.java | 71 ++++++
ruoyi-system/src/main/java/com/ruoyi/system/vo/TIntegralSettlementVO.java | 40 +++
sql/jiashida.sql | 226 +++++++++++++++-----
ruoyi-system/src/main/java/com/ruoyi/system/service/TIntegralSettlementService.java | 18 +
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ICBCNotifyServiceImpl.java | 27 +-
ruoyi-system/src/main/java/com/ruoyi/system/vo/PromotionPageListVo.java | 2
20 files changed, 525 insertions(+), 77 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TIntegralSettlementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TIntegralSettlementController.java
new file mode 100644
index 0000000..db6e022
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TIntegralSettlementController.java
@@ -0,0 +1,84 @@
+package com.ruoyi.web.controller.api;
+
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.utils.WebUtils;
+import com.ruoyi.system.dto.TIntegralSettlementDTO;
+import com.ruoyi.system.export.IntegralSettlementImport;
+import com.ruoyi.system.model.TIntegralSettlement;
+import com.ruoyi.system.query.TIntegralSettlementQuery;
+import com.ruoyi.system.service.TIntegralSettlementService;
+import com.ruoyi.system.vo.TIntegralSettlementVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 积分结算 前端控制器
+ *
+ * @author xiaochen
+ * @since 2025-12-08
+ */
+@Slf4j
+@RestController
+@RequestMapping("/t-integral-settlement")
+@Api(tags = "(嘉视达)积分结算")
+@RequiredArgsConstructor(onConstructor_ = @Lazy)
+public class TIntegralSettlementController {
+
+ private final TIntegralSettlementService integralSettlementService;
+
+ @ApiOperation(value = "积分结算列表(分页)")
+ @PostMapping("/pageList")
+ public R<Page<TIntegralSettlementVO>> pageList(@RequestBody TIntegralSettlementQuery query) {
+ return R.ok(integralSettlementService.getSettlementPageList(query));
+ }
+
+ @ApiOperation(value = "积分结算导入模板下载")
+ @GetMapping("/import-template")
+ public void importTemplate() {
+ Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), IntegralSettlementImport.class, Lists.newArrayList(new IntegralSettlementImport()));
+ HttpServletResponse response = WebUtils.response();
+ ServletOutputStream outputStream = null;
+ try {
+ String fileName = URLEncoder.encode("积分结算导入模板.xls", "utf-8");
+ response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+ response.setHeader("content-Type", "application/vnd.ms-excel");
+ response.setHeader("Pragma", "no-cache");
+ response.setHeader("Cache-Control", "no-cache");
+ workbook.write(outputStream);
+ outputStream = response.getOutputStream();
+ } catch (IOException e) {
+ log.error("积分结算导入模板下载失败", e);
+ } finally {
+ try {
+ outputStream.close();
+ } catch (IOException e) {
+ log.error("积分结算导入模板下载失败", e);
+ }
+ }
+ }
+ @ApiOperation("导入积分结算数据")
+ @PostMapping("/import")
+ public R<?> importData(@RequestPart("file") MultipartFile file, @Valid TIntegralSettlementDTO dto) {
+ integralSettlementService.importData(file, dto);
+ return R.ok();
+ }
+}
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/OrderController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/OrderController.java
index f5f8694..721ebfc 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/OrderController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/OrderController.java
@@ -169,7 +169,7 @@
* @return 操作结果
*/
@ApiOperation(value = "实物商品确认收货")
- @PostMapping("/physical/confirm/{id}")
+ @GetMapping("/physical/confirm/{id}")
public R<Void> confirmPhysicalOrder(@PathVariable Integer id) {
Integer userId = tokenService.getLoginUserApplet().getUserId();
boolean success = appletOrderService.confirmPhysicalOrder(id, userId);
@@ -183,7 +183,7 @@
* @return 操作结果
*/
@ApiOperation(value = "大礼包确认收货")
- @PostMapping("/big-gift/confirm/{id}")
+ @GetMapping("/big-gift/confirm/{id}")
public R<Void> confirmBigGiftOrder(@PathVariable Integer id) {
Integer userId = tokenService.getLoginUserApplet().getUserId();
boolean success = appletOrderService.confirmBigGiftOrder(id, userId);
diff --git a/ruoyi-applet/src/main/resources/application-test.yml b/ruoyi-applet/src/main/resources/application-test.yml
index fcce02d..f68d2b5 100644
--- a/ruoyi-applet/src/main/resources/application-test.yml
+++ b/ruoyi-applet/src/main/resources/application-test.yml
@@ -240,7 +240,7 @@
order-refund-url: "https://gw.open.icbc.com.cn/api/cardbusiness/aggregatepay/b2c/online/refundqry/V1"
# 完整的回调通知地址,支付完成后通知商户的URL
- notify-url: "/icbc-notify/"
+ notify-url: "http://jiashida.free.idcfengye.com/icbc-notify/"
# 回调方法的路径
notify-url-method: "/icbc-notify/"
@@ -258,10 +258,10 @@
app-id: "11000000000000018953"
# 商户编号,用于标识商户账户
- mer-id: ""
+ mer-id: "440201200200"
# 收单产品协议编号,商户与银行的协议编号
- mer-prtcl-no: ""
+ mer-prtcl-no: "440201200200"
# 设备号,设备的唯一标识符
decive-info: "013467007045764"
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
index ee93cd1..6464604 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -1,5 +1,7 @@
package com.ruoyi.framework.web.service;
+import cn.hutool.core.util.PhoneUtil;
+import cn.hutool.core.util.RandomUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.Constants;
@@ -24,6 +26,7 @@
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.TAppUserService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.RandomUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -207,6 +210,8 @@
user = new TAppUser();
user.setPhone(username);
user.setStatus(1);
+ user.setName(String.format("用户%s", PhoneUtil.subAfter(username)));
+ user.setProfilePhoto("");
tAppUserService.save(user);
// throw new ServiceException(MessageUtils.message("user.not.exists"));
} else {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/TIntegralSettlementDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TIntegralSettlementDTO.java
new file mode 100644
index 0000000..4845a51
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TIntegralSettlementDTO.java
@@ -0,0 +1,30 @@
+package com.ruoyi.system.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
+
+@Data
+@ApiModel("积分结算导入数据传输对象")
+public class TIntegralSettlementDTO {
+
+ @ApiModelProperty(value = "结算周期")
+ @NotBlank(message = "结算周期不能为空")
+ private String settlementInterval;
+
+ @ApiModelProperty(value = "结算开始日期")
+ @NotNull(message = "结算开始日期不能为空")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate settlementStartTime;
+
+ @ApiModelProperty(value = "结算结束日期")
+ @NotNull(message = "结算结束日期不能为空")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate settlementEndTime;
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/export/IntegralSettlementImport.java b/ruoyi-system/src/main/java/com/ruoyi/system/export/IntegralSettlementImport.java
new file mode 100644
index 0000000..b33df16
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/export/IntegralSettlementImport.java
@@ -0,0 +1,19 @@
+package com.ruoyi.system.export;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+/**
+ * 积分结算导入Excel
+ */
+@Data
+public class IntegralSettlementImport {
+ @Excel(name = "推广码", width = 20)
+ private String code;
+
+ @Excel(name = "结算积分", width = 20)
+ private Integer totalSettlementIntegral;
+
+ @Excel(name = "备注", width = 20)
+ private String remark;
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TIntegralSettlementMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TIntegralSettlementMapper.java
index c3f6e36..faf00ac 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TIntegralSettlementMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TIntegralSettlementMapper.java
@@ -1,7 +1,13 @@
package com.ruoyi.system.mapper;
-import com.ruoyi.system.model.TIntegralSettlement;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.system.model.TIntegralSettlement;
+import com.ruoyi.system.query.TIntegralSettlementQuery;
+import com.ruoyi.system.vo.TIntegralSettlementVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +19,9 @@
*/
public interface TIntegralSettlementMapper extends BaseMapper<TIntegralSettlement> {
+ /**
+ * 分页查询积分结算列表(按结算周期分组汇总)
+ */
+ List<TIntegralSettlementVO> selectSettlementPageList(Page<TIntegralSettlementVO> page, @Param("query") TIntegralSettlementQuery query);
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TIntegralSettlement.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TIntegralSettlement.java
index 589f012..dd0a1a1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TIntegralSettlement.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TIntegralSettlement.java
@@ -51,7 +51,7 @@
@ApiModelProperty(value = "合计结算积分")
@TableField("total_settlement_integral")
- private BigDecimal totalSettlementIntegral;
+ private Integer totalSettlementIntegral;
@ApiModelProperty(value = "添加时间")
@TableField("create_time")
@@ -69,6 +69,10 @@
@TableField("buy_user_id")
private Integer buyUserId;
+ @ApiModelProperty("备注")
+ @TableField("remark")
+ private String remark;
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TPhysicalGoodsOrder.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TPhysicalGoodsOrder.java
index 1e797ef..8688e81 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TPhysicalGoodsOrder.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TPhysicalGoodsOrder.java
@@ -69,7 +69,7 @@
@TableField("payment_price")
private BigDecimal paymentPrice;
- @ApiModelProperty(value = "订单状态(1=待付款,2=完成支付,3=确认收货,4=已退款)")
+ @ApiModelProperty(value = "订单状态(1=待付款,2=完成支付,3=确认收货,4=已退款, 5=已取消)")
@TableField("status")
@Excel(name = "订单状态", replace = "待付款_1,完成支付_2,确认收货_3,已退款_4")
private Integer status;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TIntegralSettlementQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TIntegralSettlementQuery.java
new file mode 100644
index 0000000..bc45d65
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TIntegralSettlementQuery.java
@@ -0,0 +1,21 @@
+package com.ruoyi.system.query;
+
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+/**
+ * 积分结算列表查询条件
+ */
+@Data
+@ApiModel(value = "积分结算列表查询条件")
+public class TIntegralSettlementQuery extends BasePage {
+
+ @ApiModelProperty(value = "结算周期")
+ private String settlementInterval;
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TIntegralSettlementService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TIntegralSettlementService.java
index 7652603..c2c7dfc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TIntegralSettlementService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TIntegralSettlementService.java
@@ -1,7 +1,14 @@
package com.ruoyi.system.service;
+import com.ruoyi.system.dto.TIntegralSettlementDTO;
import com.ruoyi.system.model.TIntegralSettlement;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.system.query.TIntegralSettlementQuery;
+import com.ruoyi.system.vo.TIntegralSettlementVO;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.Valid;
/**
* <p>
@@ -13,4 +20,15 @@
*/
public interface TIntegralSettlementService extends IService<TIntegralSettlement> {
+ /**
+ * 分页查询积分结算列表
+ */
+ Page<TIntegralSettlementVO> getSettlementPageList(TIntegralSettlementQuery query);
+
+ /**
+ * 导入积分结算数据
+ * @param file
+ * @param dto
+ */
+ void importData(MultipartFile file, @Valid TIntegralSettlementDTO dto);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppletOrderServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppletOrderServiceImpl.java
index b67f122..8a54dbb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppletOrderServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppletOrderServiceImpl.java
@@ -57,6 +57,7 @@
if (order.getPhysicalGoods() != null) {
TPhysicalGoods goods = JSON.parseObject(order.getPhysicalGoods(), TPhysicalGoods.class);
if (goods != null) {
+ vo.setGoodsId(goods.getId());
vo.setGoodsName(goods.getName());
vo.setGoodsIntro(goods.getIntroduction());
vo.setGoodsCover(goods.getCoverImage());
@@ -80,6 +81,7 @@
if (order.getBigGiftPackage() != null) {
TBigGiftPackage goods = JSON.parseObject(order.getBigGiftPackage(), TBigGiftPackage.class);
if (goods != null) {
+ vo.setGoodsId(goods.getId());
vo.setGoodsName(goods.getName());
vo.setGoodsIntro(goods.getIntroduction());
vo.setGoodsCover(goods.getCoverImage());
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ICBCNotifyServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ICBCNotifyServiceImpl.java
index c4175e2..b91f77f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ICBCNotifyServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ICBCNotifyServiceImpl.java
@@ -68,13 +68,12 @@
signResult = true;
log.info("支付订单号{}【工商银行】大礼包支付回调签名验证成功", payOrderCode);
+ // 根据支付订单号查询所有订单
+ LambdaQueryWrapper<TBigGiftPackageOrder> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TBigGiftPackageOrder::getPayOrderCode, payOrderCode);
+ List<TBigGiftPackageOrder> orders = bigGiftPackageOrderService.list(wrapper);
if ("0".equals(returnCode)) {
log.info("支付订单号{}【工商银行】大礼包支付成功", payOrderCode);
-
- // 根据支付订单号查询所有订单
- LambdaQueryWrapper<TBigGiftPackageOrder> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TBigGiftPackageOrder::getPayOrderCode, payOrderCode);
- List<TBigGiftPackageOrder> orders = bigGiftPackageOrderService.list(wrapper);
if (orders == null || orders.isEmpty()) {
log.error("支付订单号{}未找到对应的大礼包订单", payOrderCode);
@@ -88,6 +87,9 @@
}
} else {
log.error("支付订单号{}【工商银行】大礼包支付失败,错误信息:{}", payOrderCode, bizContent.getString("return_msg"));
+ //更新订单状态为已取消
+ orders.forEach(item->item.setStatus(6));
+ bigGiftPackageOrderService.updateBatchById(orders);
}
} else {
log.error("支付订单号{}【工商银行】大礼包支付回调签名验证失败", payOrderCode);
@@ -185,19 +187,18 @@
String orderCode = bizContent.getString("out_trade_no");
String returnCode = bizContent.getString("return_code");
msgId = bizContent.getString("msg_id");
+ String orderId = bizContent.getString("order_id");
// 验签
if (validateSignature(request, icbcConfig.getNotifyUrlMethod() + "/physical/pay-notify")) {
signResult = true;
log.info("订单{}【工商银行】实物商品支付回调签名验证成功", orderCode);
-
+ // 根据订单编码查询订单
+ LambdaQueryWrapper<TPhysicalGoodsOrder> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TPhysicalGoodsOrder::getCode, orderCode);
+ TPhysicalGoodsOrder order = physicalGoodsOrderService.getOne(wrapper);
if ("0".equals(returnCode)) {
log.info("订单{}【工商银行】实物商品支付成功", orderCode);
-
- // 根据订单编码查询订单
- LambdaQueryWrapper<TPhysicalGoodsOrder> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TPhysicalGoodsOrder::getCode, orderCode);
- TPhysicalGoodsOrder order = physicalGoodsOrderService.getOne(wrapper);
if (order == null) {
log.error("订单{}未找到对应的实物商品订单", orderCode);
@@ -208,12 +209,14 @@
// 更新订单状态为"完成支付"
order.setStatus(2);
order.setPaymentTime(LocalDateTime.now());
- order.setPaymentSerialNumber(orderCode);
+ order.setPaymentSerialNumber(orderId);
physicalGoodsOrderService.updateById(order);
log.info("订单{}状态更新为完成支付", orderCode);
} else {
log.error("订单{}【工商银行】实物商品支付失败,错误信息:{}", orderCode, bizContent.getString("return_msg"));
+ order.setStatus(5);
+ physicalGoodsOrderService.updateById(order);
}
} else {
log.error("订单{}【工商银行】实物商品支付回调签名验证失败", orderCode);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java
index 01b01b4..6146583 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java
@@ -104,7 +104,7 @@
Integer totalIncome = flows.stream().filter(e -> e.getAppUserId().equals(promotionPageListVo.getUserId())).mapToInt(TCommissionTransactionFlow::getCommissionAmount).sum();
promotionPageListVo.setTotalIncome(totalIncome);
- BigDecimal totalSettledIncome = settlements.stream().filter(e -> e.getAppUserId().equals(promotionPageListVo.getUserId())).map(TIntegralSettlement::getTotalSettlementIntegral).reduce(BigDecimal.ZERO, BigDecimal::add);
+ Integer totalSettledIncome = settlements.stream().filter(e -> e.getAppUserId().equals(promotionPageListVo.getUserId())).mapToInt(TIntegralSettlement::getTotalSettlementIntegral).sum();
promotionPageListVo.setTotalSettledIncome(totalSettledIncome);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TIntegralSettlementServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TIntegralSettlementServiceImpl.java
index b264fcf..5929deb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TIntegralSettlementServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TIntegralSettlementServiceImpl.java
@@ -1,10 +1,34 @@
package com.ruoyi.system.service.impl;
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
+import cn.afterturn.easypoi.excel.entity.ImportParams;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Sets;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.system.dto.TIntegralSettlementDTO;
+import com.ruoyi.system.export.IntegralSettlementImport;
+import com.ruoyi.system.model.TAppUser;
import com.ruoyi.system.model.TIntegralSettlement;
import com.ruoyi.system.mapper.TIntegralSettlementMapper;
+import com.ruoyi.system.query.TIntegralSettlementQuery;
+import com.ruoyi.system.service.TAppUserService;
import com.ruoyi.system.service.TIntegralSettlementService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.vo.TIntegralSettlementVO;
+import lombok.Cleanup;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.InputStream;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
/**
* <p>
@@ -15,6 +39,53 @@
* @since 2025-12-08
*/
@Service
+@RequiredArgsConstructor(onConstructor_ = @Lazy)
public class TIntegralSettlementServiceImpl extends ServiceImpl<TIntegralSettlementMapper, TIntegralSettlement> implements TIntegralSettlementService {
+ private final TAppUserService appUserService;
+ @Override
+ public Page<TIntegralSettlementVO> getSettlementPageList(TIntegralSettlementQuery query) {
+ Page<TIntegralSettlementVO> page = new Page<>(query.getPageNum(), query.getPageSize());
+ page.setRecords(baseMapper.selectSettlementPageList(page, query));
+ return page;
+ }
+ @Override
+ public void importData(MultipartFile file, TIntegralSettlementDTO dto) {
+ try {
+ ImportParams importParams = new ImportParams();
+ importParams.setTitleRows(0);
+ importParams.setHeadRows(1);
+ @Cleanup
+ InputStream inputStream = file.getInputStream();
+ List<IntegralSettlementImport> list = ExcelImportUtil.importExcel(inputStream, IntegralSettlementImport.class, importParams);
+ // 保存主表
+ Map<String, Integer> allAppUserIdMap = getAllAppUserIdMap(list);
+ List<TIntegralSettlement> saveList = list.stream().map(item -> {
+ TIntegralSettlement model = new TIntegralSettlement();
+ model.setAppUserId(allAppUserIdMap.get(item.getCode()));
+ model.setTotalSettlementIntegral(item.getTotalSettlementIntegral());
+ model.setRemark(item.getRemark());
+ return model;
+ }).collect(Collectors.toList());
+ saveBatch(saveList);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private Map<String, Integer> getAllAppUserIdMap(List<IntegralSettlementImport> list) {
+ Set<String> codeList = list.stream().map(IntegralSettlementImport::getCode).collect(Collectors.toSet());
+ if (CollUtil.isNotEmpty(codeList)) {
+ List<TAppUser> appUserList = appUserService.lambdaQuery().in(TAppUser::getCode, codeList)
+ .ne(TAppUser::getStatus, 3).list();
+ Set<String> existCodeList = appUserList.stream().map(TAppUser::getCode).collect(Collectors.toSet());
+ Sets.SetView<String> difference = Sets.difference(codeList, existCodeList);
+ if (CollUtil.isNotEmpty(difference)) {
+ throw new ServiceException("推荐码不存在或已停用:" + String.join(",", difference));
+ }
+ Map<String, Integer> appUserIdMap = appUserList.stream().collect(Collectors.toMap(TAppUser::getCode, TAppUser::getId));
+ return appUserIdMap;
+ }
+ return Collections.emptyMap();
+ }
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/AppletOrderDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/AppletOrderDetailVO.java
index 9f9e353..e832012 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/AppletOrderDetailVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/AppletOrderDetailVO.java
@@ -36,6 +36,10 @@
// ========== 商品信息(从JSON解析) ==========
+
+ @ApiModelProperty(value = "商品ID")
+ private Integer goodsId;
+
@ApiModelProperty(value = "商品名称")
private String goodsName;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/PromotionPageListVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/PromotionPageListVo.java
index f4609fa..e11cd31 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/PromotionPageListVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/PromotionPageListVo.java
@@ -66,5 +66,5 @@
@ApiModelProperty(value = "已结算收益")
@Excel(name = "已结算收益", width = 20)
- private BigDecimal totalSettledIncome;
+ private Integer totalSettledIncome;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TIntegralSettlementVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TIntegralSettlementVO.java
new file mode 100644
index 0000000..7c8eb6e
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TIntegralSettlementVO.java
@@ -0,0 +1,40 @@
+package com.ruoyi.system.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * 积分结算列表VO
+ */
+@Data
+@ApiModel(value = "积分结算列表VO")
+public class TIntegralSettlementVO {
+
+ @ApiModelProperty(value = "结算周期")
+ private String settlementInterval;
+
+ @ApiModelProperty(value = "结算开始日期")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate settlementStartTime;
+
+ @ApiModelProperty(value = "结算结束日期")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate settlementEndTime;
+
+ @ApiModelProperty(value = "操作人")
+ private String createUserName;
+
+ @ApiModelProperty(value = "上传时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "合计结算积分")
+ private BigDecimal totalSettlementIntegral;
+
+}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TIntegralSettlementMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TIntegralSettlementMapper.xml
index 40d7a76..50331a4 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TIntegralSettlementMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TIntegralSettlementMapper.xml
@@ -21,4 +21,24 @@
id, app_user_id, settlement_interval, settlement_start_time, settlement_end_time, total_settlement_integral, create_time, create_user_id,`type`,buy_user_id
</sql>
+ <!-- 分页查询积分结算列表(按结算周期分组汇总) -->
+ <select id="selectSettlementPageList" resultType="com.ruoyi.system.vo.TIntegralSettlementVO">
+ SELECT
+ t.settlement_interval,
+ MIN(t.settlement_start_time) AS settlementStartTime,
+ MAX(t.settlement_end_time) AS settlementEndTime,
+ su.nick_name AS createUserName,
+ MAX(t.create_time) AS createTime,
+ SUM(t.total_settlement_integral) AS totalSettlementIntegral
+ FROM t_integral_settlement t
+ LEFT JOIN sys_user su ON t.create_user_id = su.user_id
+ <where>
+ <if test="query.settlementInterval != null">
+ AND t.settlement_interval = #{query.settlementInterval}
+ </if>
+ </where>
+ GROUP BY t.settlement_interval, t.create_user_id, su.nick_name
+ ORDER BY t.settlement_interval DESC, MAX(t.create_time) DESC
+ </select>
+
</mapper>
diff --git a/sql/jiashida.sql b/sql/jiashida.sql
index 80e895f..b643c10 100644
--- a/sql/jiashida.sql
+++ b/sql/jiashida.sql
@@ -11,7 +11,7 @@
Target Server Version : 80035 (8.0.35)
File Encoding : 65001
- Date: 16/12/2025 17:01:34
+ Date: 22/12/2025 16:22:02
*/
SET NAMES utf8mb4;
@@ -466,7 +466,7 @@
PRIMARY KEY (`info_id`) USING BTREE,
KEY `idx_sys_logininfor_s` (`status`) USING BTREE,
KEY `idx_sys_logininfor_lt` (`login_time`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=3188 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='系统访问记录';
+) ENGINE=InnoDB AUTO_INCREMENT=3222 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='系统访问记录';
-- ----------------------------
-- Records of sys_logininfor
@@ -489,6 +489,40 @@
INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3185, 'qqq', '192.168.110.111', '内网IP', 'Unknown', 'Unknown', '0', '登录成功', '2025-12-15 15:01:22');
INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3186, 'qqq', '192.168.110.111', '内网IP', 'Unknown', 'Unknown', '0', '登录成功', '2025-12-16 15:08:04');
INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3187, 'admin', '192.168.110.22', '内网IP', 'Chrome 14', 'Windows 10', '0', '登录成功', '2025-12-16 16:10:42');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3188, 'admin', '192.168.110.91', '内网IP', 'Chrome 14', 'Windows 10', '0', '登录成功', '2025-12-16 17:21:06');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3189, 'admin', '192.168.110.22', '内网IP', 'Chrome 14', 'Windows 10', '0', '登录成功', '2025-12-17 14:11:09');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3190, 'admin', '192.168.110.111', '内网IP', 'Unknown', 'Unknown', '0', '登录成功', '2025-12-17 14:28:50');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3191, 'aa', '192.168.110.111', '内网IP', 'Unknown', 'Unknown', '0', '登录成功', '2025-12-17 14:45:57');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3192, 'admin', '192.168.110.111', '内网IP', 'Unknown', 'Unknown', '0', '登录成功', '2025-12-17 15:31:05');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3193, 'admin', '192.168.110.22', '内网IP', 'Chrome 14', 'Windows 10', '0', '登录成功', '2025-12-17 16:26:47');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3194, 'admin', '192.168.110.111', '内网IP', 'Unknown', 'Unknown', '0', '登录成功', '2025-12-19 14:10:20');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3195, '18283820718', '127.0.0.1', '内网IP', 'Chrome 14', 'Mac OS X', '0', '登录成功', '2025-12-20 16:59:47');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3196, '18283820718', '127.0.0.1', '内网IP', 'Chrome 14', 'Mac OS X', '0', '登录成功', '2025-12-20 17:02:20');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3197, '18283820718', '127.0.0.1', '内网IP', 'Chrome 14', 'Mac OS X', '0', '登录成功', '2025-12-20 17:02:21');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3198, '18283820718', '127.0.0.1', '内网IP', 'Chrome 14', 'Mac OS X', '0', '登录成功', '2025-12-20 17:02:22');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3199, '18283820718', '127.0.0.1', '内网IP', 'Chrome 14', 'Mac OS X', '0', '登录成功', '2025-12-20 17:03:32');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3200, '18283820718', '127.0.0.1', '内网IP', 'Chrome 14', 'Mac OS X', '0', '登录成功', '2025-12-20 17:05:34');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3201, '18283820718', '127.0.0.1', '内网IP', 'Chrome 14', 'Mac OS X', '0', '登录成功', '2025-12-20 17:06:08');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3202, '18283820718', '127.0.0.1', '内网IP', 'Chrome 14', 'Mac OS X', '0', '登录成功', '2025-12-20 17:09:28');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3203, '18283820718', '127.0.0.1', '内网IP', 'Chrome 14', 'Mac OS X', '0', '登录成功', '2025-12-20 17:11:29');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3204, '18283820718', '127.0.0.1', '内网IP', 'Chrome 14', 'Mac OS X', '0', '登录成功', '2025-12-20 17:14:19');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3205, '18283820718', '192.168.110.111', '内网IP', 'Chrome 14', 'Windows 10', '0', '登录成功', '2025-12-20 17:14:42');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3206, '18283820718', '192.168.110.111', '内网IP', 'Chrome 14', 'Windows 10', '0', '登录成功', '2025-12-20 17:17:30');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3207, '18283820718', '127.0.0.1', '内网IP', 'Chrome 14', 'Mac OS X', '0', '登录成功', '2025-12-20 17:18:05');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3208, '18283820718', '127.0.0.1', '内网IP', 'Chrome 14', 'Mac OS X', '0', '登录成功', '2025-12-20 17:18:13');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3209, '18283820718', '192.168.110.111', '内网IP', 'Chrome 14', 'Windows 10', '0', '登录成功', '2025-12-20 17:18:55');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3210, 'admin', '192.168.110.22', '内网IP', 'Chrome 14', 'Windows 10', '0', '登录成功', '2025-12-22 09:19:12');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3211, 'admin', '192.168.110.111', '内网IP', 'Unknown', 'Unknown', '0', '登录成功', '2025-12-22 10:02:16');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3212, 'admin', '192.168.110.188', '内网IP', 'Chrome 14', 'Mac OS X', '0', '登录成功', '2025-12-22 11:43:24');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3213, 'admin', '192.168.110.111', '内网IP', 'Unknown', 'Unknown', '0', '登录成功', '2025-12-22 11:53:23');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3214, 'admin', '192.168.110.111', '内网IP', 'Unknown', 'Unknown', '0', '登录成功', '2025-12-22 11:55:19');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3215, 'admin', '192.168.110.188', '内网IP', 'Chrome 14', 'Mac OS X', '0', '登录成功', '2025-12-22 11:56:28');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3216, 'admin', '192.168.110.111', '内网IP', 'Unknown', 'Unknown', '0', '登录成功', '2025-12-22 11:56:45');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3217, 'admin', '192.168.110.188', '内网IP', 'Chrome 14', 'Mac OS X', '0', '登录成功', '2025-12-22 11:57:05');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3218, 'admin', '192.168.110.188', '内网IP', 'Chrome 14', 'Mac OS X', '0', '登录成功', '2025-12-22 12:06:31');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3219, 'admin', '127.0.0.1', '内网IP', 'Chrome 14', 'Mac OS X', '0', '登录成功', '2025-12-22 12:07:50');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3220, 'admin', '192.168.110.22', '内网IP', 'Chrome 14', 'Windows 10', '0', '登录成功', '2025-12-22 14:16:02');
+INSERT INTO `sys_logininfor` (`info_id`, `user_name`, `ipaddr`, `login_location`, `browser`, `os`, `status`, `msg`, `login_time`) VALUES (3221, 'admin', '192.168.110.111', '内网IP', 'Unknown', 'Unknown', '0', '登录成功', '2025-12-22 15:06:11');
COMMIT;
-- ----------------------------
@@ -604,7 +638,7 @@
KEY `idx_sys_oper_log_bt` (`business_type`) USING BTREE,
KEY `idx_sys_oper_log_s` (`status`) USING BTREE,
KEY `idx_sys_oper_log_ot` (`oper_time`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=5705 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='操作日志记录';
+) ENGINE=InnoDB AUTO_INCREMENT=5760 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='操作日志记录';
-- ----------------------------
-- Records of sys_oper_log
@@ -676,6 +710,61 @@
INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5702, '实物商品-添加', 1, 'com.ruoyi.web.controller.api.TPhysicalGoodsController.add()', 'POST', 1, 'admin', NULL, '/t-physical-goods/add', '192.168.110.22', '内网IP', '{\"coverImage\":\"2025-12-16/fca5c7b0-eeb4-43cd-bda4-76b408051c2c.jpg\",\"createUserId\":1,\"detailedDescription\":\"<p><span style=\\\"color:#000000\\\"><span style=\\\"font-size:14px\\\"><span style=\\\"background-color:#ffffff\\\">商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述</span></span></span></p>\",\"detailedImage\":\"2025-12-16/c1af40b9-794b-485f-86a3-a0b147c63368.png,2025-12-16/18c585eb-c0e0-4465-ba54-e90026423c3f.png,2025-12-16/3e0dec0e-f6b3-48a7-93d5-dbe991862f02.png,2025-12-16/88248568-90c7-4e6d-b4ad-f802f3f618df.png\",\"id\":2,\"introduction\":\"商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介\",\"name\":\"商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称\",\"totalPrice\":894561}', '{\"code\":200,\"msg\":\"操作成功\"}', 0, NULL, '2025-12-16 16:13:37', 48, NULL, '超级管理员', '15888888888', 1, '若依');
INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5703, '系统配置-协议管理-批量修改', 2, 'com.ruoyi.web.controller.api.THtmlConfigController.updateBatch()', 'POST', 1, 'admin', NULL, '/t-html-config/updateBatch', '192.168.110.22', '内网IP', '{\"htmlConfigs\":[{\"configType\":8,\"content\":\"0\"}]}', '{\"code\":200,\"msg\":\"操作成功\"}', 0, NULL, '2025-12-16 16:14:30', 65, NULL, '超级管理员', '15888888888', 1, '若依');
INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5704, '系统配置-协议管理-批量修改', 2, 'com.ruoyi.web.controller.api.THtmlConfigController.updateBatch()', 'POST', 1, 'admin', NULL, '/t-html-config/updateBatch', '192.168.110.22', '内网IP', '{\"htmlConfigs\":[{\"configType\":8,\"content\":\"1\"}]}', '{\"code\":200,\"msg\":\"操作成功\"}', 0, NULL, '2025-12-16 16:14:35', 56, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5705, '系统配置-协议管理-批量修改', 2, 'com.ruoyi.web.controller.api.THtmlConfigController.updateBatch()', 'POST', 1, 'admin', NULL, '/t-html-config/updateBatch', '192.168.110.22', '内网IP', '{\"htmlConfigs\":[{\"configType\":1,\"content\":\"<p>【托育】</p><p><span style=\\\"color:#060607\\\">是指为3岁以下婴幼儿提供的一种社会化照护服务,它包括全日托、半日托、计时托、临时托等形式。托育服务的主要目的是帮助家庭分担育儿责任,支持职业妇女平衡工作与家庭,同时也为婴幼儿提供一个安全、健康、有利于成长的环境。托育服务的内容不仅包括基本的照护和看护,还涉及早期教育,促进婴幼儿的身体发育和心理健康。</span></p><p></p><p></p><div class=\\\"media-wrap image-wrap\\\"><img class=\\\"media-wrap image-wrap\\\" id=\\\"1764237403038_2\\\" title=\\\"图片\\\" src=\\\"http://221.182.45.100:11225/images/2025-11-27/8690cde3-4274-46d2-a4ca-b979dc89c12a.png\\\"/></div><p></p><p><strong>一、托育的主要内容</strong></p><p></p><ol><li>生活照料</li></ol><p></p><p></p><ul><li>饮食照料:托育机构为婴幼儿提供科学合理的饮食安排,包括适合不同年龄段宝宝的营养辅食、配方奶等。专业的保育员会根据宝宝的饮食需求和习惯,定时定量地进行喂养,确保宝宝获得充足的营养。例如,对于 6 个月以上的宝宝,会逐渐添加各种果泥、蔬菜泥等辅食,以满足其生长发育的需要。</li><li>睡眠照料:为婴幼儿创造安静、舒适的睡眠环境,帮助他们建立良好的睡眠习惯。保育员会根据宝宝的年龄和作息规律,安排合适的睡眠时间和睡眠方式。例如,对于较小的婴儿,可能会采用摇篮或婴儿床哄睡;对于稍大一些的宝宝,则会引导他们自主入睡。</li><li>卫生照料:包括给宝宝洗澡、换尿布、清洁身体等日常护理工作。托育机构会配备专业的卫生设施和用品,确保宝宝的个人卫生。同时,保育员也会密切关注宝宝的身体状况,及时发现和处理宝宝的健康问题。例如,一旦发现宝宝有发烧、腹泻等症状,会立即通知家长并采取相应的措施。</li></ul><p></p><p>早期教育</p><p></p><ul><li>认知发展:通过各种游戏和活动,激发婴幼儿的好奇心和探索欲,促进他们的认知发展。例如,使用彩色卡片、玩具等教具,帮助宝宝认识颜色、形状、大小等基本概念;开展简单的拼图、积木等游戏,锻炼宝宝的手眼协调能力和空间认知能力。</li><li>语言发展:为婴幼儿提供丰富的语言环境,鼓励他们开口说话,提高语言表达能力。托育机构的老师会通过讲故事、唱儿歌、对话交流等方式,与宝宝进行互动,促进他们的语言发展。例如,每天安排固定的故事时间,让宝宝在听故事的过程中学习语言;引导宝宝模仿老师的发音和动作,逐渐掌握语言表达的技巧。</li><li>社交能力培养:组织婴幼儿参加小组活动,让他们与同伴互动交流,培养社交能力。例如,开展亲子活动、户外游戏等,让宝宝在活动中学会分享、合作、关心他人等良好的社交行为。同时,老师也会引导宝宝学会表达自己的情感和需求,提高他们的情绪管理能力。</li></ul><p></p>\"},{\"configType\":2,\"content\":\"<p></p><h3>服务内容</h3><ul><li><strong>阅芽包</strong>:免费发放适龄图画书、阅读指导手册等资源,按0-3岁、3-6岁分阶段提供,累计发放超38万个<span style=\\\"line-height:14\\\"><span style=\\\"color:#333333\\\"><span style=\\\"font-size:12px\\\"><span style=\\\"background-color:#dfdff5\\\">12</span></span></span></span>。</li><li><strong>阅芽图书馆</strong>:在社区建立132个服务点,提供整包借阅和亲子共读活动<span style=\\\"line-height:14\\\"><span style=\\\"color:#333333\\\"><span style=\\\"font-size:12px\\\"><span style=\\\"background-color:#dfdff5\\\">23</span></span></span></span>。</li><li><span style=\\\"color:#333333\\\"><span style=\\\"font-size:16px\\\"><span style=\\\"', '{\"code\":200,\"msg\":\"操作成功\"}', 0, NULL, '2025-12-17 14:14:42', 114, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5706, '轮播图管理-修改', 2, 'com.ruoyi.web.controller.api.TBannerController.edit()', 'POST', 1, 'admin', NULL, '/t-banner/edit', '192.168.110.22', '内网IP', '{\"bannerDetail\":\"<p>暖心服务</p>\",\"bannerName\":\"暖心服务\",\"id\":\"1994008720647475201\",\"pictures\":\"2025-12-17/fdca4928-ca92-482b-9f6b-d8abb1c86cd7.jpg\",\"updateBy\":\"若依\"}', '{\"code\":200,\"msg\":\"操作成功\"}', 0, NULL, '2025-12-17 14:15:33', 103, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5707, '轮播图管理-修改', 2, 'com.ruoyi.web.controller.api.TBannerController.edit()', 'POST', 1, 'admin', NULL, '/t-banner/edit', '192.168.110.22', '内网IP', '{\"bannerDetail\":\"<p>就业体系</p>\",\"bannerName\":\"就业体系\",\"id\":\"1994008655614791681\",\"pictures\":\"2025-12-17/c756609e-3cd5-4465-aa97-8214cd1031de.jpg\",\"updateBy\":\"若依\"}', '{\"code\":200,\"msg\":\"操作成功\"}', 0, NULL, '2025-12-17 14:15:40', 64, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5708, '轮播图管理-修改', 2, 'com.ruoyi.web.controller.api.TBannerController.edit()', 'POST', 1, 'admin', NULL, '/t-banner/edit', '192.168.110.22', '内网IP', '{\"bannerDetail\":\"<p>惠民超市</p>\",\"bannerName\":\"惠民超市\",\"id\":\"1994008568830447617\",\"pictures\":\"2025-12-17/b56d154a-3d7d-4f0d-b65a-1727db730909.png\",\"updateBy\":\"若依\"}', '{\"code\":200,\"msg\":\"操作成功\"}', 0, NULL, '2025-12-17 14:15:47', 87, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5709, '轮播图管理-修改', 2, 'com.ruoyi.web.controller.api.TBannerController.edit()', 'POST', 1, 'admin', NULL, '/t-banner/edit', '192.168.110.22', '内网IP', '{\"bannerDetail\":\"<p>公益课程</p>\",\"bannerName\":\"公益课堂\",\"id\":\"1994008507362922497\",\"pictures\":\"2025-12-17/3c67fa89-c3c5-495b-b59d-c65c9ae0cee1.jpg\",\"updateBy\":\"若依\"}', '{\"code\":200,\"msg\":\"操作成功\"}', 0, NULL, '2025-12-17 14:15:55', 87, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5710, '轮播图管理-修改', 2, 'com.ruoyi.web.controller.api.TBannerController.edit()', 'POST', 1, 'admin', NULL, '/t-banner/edit', '192.168.110.22', '内网IP', '{\"bannerDetail\":\"<p>暖心服务</p>\",\"bannerName\":\"暖心服务\",\"id\":\"1994008720647475201\",\"pictures\":\"2025-12-17/fdca4928-ca92-482b-9f6b-d8abb1c86cd7.jpg\",\"updateBy\":\"若依\"}', '{\"code\":200,\"msg\":\"操作成功\"}', 0, NULL, '2025-12-17 14:16:39', 9, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5711, '股东-导入', 6, 'com.ruoyi.web.controller.api.TCompanyController.importInfo()', 'POST', 1, 'admin', NULL, '/t-company/import', '192.168.110.111', '内网IP', '{\"companyId\":\"20\"}', NULL, 1, '\r\n### Error querying database. Cause: java.sql.SQLException: SQL String cannot be empty\r\n### The error may exist in file [F:\\code\\jiashida\\ruoyi-system\\target\\classes\\mapper\\system\\SysUserMapper.xml]\r\n### The error may involve com.ruoyi.system.mapper.SysUserMapper.checkCodeUnique\r\n### The error occurred while executing a query\r\n### SQL: \r\n### Cause: java.sql.SQLException: SQL String cannot be empty\n; SQL String cannot be empty; nested exception is java.sql.SQLException: SQL String cannot be empty', '2025-12-17 14:41:19', 312, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5712, '股东-导入', 6, 'com.ruoyi.web.controller.api.TCompanyController.importInfo()', 'POST', 1, 'admin', NULL, '/t-company/import', '192.168.110.111', '内网IP', '{\"companyId\":\"20\"}', NULL, 1, '\r\n### Error querying database. Cause: java.sql.SQLException: SQL String cannot be empty\r\n### The error may exist in file [F:\\code\\jiashida\\ruoyi-system\\target\\classes\\mapper\\system\\SysUserMapper.xml]\r\n### The error may involve com.ruoyi.system.mapper.SysUserMapper.checkCodeUnique\r\n### The error occurred while executing a query\r\n### SQL: \r\n### Cause: java.sql.SQLException: SQL String cannot be empty\n; SQL String cannot be empty; nested exception is java.sql.SQLException: SQL String cannot be empty', '2025-12-17 14:41:38', 7877, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5713, '股东-导入', 6, 'com.ruoyi.web.controller.api.TCompanyController.importInfo()', 'POST', 1, 'admin', NULL, '/t-company/import', '192.168.110.111', '内网IP', '{\"companyId\":\"20\"}', NULL, 1, '\r\n### Error querying database. Cause: java.sql.SQLException: SQL String cannot be empty\r\n### The error may exist in file [F:\\code\\jiashida\\ruoyi-system\\target\\classes\\mapper\\system\\SysUserMapper.xml]\r\n### The error may involve com.ruoyi.system.mapper.SysUserMapper.checkCodeUnique\r\n### The error occurred while executing a query\r\n### SQL: \r\n### Cause: java.sql.SQLException: SQL String cannot be empty\n; SQL String cannot be empty; nested exception is java.sql.SQLException: SQL String cannot be empty', '2025-12-17 14:41:46', 5423, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5714, '股东-导入', 6, 'com.ruoyi.web.controller.api.TCompanyController.importInfo()', 'POST', 1, 'admin', NULL, '/t-company/import', '192.168.110.111', '内网IP', '{\"companyId\":\"20\"}', NULL, 1, '\r\n### Error querying database. Cause: java.sql.SQLException: SQL String cannot be empty\r\n### The error may exist in file [F:\\code\\jiashida\\ruoyi-system\\target\\classes\\mapper\\system\\SysUserMapper.xml]\r\n### The error may involve com.ruoyi.system.mapper.SysUserMapper.checkCodeUnique\r\n### The error occurred while executing a query\r\n### SQL: \r\n### Cause: java.sql.SQLException: SQL String cannot be empty\n; SQL String cannot be empty; nested exception is java.sql.SQLException: SQL String cannot be empty', '2025-12-17 14:43:35', 81023, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5715, '股东-导入', 6, 'com.ruoyi.web.controller.api.TCompanyController.importInfo()', 'POST', 1, 'admin', NULL, '/t-company/import', '192.168.110.111', '内网IP', '{\"companyId\":\"20\"}', NULL, 1, '\r\n### Error querying database. Cause: java.sql.SQLException: SQL String cannot be empty\r\n### The error may exist in file [F:\\code\\jiashida\\ruoyi-system\\target\\classes\\mapper\\system\\SysUserMapper.xml]\r\n### The error may involve com.ruoyi.system.mapper.SysUserMapper.checkCodeUnique\r\n### The error occurred while executing a query\r\n### SQL: \r\n### Cause: java.sql.SQLException: SQL String cannot be empty\n; SQL String cannot be empty; nested exception is java.sql.SQLException: SQL String cannot be empty', '2025-12-17 14:44:05', 14144, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5716, '股东-导入', 6, 'com.ruoyi.web.controller.api.TCompanyController.importInfo()', 'POST', 1, 'admin', NULL, '/t-company/import', '192.168.110.111', '内网IP', '{\"companyId\":\"20\"}', NULL, 1, '\r\n### Error querying database. Cause: java.sql.SQLException: SQL String cannot be empty\r\n### The error may exist in file [F:\\code\\jiashida\\ruoyi-system\\target\\classes\\mapper\\system\\SysUserMapper.xml]\r\n### The error may involve com.ruoyi.system.mapper.SysUserMapper.checkCodeUnique\r\n### The error occurred while executing a query\r\n### SQL: \r\n### Cause: java.sql.SQLException: SQL String cannot be empty\n; SQL String cannot be empty; nested exception is java.sql.SQLException: SQL String cannot be empty', '2025-12-17 14:44:35', 2005, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5717, '股东-导入', 6, 'com.ruoyi.web.controller.api.TCompanyController.importInfo()', 'POST', 1, 'admin', NULL, '/t-company/import', '192.168.110.111', '内网IP', '{\"companyId\":\"20\"}', NULL, 1, '\r\n### Error querying database. Cause: java.sql.SQLException: SQL String cannot be empty\r\n### The error may exist in file [F:\\code\\jiashida\\ruoyi-system\\target\\classes\\mapper\\system\\SysUserMapper.xml]\r\n### The error may involve com.ruoyi.system.mapper.SysUserMapper.checkCodeUnique\r\n### The error occurred while executing a query\r\n### SQL: \r\n### Cause: java.sql.SQLException: SQL String cannot be empty\n; SQL String cannot be empty; nested exception is java.sql.SQLException: SQL String cannot be empty', '2025-12-17 14:44:53', 14957, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5718, '股东-导入', 6, 'com.ruoyi.web.controller.api.TCompanyController.importInfo()', 'POST', 1, 'admin', NULL, '/t-company/import', '192.168.110.111', '内网IP', '{\"companyId\":\"20\"}', '{\"code\":200,\"msg\":\"操作成功\"}', 0, NULL, '2025-12-17 14:45:45', 6260, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5719, '股东-导入', 6, 'com.ruoyi.web.controller.api.TCompanyController.importInfo()', 'POST', 1, 'admin', NULL, '/t-company/import', '192.168.110.111', '内网IP', '{\"companyId\":\"20\"}', '{\"code\":500,\"msg\":\"{\\\"第1行:[\\\":[\\\"登录账号]已存在\\\"]}\"}', 0, NULL, '2025-12-17 14:46:08', 25, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5720, '推广记录-导出', 5, 'com.ruoyi.web.controller.api.TCompanyController.export()', 'POST', 1, 'admin', NULL, '/t-company/export', '192.168.110.111', '内网IP', '{\"companyId\":1,\"pageNum\":1,\"pageSize\":10}', NULL, 0, NULL, '2025-12-17 15:31:44', 264, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5721, '推广记录-导出', 5, 'com.ruoyi.web.controller.api.TCompanyController.export()', 'POST', 1, 'admin', NULL, '/t-company/export', '192.168.110.111', '内网IP', '{\"companyId\":1,\"pageNum\":1,\"pageSize\":10}', NULL, 0, NULL, '2025-12-17 15:32:04', 15, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5722, '推广记录-导出', 5, 'com.ruoyi.web.controller.api.TCompanyController.export()', 'POST', 1, 'admin', NULL, '/t-company/export', '192.168.110.111', '内网IP', '{\"companyId\":1,\"pageNum\":1,\"pageSize\":10}', NULL, 0, NULL, '2025-12-17 15:33:00', 16, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5723, '推广记录-导出', 5, 'com.ruoyi.web.controller.api.TCompanyController.export()', 'POST', 1, 'admin', NULL, '/t-company/export', '192.168.110.111', '内网IP', '{\"companyId\":1,\"pageNum\":1,\"pageSize\":10}', NULL, 0, NULL, '2025-12-17 15:36:16', 313, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5724, '推广记录-导出', 5, 'com.ruoyi.web.controller.api.TCompanyController.export()', 'POST', 1, 'admin', NULL, '/t-company/export', '192.168.110.111', '内网IP', '{\"companyId\":1,\"pageNum\":1,\"pageSize\":10}', NULL, 0, NULL, '2025-12-17 15:36:29', 47, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5725, '收益明细-导出', 5, 'com.ruoyi.web.controller.api.TCompanyController.exportProfit()', 'POST', 1, 'admin', NULL, '/t-company/exportProfit', '192.168.110.111', '内网IP', '{\"companyId\":1,\"pageNum\":1,\"pageSize\":10}', NULL, 0, NULL, '2025-12-17 16:08:17', 222, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5726, '小程序用户-金币导入', 6, 'com.ruoyi.web.controller.api.TAppUserController.importGold()', 'POST', 1, 'admin', NULL, '/t-app-user/importGold', '192.168.110.111', '内网IP', '', '{\"code\":500,\"msg\":\"{\\\"第1行:[\\\":[\\\"用户手机号]不能为空\\\"]}\"}', 0, NULL, '2025-12-19 14:12:45', 183, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5727, '小程序用户-金币导入', 6, 'com.ruoyi.web.controller.api.TAppUserController.importGold()', 'POST', 1, 'admin', NULL, '/t-app-user/importGold', '192.168.110.111', '内网IP', '', '{\"code\":200,\"msg\":\"操作成功\"}', 0, NULL, '2025-12-19 14:13:09', 208, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5728, '小程序用户-金币导入', 6, 'com.ruoyi.web.controller.api.TAppUserController.importGold()', 'POST', 1, 'admin', NULL, '/t-app-user/importGold', '192.168.110.111', '内网IP', '', '{\"code\":500,\"msg\":\"{\\\"第1行:[\\\":[\\\"用户不存在]\\\"]}\"}', 0, NULL, '2025-12-19 14:13:50', 11, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5729, '小程序用户-金币导入', 6, 'com.ruoyi.web.controller.api.TAppUserController.importGold()', 'POST', 1, 'admin', NULL, '/t-app-user/importGold', '192.168.110.111', '内网IP', '', '{\"code\":500,\"msg\":\"{\\\"第1行:[\\\":[\\\"用户不存在]\\\"]}\"}', 0, NULL, '2025-12-19 14:13:51', 11, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5730, '小程序用户-金币导入', 6, 'com.ruoyi.web.controller.api.TAppUserController.importGold()', 'POST', 1, 'admin', NULL, '/t-app-user/importGold', '192.168.110.111', '内网IP', '', '{\"code\":500,\"msg\":\"{\\\"第1行:[\\\":[\\\"商品总价]格式错误\\\"]}\"}', 0, NULL, '2025-12-19 14:14:06', 8, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5731, '添加公司-添加', 1, 'com.ruoyi.web.controller.api.TCompanyController.add()', 'POST', 1, 'admin', NULL, '/t-company/add', '192.168.110.22', '内网IP', '{\"account\":\"xw\",\"address\":\"天府新谷\",\"chargePerson\":\"张三\",\"chargePersonPhone\":\"15708179999\",\"code\":\"001\",\"createUserId\":1,\"id\":8,\"merchantNumber\":\"123\",\"merchantOpenid\":\"9994\",\"name\":\"喜望\",\"remark\":\"备注\",\"status\":1}', '{\"code\":200,\"msg\":\"操作成功\"}', 0, NULL, '2025-12-22 09:36:19', 341, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5732, '小程序用户-导出', 5, 'com.ruoyi.web.controller.api.TAppUserController.exportAppUser()', 'POST', 1, 'admin', NULL, '/t-app-user/exportAppUser', '192.168.110.111', '内网IP', '{\"pageNum\":1,\"pageSize\":10}', NULL, 0, NULL, '2025-12-22 10:03:04', 2270, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5733, '公司信息-修改股东', 2, 'com.ruoyi.web.controller.api.TCompanyController.edit()', 'POST', 1, 'admin', NULL, '/t-company/system/user/edit', '192.168.110.22', '内网IP', '{\"admin\":false,\"code\":\"00001111\",\"nickName\":\"张三\",\"params\":{},\"phonenumber\":\"15708179999\",\"remark\":\"备注\",\"userName\":\"15708179999\"}', '{\"code\":500,\"msg\":\"修改用户\'15708179999\'失败,手机号码已存在\"}', 0, NULL, '2025-12-22 10:23:50', 8, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5734, '公司信息-修改股东', 2, 'com.ruoyi.web.controller.api.TCompanyController.edit()', 'POST', 1, 'admin', NULL, '/t-company/system/user/edit', '192.168.110.22', '内网IP', '{\"admin\":false,\"code\":\"00001111\",\"companyId\":8,\"nickName\":\"张三\",\"params\":{},\"phonenumber\":\"15708179999\",\"remark\":\"备注\",\"userName\":\"15708179999\"}', '{\"code\":500,\"msg\":\"修改用户\'15708179999\'失败,手机号码已存在\"}', 0, NULL, '2025-12-22 10:25:02', 10, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5735, '公司信息-修改股东', 2, 'com.ruoyi.web.controller.api.TCompanyController.edit()', 'POST', 1, 'admin', NULL, '/t-company/system/user/edit', '192.168.110.22', '内网IP', '{\"admin\":false,\"code\":\"3468774\",\"companyId\":8,\"nickName\":\"张三\",\"params\":{},\"phonenumber\":\"15708179999\",\"remark\":\"备注\",\"updateBy\":\"admin\",\"userId\":198,\"userName\":\"15708179999\"}', '{\"code\":200,\"data\":1,\"msg\":\"操作成功\"}', 0, NULL, '2025-12-22 10:25:48', 358, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5736, '公司信息-批量删除股东', 3, 'com.ruoyi.web.controller.api.TCompanyController.remove()', 'DELETE', 1, 'admin', NULL, '/t-company/system/user/deleteById/198', '192.168.110.22', '内网IP', '{}', '{\"msg\":\"操作成功\",\"code\":200,\"data\":1}', 0, NULL, '2025-12-22 10:30:12', 52, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5737, '实物商品订单导出-导出', 5, 'com.ruoyi.web.controller.api.TPhysicalGoodsOrderController.export()', 'POST', 1, 'admin', NULL, '/t-physical-goods-order/export', '192.168.110.22', '内网IP', '{\"pageNum\":1,\"pageSize\":10}', NULL, 0, NULL, '2025-12-22 10:35:04', 111, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5738, '实物商品订单导出-导出', 5, 'com.ruoyi.web.controller.api.TPhysicalGoodsOrderController.export()', 'POST', 1, 'admin', NULL, '/t-physical-goods-order/export', '192.168.110.22', '内网IP', '{\"pageNum\":1,\"pageSize\":10}', NULL, 0, NULL, '2025-12-22 10:35:08', 22, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5739, '实物商品订单导出-导出', 5, 'com.ruoyi.web.controller.api.TPhysicalGoodsOrderController.export()', 'POST', 1, 'admin', NULL, '/t-physical-goods-order/export', '192.168.110.22', '内网IP', '{\"pageNum\":1,\"pageSize\":10}', NULL, 0, NULL, '2025-12-22 10:39:10', 10, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5740, '公司信息-新增股东', 1, 'com.ruoyi.web.controller.api.TCompanyController.add()', 'POST', 1, 'admin', NULL, '/t-company/system/user/add', '192.168.110.22', '内网IP', '{\"admin\":false,\"code\":\"999\",\"companyId\":8,\"createBy\":\"admin\",\"nickName\":\"HC\",\"params\":{},\"phonenumber\":\"15708179461\",\"remark\":\"备注\",\"userId\":199,\"userName\":\"15708179461\"}', '{\"code\":200,\"msg\":\"操作成功\"}', 0, NULL, '2025-12-22 10:45:04', 1522, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5741, '收益明细-导出', 5, 'com.ruoyi.web.controller.api.TCompanyController.exportProfit()', 'POST', 1, 'admin', NULL, '/t-company/exportProfit', '192.168.110.22', '内网IP', '{\"companyId\":8,\"pageNum\":1,\"pageSize\":10}', NULL, 0, NULL, '2025-12-22 10:55:06', 20, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5742, '股东-导入', 6, 'com.ruoyi.web.controller.api.TCompanyController.importInfo()', 'POST', 1, 'admin', NULL, '/t-company/import', '192.168.110.22', '内网IP', '{\"companyId\":\"8\"}', NULL, 1, '股东导入失败!', '2025-12-22 11:01:35', 422, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5743, '股东-导入', 6, 'com.ruoyi.web.controller.api.TCompanyController.importInfo()', 'POST', 1, 'admin', NULL, '/t-company/import', '192.168.110.22', '内网IP', '{\"companyId\":\"8\"}', NULL, 1, '股东导入失败!', '2025-12-22 11:01:50', 20, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5744, '大礼包订单-导出', 5, 'com.ruoyi.web.controller.api.TBigGiftPackageOrderController.export()', 'POST', 1, 'admin', NULL, '/t-big-gift-package-order/export', '192.168.110.22', '内网IP', '{\"pageNum\":1,\"pageSize\":10}', NULL, 1, 'No value present', '2025-12-22 11:11:12', 16, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5745, '大礼包订单-导出', 5, 'com.ruoyi.web.controller.api.TBigGiftPackageOrderController.export()', 'POST', 1, 'admin', NULL, '/t-big-gift-package-order/export', '192.168.110.111', '内网IP', '{\"pageNum\":1,\"pageSize\":10}', NULL, 0, NULL, '2025-12-22 11:15:44', 153, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5746, '订单转让-导出', 5, 'com.ruoyi.web.controller.api.TBigGiftPackageOrderController.transferExport()', 'POST', 1, 'admin', NULL, '/t-big-gift-package-order/transferExport', '192.168.110.22', '内网IP', '{\"pageNum\":1,\"pageSize\":10}', NULL, 0, NULL, '2025-12-22 11:55:47', 397, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5747, '大礼包订单-删除', 3, 'com.ruoyi.web.controller.api.TBigGiftPackageOrderController.delete()', 'DELETE', 1, 'admin', NULL, '/t-big-gift-package-order/delete/1', '192.168.110.22', '内网IP', '{}', '{\"code\":200,\"msg\":\"操作成功\"}', 0, NULL, '2025-12-22 11:55:50', 84, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5748, '订单转让-删除', 3, 'com.ruoyi.web.controller.api.TBigGiftPackageOrderController.transferDelete()', 'DELETE', 1, 'admin', NULL, '/t-big-gift-package-order/transferDelete/1', '192.168.110.22', '内网IP', '{}', '{\"code\":200,\"msg\":\"操作成功\"}', 0, NULL, '2025-12-22 11:56:19', 74, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5749, '大礼包订单-转让', 2, 'com.ruoyi.web.controller.api.TBigGiftPackageOrderController.transfer()', 'POST', 1, 'admin', NULL, '/t-big-gift-package-order/transfer', '192.168.110.22', '内网IP', '{\"appUserId\":4,\"orderId\":2}', '{\"code\":200,\"msg\":\"操作成功\"}', 0, NULL, '2025-12-22 14:17:03', 155, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5750, '订单转让-导出', 5, 'com.ruoyi.web.controller.api.TBigGiftPackageOrderController.transferExport()', 'POST', 1, 'admin', NULL, '/t-big-gift-package-order/transferExport', '192.168.110.22', '内网IP', '{\"pageNum\":1,\"pageSize\":10}', NULL, 0, NULL, '2025-12-22 14:32:27', 381, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5751, '小程序用户-用户导入', 6, 'com.ruoyi.web.controller.api.TAppUserController.importUser()', 'POST', 1, 'admin', NULL, '/t-app-user/importUser', '192.168.110.22', '内网IP', '', NULL, 1, '小程序用户导入失败!', '2025-12-22 15:08:52', 468, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5752, '小程序用户-金币导入', 6, 'com.ruoyi.web.controller.api.TAppUserController.importGold()', 'POST', 1, 'admin', NULL, '/t-app-user/importGold', '192.168.110.22', '内网IP', '', NULL, 1, '金币导入失败!', '2025-12-22 15:09:35', 29, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5753, '小程序用户-金币导入', 6, 'com.ruoyi.web.controller.api.TAppUserController.importGold()', 'POST', 1, 'admin', NULL, '/t-app-user/importGold', '192.168.110.22', '内网IP', '', NULL, 1, '金币导入失败!', '2025-12-22 15:09:50', 14, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5754, '小程序用户-一键清空金币', 2, 'com.ruoyi.web.controller.api.TAppUserController.clearGold()', 'GET', 1, 'admin', NULL, '/t-app-user/clearGold', '192.168.110.22', '内网IP', '{}', '{\"code\":200,\"msg\":\"操作成功\"}', 0, NULL, '2025-12-22 15:09:55', 54, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5755, '小程序用户-批量修改积分', 2, 'com.ruoyi.web.controller.api.TAppUserController.batchUpdateGold()', 'POST', 1, 'admin', NULL, '/t-app-user/batchUpdateGold', '192.168.110.22', '内网IP', '{\"integral\":9000,\"userIds\":[4,2,1,3]}', '{\"code\":200,\"msg\":\"操作成功\"}', 0, NULL, '2025-12-22 15:31:08', 43, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5756, '小程序用户-批量修改积分', 2, 'com.ruoyi.web.controller.api.TAppUserController.batchUpdateGold()', 'POST', 1, 'admin', NULL, '/t-app-user/batchUpdateGold', '192.168.110.22', '内网IP', '{\"integral\":8888,\"userIds\":[4]}', '{\"code\":200,\"msg\":\"操作成功\"}', 0, NULL, '2025-12-22 15:32:36', 10, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5757, '小程序用户-修改状态', 2, 'com.ruoyi.web.controller.api.TAppUserController.pageList()', 'GET', 1, 'admin', NULL, '/t-app-user/changeStatus', '192.168.110.22', '内网IP', '{\"id\":\"4\"}', '{\"code\":200,\"msg\":\"操作成功\"}', 0, NULL, '2025-12-22 15:35:20', 58, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5758, '小程序用户-修改状态', 2, 'com.ruoyi.web.controller.api.TAppUserController.pageList()', 'GET', 1, 'admin', NULL, '/t-app-user/changeStatus', '192.168.110.22', '内网IP', '{\"id\":\"4\"}', '{\"code\":200,\"msg\":\"操作成功\"}', 0, NULL, '2025-12-22 15:35:24', 50, NULL, '超级管理员', '15888888888', 1, '若依');
+INSERT INTO `sys_oper_log` (`oper_id`, `title`, `business_type`, `method`, `request_method`, `operator_type`, `oper_name`, `dept_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`, `companyName`, `roleName`, `phonenumber`, `userId`, `nickName`) VALUES (5759, '积分修改记录-导出', 5, 'com.ruoyi.web.controller.api.TAppUserController.exportIntegralChangeRecord()', 'POST', 1, 'admin', NULL, '/t-app-user/exportIntegralChangeRecord', '192.168.110.22', '内网IP', '{\"pageNum\":1,\"pageSize\":10}', NULL, 1, 'Excel导出错误', '2025-12-22 15:56:48', 139, NULL, '超级管理员', '15888888888', 1, '若依');
COMMIT;
-- ----------------------------
@@ -1195,19 +1284,22 @@
`role_type` int DEFAULT '1' COMMENT '角色类型(1=平台账号,2=经销商账号 3股东)',
PRIMARY KEY (`user_id`) USING BTREE,
UNIQUE KEY `code` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=197 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='用户信息表';
+) ENGINE=InnoDB AUTO_INCREMENT=200 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='用户信息表';
-- ----------------------------
-- Records of sys_user
-- ----------------------------
BEGIN;
-INSERT INTO `sys_user` (`user_id`, `dept_id`, `user_name`, `nick_name`, `user_type`, `email`, `phonenumber`, `sex`, `avatar`, `password`, `status`, `del_flag`, `login_ip`, `login_date`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`, `disable_remark`, `company_id`, `is_admin`, `code`, `promotion_qr_code`, `role_type`) VALUES (1, 100, 'admin', '若依', '00', 'ry@163.com', '15888888888', '1', 'https://we-park-life.oss-cn-beijing.aliyuncs.com/img/ebcc2c95e1504371a8b3f3b1167a03a0.jpg', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '192.168.110.22', '2025-12-16 16:10:43', 'admin', '2023-10-02 14:09:09', 'admin', '2025-12-16 16:10:42', '管理员', NULL, NULL, 0, NULL, NULL, NULL);
+INSERT INTO `sys_user` (`user_id`, `dept_id`, `user_name`, `nick_name`, `user_type`, `email`, `phonenumber`, `sex`, `avatar`, `password`, `status`, `del_flag`, `login_ip`, `login_date`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`, `disable_remark`, `company_id`, `is_admin`, `code`, `promotion_qr_code`, `role_type`) VALUES (1, 100, 'admin', '若依', '00', 'ry@163.com', '15888888888', '1', 'https://we-park-life.oss-cn-beijing.aliyuncs.com/img/ebcc2c95e1504371a8b3f3b1167a03a0.jpg', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '192.168.110.111', '2025-12-22 15:06:12', 'admin', '2023-10-02 14:09:09', 'admin', '2025-12-22 15:06:11', '管理员', NULL, NULL, 0, NULL, NULL, NULL);
INSERT INTO `sys_user` (`user_id`, `dept_id`, `user_name`, `nick_name`, `user_type`, `email`, `phonenumber`, `sex`, `avatar`, `password`, `status`, `del_flag`, `login_ip`, `login_date`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`, `disable_remark`, `company_id`, `is_admin`, `code`, `promotion_qr_code`, `role_type`) VALUES (147, NULL, '15102879064', '嘟嘟', '00', '', '15102879064', '1', '', '$2a$10$vFbyKflq6qf93NqfH8cwRecWOa7SasjEhAEWlYiaYr8p5hGGB8.4K', '0', '0', '192.168.110.91', '2025-07-22 14:41:12', 'admin', '2024-01-11 17:58:55', '', '2025-07-22 14:41:12', NULL, NULL, NULL, 0, NULL, NULL, NULL);
INSERT INTO `sys_user` (`user_id`, `dept_id`, `user_name`, `nick_name`, `user_type`, `email`, `phonenumber`, `sex`, `avatar`, `password`, `status`, `del_flag`, `login_ip`, `login_date`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`, `disable_remark`, `company_id`, `is_admin`, `code`, `promotion_qr_code`, `role_type`) VALUES (151, NULL, '17780483321', '林', '00', '', '17780483321', '1', '', '$2a$10$RTiHyRQxlRNWSV0R.a7rd.noPCuwUb13G/WFj5bh9VsgG.xi4biaO', '0', '2', '192.168.110.91', '2025-07-25 10:07:29', 'admin', '2024-01-16 15:28:52', '17780483321', '2025-12-15 15:06:31', NULL, NULL, NULL, 0, '', NULL, NULL);
INSERT INTO `sys_user` (`user_id`, `dept_id`, `user_name`, `nick_name`, `user_type`, `email`, `phonenumber`, `sex`, `avatar`, `password`, `status`, `del_flag`, `login_ip`, `login_date`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`, `disable_remark`, `company_id`, `is_admin`, `code`, `promotion_qr_code`, `role_type`) VALUES (193, 124, 'qqq', 'aaaa', '00', '', '17828262728', '0', '', '$2a$10$61sMYlMIv1M4Hs.A1/yULOecb1QTx0OmrMCO8dFgH8/bd7NKV6QGe', '0', '2', '192.168.110.111', '2025-12-15 15:01:22', 'admin', '2025-12-15 15:01:18', '', '2025-12-15 15:06:36', NULL, NULL, 4, 0, NULL, NULL, NULL);
INSERT INTO `sys_user` (`user_id`, `dept_id`, `user_name`, `nick_name`, `user_type`, `email`, `phonenumber`, `sex`, `avatar`, `password`, `status`, `del_flag`, `login_ip`, `login_date`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`, `disable_remark`, `company_id`, `is_admin`, `code`, `promotion_qr_code`, `role_type`) VALUES (194, 124, 'qqq', 'aaaa', '00', '', '17828262728', '0', '', '$2a$10$yi9.d2mBGQsRGqKaNNSGKepk4tvkps/WZeO.YTuc7UMP6ZAuSgIsq', '0', '2', '', NULL, 'admin', '2025-12-15 15:06:40', '', '2025-12-15 15:07:15', NULL, NULL, 5, 0, NULL, NULL, NULL);
INSERT INTO `sys_user` (`user_id`, `dept_id`, `user_name`, `nick_name`, `user_type`, `email`, `phonenumber`, `sex`, `avatar`, `password`, `status`, `del_flag`, `login_ip`, `login_date`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`, `disable_remark`, `company_id`, `is_admin`, `code`, `promotion_qr_code`, `role_type`) VALUES (195, 124, 'qqq', 'aaaa', '00', '', '17828262728', '0', '', '$2a$10$0iLVHdWo4qsMQQDOEIlvEe2k8qdSzstfxaCvwIPbMU.avBwXhNtPy', '0', '2', '', NULL, 'admin', '2025-12-15 15:07:23', '', '2025-12-15 15:08:35', NULL, NULL, 6, 0, NULL, NULL, NULL);
INSERT INTO `sys_user` (`user_id`, `dept_id`, `user_name`, `nick_name`, `user_type`, `email`, `phonenumber`, `sex`, `avatar`, `password`, `status`, `del_flag`, `login_ip`, `login_date`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`, `disable_remark`, `company_id`, `is_admin`, `code`, `promotion_qr_code`, `role_type`) VALUES (196, 124, 'qqq', 'aaaa', '00', '', '17828262728', '0', '', '$2a$10$bL9anrz6oUt7TMsjp3hUJeS0ElZfJ498pf/ZMg72yJBp/QMu09wVi', '0', '0', '192.168.110.111', '2025-12-16 15:08:05', 'admin', '2025-12-15 15:08:40', '', '2025-12-16 15:08:04', NULL, NULL, 7, 0, NULL, NULL, NULL);
+INSERT INTO `sys_user` (`user_id`, `dept_id`, `user_name`, `nick_name`, `user_type`, `email`, `phonenumber`, `sex`, `avatar`, `password`, `status`, `del_flag`, `login_ip`, `login_date`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`, `disable_remark`, `company_id`, `is_admin`, `code`, `promotion_qr_code`, `role_type`) VALUES (197, NULL, 'aa', 'aa', '00', '', '123', '0', '', '$2a$10$mvlH7DMtP.2Ad1h9IWHtFuW9Owxaqsii3pbaLlcG3SFuYCjzwfkgm', '0', '0', '192.168.110.111', '2025-12-17 14:45:58', 'admin', '2025-12-17 14:45:45', '', '2025-12-17 14:45:57', '111', NULL, NULL, 0, '123', NULL, 3);
+INSERT INTO `sys_user` (`user_id`, `dept_id`, `user_name`, `nick_name`, `user_type`, `email`, `phonenumber`, `sex`, `avatar`, `password`, `status`, `del_flag`, `login_ip`, `login_date`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`, `disable_remark`, `company_id`, `is_admin`, `code`, `promotion_qr_code`, `role_type`) VALUES (198, 124, '15708179999', '张三', '00', '', '15708179999', '0', '', '$2a$10$r7lH8h0Vtp6Dg7lyqlBqqOV5WaBdAzn3oc8A1kUiv.E0XCrvVSrDO', '0', '2', '', NULL, 'admin', '2025-12-22 09:36:19', 'admin', '2025-12-22 10:30:12', '备注', NULL, 8, 1, NULL, NULL, 2);
+INSERT INTO `sys_user` (`user_id`, `dept_id`, `user_name`, `nick_name`, `user_type`, `email`, `phonenumber`, `sex`, `avatar`, `password`, `status`, `del_flag`, `login_ip`, `login_date`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`, `disable_remark`, `company_id`, `is_admin`, `code`, `promotion_qr_code`, `role_type`) VALUES (199, NULL, '15708179461', 'HC', '00', '', '15708179461', '0', '', '$2a$10$2xyzC1Uf66dFbzLGxxdQ0.PsLZp3UeR5//bbFHuwGLFOQFSopeeDy', '0', '0', '', NULL, 'admin', '2025-12-22 10:45:03', '', NULL, '备注', NULL, NULL, 0, '999', NULL, 1);
COMMIT;
-- ----------------------------
@@ -1285,6 +1377,7 @@
INSERT INTO `sys_user_role` (`user_id`, `role_id`) VALUES (190, 2);
INSERT INTO `sys_user_role` (`user_id`, `role_id`) VALUES (191, 5);
INSERT INTO `sys_user_role` (`user_id`, `role_id`) VALUES (196, 1);
+INSERT INTO `sys_user_role` (`user_id`, `role_id`) VALUES (197, 1);
COMMIT;
-- ----------------------------
@@ -1302,26 +1395,28 @@
`gender` int DEFAULT NULL COMMENT '性别(1=男,2=女)',
`birthday` date DEFAULT NULL COMMENT '生日',
`openid` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '微信openid',
- `user_type` int DEFAULT NULL COMMENT '角色(1=游客,2=营销员,3=合伙人)',
- `create_time` datetime DEFAULT NULL COMMENT '注册时间',
+ `user_type` int DEFAULT '1' COMMENT '角色(1=游客,2=营销员,3=合伙人)',
+ `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '注册时间',
+ `total_accumulative_integral` int DEFAULT '0' COMMENT '历史累计积分',
`accumulative_integral` int DEFAULT '0' COMMENT '累计积分',
`referrer_user_id` int DEFAULT NULL COMMENT '推荐人id',
`referrer_sys_user_id` int DEFAULT NULL COMMENT '股东id',
`referrer_status` int DEFAULT NULL COMMENT '推荐状态(1=临时,2=正式)',
`referrer_time` datetime DEFAULT NULL COMMENT '推荐时间',
`promotion_status` int DEFAULT '0' COMMENT '推广状态(0=关闭,1=打开)',
- `gold_balance` decimal(10,2) DEFAULT NULL COMMENT '金币余额',
- `status` int DEFAULT '0' COMMENT '状态(1=正常,2=冻结,3=删除)',
+ `gold_balance` decimal(10,2) DEFAULT '0.00' COMMENT '金币余额',
+ `status` int DEFAULT '1' COMMENT '状态(1=正常,2=冻结,3=删除)',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='小程序用户';
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='小程序用户';
-- ----------------------------
-- Records of t_app_user
-- ----------------------------
BEGIN;
-INSERT INTO `t_app_user` (`id`, `company_id`, `name`, `profile_photo`, `code`, `promotion_qr_code`, `phone`, `gender`, `birthday`, `openid`, `user_type`, `create_time`, `accumulative_integral`, `referrer_user_id`, `referrer_sys_user_id`, `referrer_status`, `referrer_time`, `promotion_status`, `gold_balance`, `status`) VALUES (1, 1, '1', '1', '1', '1', '1', 1, '2025-12-12', '1', 1, '2025-12-12 09:33:58', 1, 1, NULL, 1, '2025-12-12 09:34:05', 1, 1.00, 1);
-INSERT INTO `t_app_user` (`id`, `company_id`, `name`, `profile_photo`, `code`, `promotion_qr_code`, `phone`, `gender`, `birthday`, `openid`, `user_type`, `create_time`, `accumulative_integral`, `referrer_user_id`, `referrer_sys_user_id`, `referrer_status`, `referrer_time`, `promotion_status`, `gold_balance`, `status`) VALUES (2, 2, '2', '2', '2', '2', '2', 2, '2025-12-12', '2', 2, '2025-12-12 09:42:25', 2, 2, NULL, 2, '2025-12-12 09:42:22', 2, 2.00, 2);
-INSERT INTO `t_app_user` (`id`, `company_id`, `name`, `profile_photo`, `code`, `promotion_qr_code`, `phone`, `gender`, `birthday`, `openid`, `user_type`, `create_time`, `accumulative_integral`, `referrer_user_id`, `referrer_sys_user_id`, `referrer_status`, `referrer_time`, `promotion_status`, `gold_balance`, `status`) VALUES (3, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'ocm2B19dsdmXrc609PJNd9AD_H7M', NULL, NULL, 0, NULL, NULL, NULL, NULL, 0, NULL, 0);
+INSERT INTO `t_app_user` (`id`, `company_id`, `name`, `profile_photo`, `code`, `promotion_qr_code`, `phone`, `gender`, `birthday`, `openid`, `user_type`, `create_time`, `total_accumulative_integral`, `accumulative_integral`, `referrer_user_id`, `referrer_sys_user_id`, `referrer_status`, `referrer_time`, `promotion_status`, `gold_balance`, `status`) VALUES (1, 1, '1', 'http://221.182.45.100:11223/images/2025-12-16/1.png', '1', '1', '1', 1, '2025-12-12', '1', 1, '2025-12-12 09:33:58', NULL, 9000, 1, NULL, 1, '2025-12-12 09:34:05', 1, 0.00, 1);
+INSERT INTO `t_app_user` (`id`, `company_id`, `name`, `profile_photo`, `code`, `promotion_qr_code`, `phone`, `gender`, `birthday`, `openid`, `user_type`, `create_time`, `total_accumulative_integral`, `accumulative_integral`, `referrer_user_id`, `referrer_sys_user_id`, `referrer_status`, `referrer_time`, `promotion_status`, `gold_balance`, `status`) VALUES (2, 2, '2', '2', '2', '2', '2', 2, '2025-12-12', '2', 2, '2025-12-12 09:42:25', NULL, 9000, 2, NULL, 2, '2025-12-12 09:42:22', 2, 0.00, 2);
+INSERT INTO `t_app_user` (`id`, `company_id`, `name`, `profile_photo`, `code`, `promotion_qr_code`, `phone`, `gender`, `birthday`, `openid`, `user_type`, `create_time`, `total_accumulative_integral`, `accumulative_integral`, `referrer_user_id`, `referrer_sys_user_id`, `referrer_status`, `referrer_time`, `promotion_status`, `gold_balance`, `status`) VALUES (3, NULL, '', NULL, NULL, NULL, '18224358736', 1, '2025-12-22', 'ocm2B19dsdmXrc609PJNd9AD_H7M', 1, NULL, NULL, 9000, NULL, NULL, NULL, NULL, 0, 0.00, 1);
+INSERT INTO `t_app_user` (`id`, `company_id`, `name`, `profile_photo`, `code`, `promotion_qr_code`, `phone`, `gender`, `birthday`, `openid`, `user_type`, `create_time`, `total_accumulative_integral`, `accumulative_integral`, `referrer_user_id`, `referrer_sys_user_id`, `referrer_status`, `referrer_time`, `promotion_status`, `gold_balance`, `status`) VALUES (4, NULL, '1', NULL, NULL, NULL, '18283820718', NULL, NULL, NULL, 1, '2025-12-20 16:59:47', NULL, 8888, NULL, NULL, NULL, NULL, 0, 0.00, 1);
COMMIT;
-- ----------------------------
@@ -1355,6 +1450,7 @@
`create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
`update_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人',
`disabled` int DEFAULT '0' COMMENT '是否删除 0=否 1=是',
+ `read_count` int DEFAULT '0' COMMENT '阅读量',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='轮播图管理';
@@ -1362,15 +1458,15 @@
-- Records of t_banner
-- ----------------------------
BEGIN;
-INSERT INTO `t_banner` (`id`, `banner_name`, `pictures`, `banner_detail`, `create_time`, `update_time`, `create_by`, `update_by`, `disabled`) VALUES ('1', '1', 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg', '1', '2025-11-12 11:17:20', '2025-11-15 11:32:17', '1', '若依', 1);
-INSERT INTO `t_banner` (`id`, `banner_name`, `pictures`, `banner_detail`, `create_time`, `update_time`, `create_by`, `update_by`, `disabled`) VALUES ('1989537327214018561', '轮播图12', '2025-11-15/5a78cc87-f03d-4b66-a755-cfcb1af53b8f.png', '<p>这是跳转详情内容12</p>', '2025-11-15 11:33:57', '2025-11-27 19:40:31', '若依', '若依', 1);
-INSERT INTO `t_banner` (`id`, `banner_name`, `pictures`, `banner_detail`, `create_time`, `update_time`, `create_by`, `update_by`, `disabled`) VALUES ('1991767529109377026', '2', '2025-11-21/81b1fb68-ec66-4f84-8820-e17c9045b217.jpg', '<p>2</p>', '2025-11-21 15:15:58', '2025-11-27 19:40:29', '若依', '若依', 1);
-INSERT INTO `t_banner` (`id`, `banner_name`, `pictures`, `banner_detail`, `create_time`, `update_time`, `create_by`, `update_by`, `disabled`) VALUES ('1994008507362922497', '公益课堂', '2025-11-27/49d72b85-a953-4e84-ae97-8a9a059d3da8.jpg', '<p>公益课程</p>', '2025-11-27 19:40:49', NULL, '若依', '若依', 0);
-INSERT INTO `t_banner` (`id`, `banner_name`, `pictures`, `banner_detail`, `create_time`, `update_time`, `create_by`, `update_by`, `disabled`) VALUES ('1994008568830447617', '惠民超市', '2025-11-27/c4c142e0-8666-42c9-85d2-a9ad072a3c98.jpg', '<p>惠民超市</p>', '2025-11-27 19:41:04', NULL, '若依', '若依', 0);
-INSERT INTO `t_banner` (`id`, `banner_name`, `pictures`, `banner_detail`, `create_time`, `update_time`, `create_by`, `update_by`, `disabled`) VALUES ('1994008655614791681', '就业体系', '2025-11-27/a5b43aab-c702-4e0e-b159-a26e79e6bf69.jpg', '<p>就业体系</p>', '2025-11-27 19:41:25', NULL, '若依', '若依', 0);
-INSERT INTO `t_banner` (`id`, `banner_name`, `pictures`, `banner_detail`, `create_time`, `update_time`, `create_by`, `update_by`, `disabled`) VALUES ('1994008720647475201', '暖心服务', '2025-11-27/dfbcafe5-35d8-4866-8a42-b72bb5184d6e.jpg', '<p>暖心服务</p>', '2025-11-27 19:41:40', NULL, '若依', '若依', 0);
-INSERT INTO `t_banner` (`id`, `banner_name`, `pictures`, `banner_detail`, `create_time`, `update_time`, `create_by`, `update_by`, `disabled`) VALUES ('2', '2', 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg', '2', '2025-11-12 11:17:20', '2025-11-15 11:32:20', '1', '若依', 1);
-INSERT INTO `t_banner` (`id`, `banner_name`, `pictures`, `banner_detail`, `create_time`, `update_time`, `create_by`, `update_by`, `disabled`) VALUES ('3', '3', 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg', '3', '2025-11-12 11:17:20', '2025-11-15 11:32:22', '1', '若依', 1);
+INSERT INTO `t_banner` (`id`, `banner_name`, `pictures`, `banner_detail`, `create_time`, `update_time`, `create_by`, `update_by`, `disabled`, `read_count`) VALUES ('1', '1', 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg', '1', '2025-11-12 11:17:20', '2025-11-15 11:32:17', '1', '若依', 1, 0);
+INSERT INTO `t_banner` (`id`, `banner_name`, `pictures`, `banner_detail`, `create_time`, `update_time`, `create_by`, `update_by`, `disabled`, `read_count`) VALUES ('1989537327214018561', '轮播图12', '2025-11-15/5a78cc87-f03d-4b66-a755-cfcb1af53b8f.png', '<p>这是跳转详情内容12</p>', '2025-11-15 11:33:57', '2025-11-27 19:40:31', '若依', '若依', 1, 0);
+INSERT INTO `t_banner` (`id`, `banner_name`, `pictures`, `banner_detail`, `create_time`, `update_time`, `create_by`, `update_by`, `disabled`, `read_count`) VALUES ('1991767529109377026', '2', '2025-11-21/81b1fb68-ec66-4f84-8820-e17c9045b217.jpg', '<p>2</p>', '2025-11-21 15:15:58', '2025-11-27 19:40:29', '若依', '若依', 1, 0);
+INSERT INTO `t_banner` (`id`, `banner_name`, `pictures`, `banner_detail`, `create_time`, `update_time`, `create_by`, `update_by`, `disabled`, `read_count`) VALUES ('1994008507362922497', '公益课堂', '2025-12-17/3c67fa89-c3c5-495b-b59d-c65c9ae0cee1.jpg', '<p>公益课程</p>', '2025-11-27 19:40:49', '2025-12-17 14:15:55', '若依', '若依', 0, 0);
+INSERT INTO `t_banner` (`id`, `banner_name`, `pictures`, `banner_detail`, `create_time`, `update_time`, `create_by`, `update_by`, `disabled`, `read_count`) VALUES ('1994008568830447617', '惠民超市', '2025-12-17/b56d154a-3d7d-4f0d-b65a-1727db730909.png', '<p>惠民超市</p>', '2025-11-27 19:41:04', '2025-12-17 14:15:47', '若依', '若依', 0, 0);
+INSERT INTO `t_banner` (`id`, `banner_name`, `pictures`, `banner_detail`, `create_time`, `update_time`, `create_by`, `update_by`, `disabled`, `read_count`) VALUES ('1994008655614791681', '就业体系', '2025-12-17/c756609e-3cd5-4465-aa97-8214cd1031de.jpg', '<p>就业体系</p>', '2025-11-27 19:41:25', '2025-12-17 14:15:40', '若依', '若依', 0, 0);
+INSERT INTO `t_banner` (`id`, `banner_name`, `pictures`, `banner_detail`, `create_time`, `update_time`, `create_by`, `update_by`, `disabled`, `read_count`) VALUES ('1994008720647475201', '暖心服务', '2025-12-17/fdca4928-ca92-482b-9f6b-d8abb1c86cd7.jpg', '<p>暖心服务</p>', '2025-11-27 19:41:40', '2025-12-17 14:15:33', '若依', '若依', 0, 0);
+INSERT INTO `t_banner` (`id`, `banner_name`, `pictures`, `banner_detail`, `create_time`, `update_time`, `create_by`, `update_by`, `disabled`, `read_count`) VALUES ('2', '2', 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg', '2', '2025-11-12 11:17:20', '2025-11-15 11:32:20', '1', '若依', 1, 0);
+INSERT INTO `t_banner` (`id`, `banner_name`, `pictures`, `banner_detail`, `create_time`, `update_time`, `create_by`, `update_by`, `disabled`, `read_count`) VALUES ('3', '3', 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg', '3', '2025-11-12 11:17:20', '2025-11-15 11:32:22', '1', '若依', 1, 0);
COMMIT;
-- ----------------------------
@@ -1391,7 +1487,7 @@
`detailed_description` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT '商品详情描述',
`create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
`create_user_id` bigint DEFAULT NULL COMMENT '添加人id',
- `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+ `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
`update_user_id` bigint DEFAULT NULL COMMENT '修改人id',
`status` int DEFAULT '0' COMMENT '0未删除 1删除',
PRIMARY KEY (`id`) USING BTREE
@@ -1403,7 +1499,7 @@
BEGIN;
INSERT INTO `t_big_gift_package` (`id`, `code`, `name`, `introduction`, `total_price`, `deposit`, `points_settlement_price`, `cover_image`, `detailed_image`, `inventory`, `detailed_description`, `create_time`, `create_user_id`, `update_time`, `update_user_id`, `status`) VALUES (1, '2', '3撒发发', '对方过后电饭锅回电话', 99.00, 888.00, 20.00, NULL, NULL, 300, NULL, '2025-12-10 15:44:03', NULL, '2025-12-12 09:33:34', NULL, 1);
INSERT INTO `t_big_gift_package` (`id`, `code`, `name`, `introduction`, `total_price`, `deposit`, `points_settlement_price`, `cover_image`, `detailed_image`, `inventory`, `detailed_description`, `create_time`, `create_user_id`, `update_time`, `update_user_id`, `status`) VALUES (3, '1', '2', '6', 3.00, 4.00, 5.00, NULL, NULL, 7, NULL, '2025-12-10 09:34:48', NULL, NULL, NULL, 1);
-INSERT INTO `t_big_gift_package` (`id`, `code`, `name`, `introduction`, `total_price`, `deposit`, `points_settlement_price`, `cover_image`, `detailed_image`, `inventory`, `detailed_description`, `create_time`, `create_user_id`, `update_time`, `update_user_id`, `status`) VALUES (5, '12312312313', '商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称', '商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介', 9000.00, 1000.00, 100.00, '2025-12-16/76b34dd7-cb18-4549-a9ab-a20d25777a33.png', '2025-12-16/196d30b4-acc4-4ee2-b2a1-ed703ca8d827.jpg,2025-12-16/b118539e-b65e-4fed-a825-4d6112cf05a9.png', 20, '<p> 5235441423132132113头发是后天</p><div class=\"media-wrap image-wrap\"><img class=\"media-wrap image-wrap\" id=\"1765872755997_2\" title=\"图片\" src=\"http://192.168.110.111:9908/images/2025-12-16/f0a757e1-dba0-48ef-b978-9d5a32669742.png\"/></div><p></p>', '2025-12-16 16:12:43', 1, NULL, NULL, 0);
+INSERT INTO `t_big_gift_package` (`id`, `code`, `name`, `introduction`, `total_price`, `deposit`, `points_settlement_price`, `cover_image`, `detailed_image`, `inventory`, `detailed_description`, `create_time`, `create_user_id`, `update_time`, `update_user_id`, `status`) VALUES (5, '12312312313', '商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称', '商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介', 9000.00, 1000.00, 100.00, '2025-12-16/76b34dd7-cb18-4549-a9ab-a20d25777a33.png', '2025-12-16/196d30b4-acc4-4ee2-b2a1-ed703ca8d827.jpg,2025-12-16/b118539e-b65e-4fed-a825-4d6112cf05a9.png', 19, '<p> 5235441423132132113头发是后天</p><div class=\"media-wrap image-wrap\"><img class=\"media-wrap image-wrap\" id=\"1765872755997_2\" title=\"图片\" src=\"http://192.168.110.111:9908/images/2025-12-16/f0a757e1-dba0-48ef-b978-9d5a32669742.png\"/></div><p></p>', '2025-12-16 16:12:43', 1, '2025-12-17 14:15:08', NULL, 0);
COMMIT;
-- ----------------------------
@@ -1415,7 +1511,7 @@
`code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '订单编号',
`company_id` int DEFAULT NULL COMMENT '所属公司',
`app_user_id` int DEFAULT NULL COMMENT '用户id',
- `create_time` datetime DEFAULT NULL COMMENT '下单时间',
+ `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '下单时间',
`big_gift_package_id` int DEFAULT NULL COMMENT '大礼包id',
`big_gift_package` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT '大礼包商品信息JSON字符串',
`order_price` decimal(10,2) DEFAULT '0.00' COMMENT '订单价格',
@@ -1437,13 +1533,14 @@
`effect_day_flag` tinyint(1) DEFAULT NULL COMMENT '是否启用生效日',
PRIMARY KEY (`id`) USING BTREE,
KEY `idx_pay_order_code` (`pay_order_code`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='大礼包订单';
+) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='大礼包订单';
-- ----------------------------
-- Records of t_big_gift_package_order
-- ----------------------------
BEGIN;
-INSERT INTO `t_big_gift_package_order` (`id`, `code`, `company_id`, `app_user_id`, `create_time`, `big_gift_package_id`, `big_gift_package`, `order_price`, `deposit`, `final_payment`, `payment_price`, `status`, `delivery_time`, `payment_type`, `deposit_time`, `deposit_payment_method`, `deposit_payment_serial_number`, `final_payment_time`, `final_payment_method`, `final_payment_serial_number`, `pay_order_code`, `del_flag`, `remark`, `effect_day_flag`) VALUES (1, '1', 1, 1, '2025-12-12 09:32:18', 1, '1', 1.00, 1.00, 1.00, 1.00, 1, '2025-12-12 09:32:15', 1, '2025-12-12 09:32:07', 1, '1', '2025-12-12 09:32:25', 1, '1', NULL, 0, '1', NULL);
+INSERT INTO `t_big_gift_package_order` (`id`, `code`, `company_id`, `app_user_id`, `create_time`, `big_gift_package_id`, `big_gift_package`, `order_price`, `deposit`, `final_payment`, `payment_price`, `status`, `delivery_time`, `payment_type`, `deposit_time`, `deposit_payment_method`, `deposit_payment_serial_number`, `final_payment_time`, `final_payment_method`, `final_payment_serial_number`, `pay_order_code`, `del_flag`, `remark`, `effect_day_flag`) VALUES (1, '1', 1, 1, '2025-12-12 09:32:18', 1, '{\n \"id\": 0,\n \"code\": \"code_a4591fbc4e61\",\n \"name\": \"name_8626e705e67d\",\n \"introduction\": \"introduction_38d1856be703\",\n \"totalPrice\": 0.00,\n \"deposit\": 0.00,\n \"pointsSettlementPrice\": 0.00,\n \"coverImage\": \"coverImage_a72b9a9e9420\",\n \"detailedImage\": \"detailedImage_39f87d25fee0\",\n \"inventory\": 0,\n \"detailedDescription\": \"detailedDescription_2123089ead27\",\n \"createTime\": \"2025-12-20 15:07:57\",\n \"createUserId\": 0,\n \"updateTime\": \"2025-12-20 15:07:57\",\n \"updateUserId\": 0,\n \"status\": 0\n}', 1.00, 1.00, 1.00, 1.00, 1, '2025-12-12 09:32:15', 1, '2025-12-12 09:32:07', 1, '1', '2025-12-12 09:32:25', 1, '1', NULL, 1, '1', NULL);
+INSERT INTO `t_big_gift_package_order` (`id`, `code`, `company_id`, `app_user_id`, `create_time`, `big_gift_package_id`, `big_gift_package`, `order_price`, `deposit`, `final_payment`, `payment_price`, `status`, `delivery_time`, `payment_type`, `deposit_time`, `deposit_payment_method`, `deposit_payment_serial_number`, `final_payment_time`, `final_payment_method`, `final_payment_serial_number`, `pay_order_code`, `del_flag`, `remark`, `effect_day_flag`) VALUES (2, 'BG202512171415088308', NULL, 4, '2025-12-17 14:15:09', 5, '{\"code\":\"12312312313\",\"coverImage\":\"2025-12-16/76b34dd7-cb18-4549-a9ab-a20d25777a33.png\",\"createTime\":\"2025-12-16 16:12:43\",\"createUserId\":1,\"deposit\":1000.00,\"detailedDescription\":\"<p> 5235441423132132113头发是后天</p><div class=\\\"media-wrap image-wrap\\\"><img class=\\\"media-wrap image-wrap\\\" id=\\\"1765872755997_2\\\" title=\\\"图片\\\" src=\\\"http://192.168.110.111:9908/images/2025-12-16/f0a757e1-dba0-48ef-b978-9d5a32669742.png\\\"/></div><p></p>\",\"detailedImage\":\"2025-12-16/196d30b4-acc4-4ee2-b2a1-ed703ca8d827.jpg,2025-12-16/b118539e-b65e-4fed-a825-4d6112cf05a9.png\",\"id\":5,\"introduction\":\"商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介\",\"inventory\":20,\"name\":\"商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称\",\"pointsSettlementPrice\":100.00,\"status\":0,\"totalPrice\":9000.00}', 9000.00, 1000.00, 8000.00, NULL, 1, NULL, 1, NULL, 1, NULL, NULL, NULL, NULL, 'BGP202512171415085489', 0, NULL, 0);
COMMIT;
-- ----------------------------
@@ -1453,12 +1550,14 @@
CREATE TABLE `t_commission_transaction_flow` (
`id` int NOT NULL AUTO_INCREMENT COMMENT '主键',
`app_user_id` int DEFAULT NULL COMMENT '收入用户id',
- `app_user_type` int DEFAULT NULL COMMENT '用户类型(1=顾客,2=营销员,3=合伙人)',
+ `app_user_type` int DEFAULT NULL COMMENT '收入用户类型(1=顾客,2=营销员,3=合伙人)',
`commission_rate` decimal(10,2) DEFAULT NULL COMMENT '提成比例',
`order_id` int DEFAULT NULL COMMENT '订单id',
`order_price` decimal(10,2) DEFAULT NULL COMMENT '订单金额',
- `commission_amount` decimal(10,2) DEFAULT NULL COMMENT '佣金收入金额',
- `create_time` datetime DEFAULT NULL COMMENT '添加时间',
+ `commission_amount` int DEFAULT NULL COMMENT '佣金收入金额',
+ `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
+ `buy_app_user_id` int DEFAULT NULL COMMENT '购买用户ID',
+ `order_type` tinyint(1) DEFAULT NULL COMMENT '订单类型(1=大礼包,2=实物商品)',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='佣金流水记录';
@@ -1484,12 +1583,12 @@
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '备注',
`promotion_qr_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '推广二维码地址',
`status` int DEFAULT NULL COMMENT '状态(1=正常,2=冻结,3删除)',
- `create_time` datetime DEFAULT NULL COMMENT '添加时间',
+ `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
`create_user_id` bigint NOT NULL COMMENT '添加人id',
- `update_time` datetime DEFAULT NULL COMMENT '修改时间',
+ `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
`update_user_id` bigint DEFAULT NULL COMMENT '修改人id',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='公司';
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='公司';
-- ----------------------------
-- Records of t_company
@@ -1501,6 +1600,7 @@
INSERT INTO `t_company` (`id`, `name`, `code`, `charge_person`, `charge_person_phone`, `merchant_number`, `merchant_openid`, `address`, `remark`, `promotion_qr_code`, `status`, `create_time`, `create_user_id`, `update_time`, `update_user_id`) VALUES (5, '', '1111', 'aaaa', '17828262728', '11111', '11111', 'wqeqweq', '', '', 3, NULL, 1, NULL, 0);
INSERT INTO `t_company` (`id`, `name`, `code`, `charge_person`, `charge_person_phone`, `merchant_number`, `merchant_openid`, `address`, `remark`, `promotion_qr_code`, `status`, `create_time`, `create_user_id`, `update_time`, `update_user_id`) VALUES (6, '', '1111', 'aaaa', '17828262728', '11111', '11111', 'wqeqweq', '', '', 3, NULL, 1, NULL, 0);
INSERT INTO `t_company` (`id`, `name`, `code`, `charge_person`, `charge_person_phone`, `merchant_number`, `merchant_openid`, `address`, `remark`, `promotion_qr_code`, `status`, `create_time`, `create_user_id`, `update_time`, `update_user_id`) VALUES (7, '', '1111', 'aaaa', '17828262728', '11111', '11111', 'wqeqweq', '', '', 1, NULL, 1, NULL, 0);
+INSERT INTO `t_company` (`id`, `name`, `code`, `charge_person`, `charge_person_phone`, `merchant_number`, `merchant_openid`, `address`, `remark`, `promotion_qr_code`, `status`, `create_time`, `create_user_id`, `update_time`, `update_user_id`) VALUES (8, '喜望', '001', '张三', '15708179999', '123', '9994', '天府新谷', '备注', NULL, 1, NULL, 1, NULL, NULL);
COMMIT;
-- ----------------------------
@@ -1513,15 +1613,20 @@
`type` int DEFAULT NULL COMMENT '类型(1=充值,2=扣除)',
`price` decimal(10,2) DEFAULT NULL COMMENT '金额',
`balance` decimal(10,2) DEFAULT NULL COMMENT '余额',
- `create_time` datetime DEFAULT NULL COMMENT '添加时间',
- `create_user_id` int DEFAULT NULL COMMENT '操作人id',
+ `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
+ `create_user_id` bigint DEFAULT NULL COMMENT '操作人id',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='用户金币变更记录';
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='用户金币变更记录';
-- ----------------------------
-- Records of t_gold_change_record
-- ----------------------------
BEGIN;
+INSERT INTO `t_gold_change_record` (`id`, `app_user_id`, `type`, `price`, `balance`, `create_time`, `create_user_id`) VALUES (1, 1, 1, 2.00, 3.00, '2025-12-19 14:13:09', 1);
+INSERT INTO `t_gold_change_record` (`id`, `app_user_id`, `type`, `price`, `balance`, `create_time`, `create_user_id`) VALUES (2, 1, 2, 3.00, 0.00, '2025-12-22 15:09:55', 1);
+INSERT INTO `t_gold_change_record` (`id`, `app_user_id`, `type`, `price`, `balance`, `create_time`, `create_user_id`) VALUES (3, 2, 2, 2.00, 0.00, '2025-12-22 15:09:55', 1);
+INSERT INTO `t_gold_change_record` (`id`, `app_user_id`, `type`, `price`, `balance`, `create_time`, `create_user_id`) VALUES (4, 3, 2, NULL, 0.00, '2025-12-22 15:09:55', 1);
+INSERT INTO `t_gold_change_record` (`id`, `app_user_id`, `type`, `price`, `balance`, `create_time`, `create_user_id`) VALUES (5, 4, 2, 0.00, 0.00, '2025-12-22 15:09:55', 1);
COMMIT;
-- ----------------------------
@@ -1530,7 +1635,7 @@
DROP TABLE IF EXISTS `t_html_config`;
CREATE TABLE `t_html_config` (
`id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `config_type` int DEFAULT NULL COMMENT '1=用户注册隐私协议,2=大礼包购买协议,3=实物商品购买协议,4=关于我们 5=积分规则,6=金币兑换图文说明,7=普通商品模块展示配置 8实物商品展示',
+ `config_type` int DEFAULT NULL COMMENT '1=用户注册隐私协议,2=大礼包购买协议,3=实物商品购买协议,4=关于我们 5=积分规则,6=金币兑换图文说明,7=普通商品模块展示配置 8实物商品展示 9启动页',
`content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '内容 实物0不展示 1展示 积分规则8(营销员),10(合伙人)',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='富文本内容管理 配置';
@@ -1547,7 +1652,7 @@
INSERT INTO `t_html_config` (`id`, `config_type`, `content`) VALUES ('1976182475255738369', 6, '<p>和GV和GV法国红酒返回给风景好11</p><div class=\"media-wrap image-wrap\"><img class=\"media-wrap image-wrap\" id=\"1764321749638_2\" title=\"图片\" src=\"http://221.182.45.100:11225/images/2025-11-28/9cf26ef3-034c-4a35-9de5-8dcd73c29058.png\"/></div><p></p>');
INSERT INTO `t_html_config` (`id`, `config_type`, `content`) VALUES ('1978656961494265858', 7, '<p>学习申请书2</p>');
INSERT INTO `t_html_config` (`id`, `config_type`, `content`) VALUES ('1981305846792486913', 8, '1');
-INSERT INTO `t_html_config` (`id`, `config_type`, `content`) VALUES ('1983081987643666434', 9, '购买支付说明');
+INSERT INTO `t_html_config` (`id`, `config_type`, `content`) VALUES ('1983081987643666434', 9, '2025-12-17/de1d8711-218f-4f74-bf06-fb11780696da.jpg');
INSERT INTO `t_html_config` (`id`, `config_type`, `content`) VALUES ('1983081987653618321', 10, '微心愿风险提示hgfjhgfghdgdgdtrdtrtrfytfhgfgdghfdghfdgj');
INSERT INTO `t_html_config` (`id`, `config_type`, `content`) VALUES ('1983081987654678452', 11, '群众诉求服务说明22');
INSERT INTO `t_html_config` (`id`, `config_type`, `content`) VALUES ('1983081998553725411', 12, '<p>随手拍说明11</p><p></p><p></p>');
@@ -1566,15 +1671,22 @@
`type` int DEFAULT NULL COMMENT '类型(1=增加,2=减少)',
`price` decimal(10,2) DEFAULT NULL COMMENT '金额',
`balance` decimal(10,2) DEFAULT NULL COMMENT '余额',
- `create_time` datetime DEFAULT NULL COMMENT '添加时间',
- `create_user_id` int DEFAULT NULL COMMENT '操作人id',
+ `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
+ `create_user_id` bigint DEFAULT NULL COMMENT '操作人id',
+ `old_balance` decimal(10,2) DEFAULT NULL COMMENT '修改前余额',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='用户积分变更记录';
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='用户积分变更记录';
-- ----------------------------
-- Records of t_integral_change_record
-- ----------------------------
BEGIN;
+INSERT INTO `t_integral_change_record` (`id`, `app_user_id`, `type`, `price`, `balance`, `create_time`, `create_user_id`, `old_balance`) VALUES (1, 1, 1, 1.00, 1.00, '2025-12-22 15:01:00', 1, 1.00);
+INSERT INTO `t_integral_change_record` (`id`, `app_user_id`, `type`, `price`, `balance`, `create_time`, `create_user_id`, `old_balance`) VALUES (2, 1, NULL, 9000.00, NULL, '2025-12-22 15:31:08', 1, 1.00);
+INSERT INTO `t_integral_change_record` (`id`, `app_user_id`, `type`, `price`, `balance`, `create_time`, `create_user_id`, `old_balance`) VALUES (3, 2, NULL, 9000.00, NULL, '2025-12-22 15:31:08', 1, 2.00);
+INSERT INTO `t_integral_change_record` (`id`, `app_user_id`, `type`, `price`, `balance`, `create_time`, `create_user_id`, `old_balance`) VALUES (4, 3, NULL, 9000.00, NULL, '2025-12-22 15:31:08', 1, 0.00);
+INSERT INTO `t_integral_change_record` (`id`, `app_user_id`, `type`, `price`, `balance`, `create_time`, `create_user_id`, `old_balance`) VALUES (5, 4, NULL, 9000.00, NULL, '2025-12-22 15:31:08', 1, 0.00);
+INSERT INTO `t_integral_change_record` (`id`, `app_user_id`, `type`, `price`, `balance`, `create_time`, `create_user_id`, `old_balance`) VALUES (6, 4, NULL, 8888.00, NULL, '2025-12-22 15:32:36', 1, 9000.00);
COMMIT;
-- ----------------------------
@@ -1584,14 +1696,15 @@
CREATE TABLE `t_integral_settlement` (
`id` int NOT NULL AUTO_INCREMENT COMMENT '主键',
`app_user_id` int DEFAULT NULL COMMENT '用户id',
- `settlement_interval` date DEFAULT NULL COMMENT '结算周期',
+ `settlement_interval` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '结算周期',
`settlement_start_time` date DEFAULT NULL COMMENT '结算开始时间',
`settlement_end_time` date DEFAULT NULL COMMENT '结算结束时间',
`total_settlement_integral` decimal(10,2) DEFAULT NULL COMMENT '合计结算积分',
- `create_time` datetime DEFAULT NULL COMMENT '添加时间',
+ `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
`create_user_id` int DEFAULT NULL COMMENT '操作人员id',
- `type` int DEFAULT NULL COMMENT '1分销 2导入',
- `buy_user_id` int DEFAULT NULL COMMENT '购买人id',
+ `type` int DEFAULT NULL COMMENT '1分销 2导入(废弃)',
+ `buy_user_id` int DEFAULT NULL COMMENT '购买人id(废弃)',
+ `remark` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '备注',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='积分结算记录';
@@ -1614,16 +1727,17 @@
`new_company_id` int DEFAULT NULL COMMENT '新所属公司id',
`new_app_user_id` int DEFAULT NULL COMMENT '新用户id',
`new_user_id` bigint DEFAULT NULL COMMENT '转让操作用户id',
- `create_time` datetime DEFAULT NULL COMMENT '添加时间',
+ `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
`del_flag` int DEFAULT '0' COMMENT '删除状态(0=否,1=是)',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='订单转让记录';
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='订单转让记录';
-- ----------------------------
-- Records of t_order_transfer
-- ----------------------------
BEGIN;
-INSERT INTO `t_order_transfer` (`id`, `big_gift_package_order_id`, `old_company_id`, `old_app_user_id`, `old_user_id`, `new_company_id`, `new_app_user_id`, `new_user_id`, `create_time`, `del_flag`) VALUES (1, 1, 1, 1, 1, 1, 2, 1, '2025-12-12 09:44:29', 0);
+INSERT INTO `t_order_transfer` (`id`, `big_gift_package_order_id`, `old_company_id`, `old_app_user_id`, `old_user_id`, `new_company_id`, `new_app_user_id`, `new_user_id`, `create_time`, `del_flag`) VALUES (1, 1, 1, 1, 1, 1, 2, 1, '2025-12-12 09:44:29', 1);
+INSERT INTO `t_order_transfer` (`id`, `big_gift_package_order_id`, `old_company_id`, `old_app_user_id`, `old_user_id`, `new_company_id`, `new_app_user_id`, `new_user_id`, `create_time`, `del_flag`) VALUES (2, 2, NULL, 3, NULL, NULL, 4, 1, '2025-12-22 14:17:04', 0);
COMMIT;
-- ----------------------------
@@ -1652,7 +1766,7 @@
-- ----------------------------
BEGIN;
INSERT INTO `t_physical_goods` (`id`, `name`, `introduction`, `total_price`, `cover_image`, `detailed_image`, `detailed_description`, `create_time`, `create_user_id`, `update_time`, `update_user_id`, `status`, `sales`) VALUES (1, '4', '6', 5.00, NULL, NULL, NULL, '2025-12-10 10:01:49', NULL, NULL, NULL, 1, 7);
-INSERT INTO `t_physical_goods` (`id`, `name`, `introduction`, `total_price`, `cover_image`, `detailed_image`, `detailed_description`, `create_time`, `create_user_id`, `update_time`, `update_user_id`, `status`, `sales`) VALUES (2, '商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称', '商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介', 894561.00, '2025-12-16/fca5c7b0-eeb4-43cd-bda4-76b408051c2c.jpg', '2025-12-16/c1af40b9-794b-485f-86a3-a0b147c63368.png,2025-12-16/18c585eb-c0e0-4465-ba54-e90026423c3f.png,2025-12-16/3e0dec0e-f6b3-48a7-93d5-dbe991862f02.png,2025-12-16/88248568-90c7-4e6d-b4ad-f802f3f618df.png', '<p><span style=\"color:#000000\"><span style=\"font-size:14px\"><span style=\"background-color:#ffffff\">商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述</span></span></span></p>', '2025-12-16 16:13:37', 1, NULL, NULL, 0, 0);
+INSERT INTO `t_physical_goods` (`id`, `name`, `introduction`, `total_price`, `cover_image`, `detailed_image`, `detailed_description`, `create_time`, `create_user_id`, `update_time`, `update_user_id`, `status`, `sales`) VALUES (2, '商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称', '商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介', 894561.00, '2025-12-16/fca5c7b0-eeb4-43cd-bda4-76b408051c2c.jpg', '2025-12-16/c1af40b9-794b-485f-86a3-a0b147c63368.png,2025-12-16/18c585eb-c0e0-4465-ba54-e90026423c3f.png,2025-12-16/3e0dec0e-f6b3-48a7-93d5-dbe991862f02.png,2025-12-16/88248568-90c7-4e6d-b4ad-f802f3f618df.png', '<p><span style=\"color:#000000\"><span style=\"font-size:14px\"><span style=\"background-color:#ffffff\">商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述</span></span></span></p>', '2025-12-16 16:13:37', 1, '2025-12-17 14:22:50', NULL, 0, 1);
COMMIT;
-- ----------------------------
@@ -1664,7 +1778,7 @@
`code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '订单编号',
`company_id` int DEFAULT NULL COMMENT '所属公司',
`app_user_id` int DEFAULT NULL COMMENT '用户id',
- `create_time` datetime DEFAULT NULL COMMENT '下单时间',
+ `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '下单时间',
`physical_goods_id` int DEFAULT NULL COMMENT '实物商品id',
`physical_goods` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT '实物商品信息JSON字符串',
`order_price` decimal(10,2) DEFAULT '0.00' COMMENT '订单价格',
@@ -1677,13 +1791,14 @@
`del_flag` int DEFAULT '0' COMMENT '删除状态(0=否,1=是)',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '备注',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='实物商品订单';
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='实物商品订单';
-- ----------------------------
-- Records of t_physical_goods_order
-- ----------------------------
BEGIN;
-INSERT INTO `t_physical_goods_order` (`id`, `code`, `company_id`, `app_user_id`, `create_time`, `physical_goods_id`, `physical_goods`, `order_price`, `payment_price`, `status`, `delivery_time`, `payment_time`, `payment_method`, `payment_serial_number`, `del_flag`, `remark`) VALUES (1, '1', 1, 1, '2025-12-15 11:32:36', 1, '1', 1.00, 1.00, 1, '2025-12-15 11:32:40', '2025-12-15 11:32:42', 1, '1', 0, '1');
+INSERT INTO `t_physical_goods_order` (`id`, `code`, `company_id`, `app_user_id`, `create_time`, `physical_goods_id`, `physical_goods`, `order_price`, `payment_price`, `status`, `delivery_time`, `payment_time`, `payment_method`, `payment_serial_number`, `del_flag`, `remark`) VALUES (1, '1', 1, 1, '2025-12-15 11:32:36', 1, '{\n \"id\": 0,\n \"name\": \"name_974b0b5f9131\",\n \"introduction\": \"introduction_4481ccd25f5b\",\n \"totalPrice\": 0.00,\n \"coverImage\": \"coverImage_634f87585f56\",\n \"detailedImage\": \"detailedImage_12a9827d2292\",\n \"detailedDescription\": \"detailedDescription_526c7d78420e\",\n \"createTime\": \"2025-12-20 15:08:45\",\n \"createUserId\": 0,\n \"updateTime\": \"2025-12-20 15:08:45\",\n \"updateUserId\": 0,\n \"status\": 0,\n \"sales\": 0\n}', 1.00, 1.00, 1, '2025-12-15 11:32:40', '2025-12-15 11:32:42', 1, '1', 0, '1');
+INSERT INTO `t_physical_goods_order` (`id`, `code`, `company_id`, `app_user_id`, `create_time`, `physical_goods_id`, `physical_goods`, `order_price`, `payment_price`, `status`, `delivery_time`, `payment_time`, `payment_method`, `payment_serial_number`, `del_flag`, `remark`) VALUES (2, 'PG202512171422513084', NULL, 3, '2025-12-17 14:22:51', 2, '{\"coverImage\":\"2025-12-16/fca5c7b0-eeb4-43cd-bda4-76b408051c2c.jpg\",\"createTime\":\"2025-12-16 16:13:37\",\"createUserId\":1,\"detailedDescription\":\"<p><span style=\\\"color:#000000\\\"><span style=\\\"font-size:14px\\\"><span style=\\\"background-color:#ffffff\\\">商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述商品详情描述</span></span></span></p>\",\"detailedImage\":\"2025-12-16/c1af40b9-794b-485f-86a3-a0b147c63368.png,2025-12-16/18c585eb-c0e0-4465-ba54-e90026423c3f.png,2025-12-16/3e0dec0e-f6b3-48a7-93d5-dbe991862f02.png,2025-12-16/88248568-90c7-4e6d-b4ad-f802f3f618df.png\",\"id\":2,\"introduction\":\"商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介商品简介\",\"name\":\"商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称\",\"sales\":0,\"status\":0,\"totalPrice\":894561.00}', 894561.00, 894561.00, 1, NULL, NULL, 1, NULL, 0, NULL);
COMMIT;
-- ----------------------------
@@ -1696,7 +1811,7 @@
`picture_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '图片地址',
`content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin COMMENT '跳转详情内容',
`view_number` int DEFAULT '0' COMMENT '浏览量',
- `create_time` datetime DEFAULT NULL COMMENT '添加时间',
+ `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
`status` int DEFAULT '1' COMMENT '状态(1=正常,2=删除)',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='系统图片';
@@ -1722,6 +1837,7 @@
`audit_user_id` bigint DEFAULT NULL COMMENT '审核人id',
`audit_time` datetime DEFAULT NULL COMMENT '审核时间',
`audit_remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '驳回原因',
+ `del_flag` int DEFAULT '0' COMMENT '1删除 0未删除',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='退款申请';
@@ -1729,7 +1845,7 @@
-- Records of t_refund_application
-- ----------------------------
BEGIN;
-INSERT INTO `t_refund_application` (`id`, `big_gift_package_order_id`, `applicant_user_id`, `applicant_time`, `refund_reason`, `voucher_picture`, `status`, `audit_user_id`, `audit_time`, `audit_remark`) VALUES (1, 1, 1, '2025-12-15 11:12:42', '1', '1', 1, 1, '2025-12-15 11:12:38', '1');
+INSERT INTO `t_refund_application` (`id`, `big_gift_package_order_id`, `applicant_user_id`, `applicant_time`, `refund_reason`, `voucher_picture`, `status`, `audit_user_id`, `audit_time`, `audit_remark`, `del_flag`) VALUES (1, 1, 1, '2025-12-15 11:12:42', '1', '1', 1, 1, '2025-12-15 11:12:38', '1', NULL);
COMMIT;
-- ----------------------------
@@ -1739,7 +1855,7 @@
CREATE TABLE `t_user_visit` (
`id` int NOT NULL,
`app_user_id` int DEFAULT NULL COMMENT '用户id',
- `time` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '访问时间',
+ `time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '访问时间',
PRIMARY KEY (`id`),
UNIQUE KEY `app_user_id` (`app_user_id`,`time`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='用户访问次数 1';
--
Gitblit v1.7.1