1

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/controller/AppletApiPromotionController.java

@@ -0,0 +1,73 @@
+package org.jeecg.modules.applet.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.vo.AppletUser;
+import org.jeecg.modules.applet.service.AppletApiPromotionService;
+import org.jeecg.modules.demo.appletWater.entity.AppletWater;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@Tag(name = "推广官", description = "推广官")
+@RestController
+@RequestMapping("/appletApi/promotion")
+public class AppletApiPromotionController {
+
+    @Autowired
+    private AppletApiPromotionService appletApiPromotionService;
+
+    @Operation(summary = "获取推广二维码", description = "获取推广二维码")
+    @GetMapping(value = "/qrCode", produces = MediaType.IMAGE_PNG_VALUE)
+    public byte[] getInviteCode(@RequestParam(required = false) String type) {
+        return appletApiPromotionService.getInviteCode(type);
+    }
+
+    @Operation(summary = "我的团队", description = "我的团队")
+    @GetMapping(value = "/team")
+    public Result<IPage<AppletUser>> team(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                          @RequestParam(required = false) @Parameter String name) {
+        Page<AppletUser> page = new Page<>(pageNo, pageSize);
+        IPage<AppletUser> UserList = appletApiPromotionService.getTeam(page, name);
+        return Result.OK(UserList);
+    }
+
+    @Operation(summary = "佣金流水", description = "佣金流水")
+    @GetMapping(value = "/water")
+    public Result<IPage<AppletWater>> water(
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+        Page<AppletWater> waterPage = new Page<>(pageNo, pageSize);
+        IPage<AppletWater> list = appletApiPromotionService.getWater(waterPage);
+        return Result.OK(list);
+    }
+
+//    @Operation(summary = "提现", description = "参数：提现人 提现金额")
+//    @PostMapping(value = "/withdraw")
+//    public Result<AppletWithdrawal> withdraw(AppletWithdrawal appletWithdrawal, @RequestParam(required = false, defaultValue = LoginType.APPLET) String type) {
+//        AppletWithdrawal With = appletApiPromotionService.getWithdraw(appletWithdrawal, type);
+//        return Result.OK(With);
+//    }
+
+//    @Operation(summary = "提现成功", description = "参数：提现id")
+//    @PostMapping(value = "/withdrawSuccess")
+//    public Result<?> withdrawSuccess(@RequestParam @Parameter(description = "提现id") String id) {
+//        appletApiWaterService.withdrawSuccess(id);
+//        return Result.OK();
+//    }
+
+//    @Operation(summary = "推广统计", description = "推广统计")
+//    @GetMapping(value = "/statistics")
+//    public Result<StatisticsVo> statistics() {
+//        return Result.OK(appletApiPromotionService.statistics());
+//    }
+
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/AppletApiPromotionService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.applet.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.common.system.vo.AppletUser;
+import org.jeecg.modules.demo.appletWater.entity.AppletWater;
+
+public interface AppletApiPromotionService {
+    byte[] getInviteCode(String type);
+
+    IPage<AppletUser> getTeam(Page<AppletUser> page, String name);
+
+    IPage<AppletWater> getWater(Page<AppletWater> waterPage);
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiPromotionServiceImpl.java

@@ -0,0 +1,259 @@
+package org.jeecg.modules.applet.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.log4j.Log4j2;
+import org.jeecg.common.system.util.AppletUserUtil;
+import org.jeecg.common.system.vo.AppletUser;
+import org.jeecg.common.util.oss.OssBootUtil;
+import org.jeecg.modules.applet.service.AppletApiPromotionService;
+import org.jeecg.modules.common.wxUtils.WxHttpUtils;
+import org.jeecg.modules.demo.appletConfig.service.IAppletConfigService;
+import org.jeecg.modules.demo.appletWater.entity.AppletWater;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.net.URL;
+import java.nio.file.Files;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+@Log4j2
+@Service
+public class AppletApiPromotionServiceImpl implements AppletApiPromotionService {
+
+
+
+    @Autowired
+    private IAppletConfigService appletConfigService;
+
+    @Autowired
+    private WxHttpUtils wxHttpUtils;
+
+    // 创建线程池用于异步处理
+    private final ExecutorService asyncExecutor = Executors.newFixedThreadPool(5);
+
+    @Override
+    public byte[] getInviteCode(String type){
+        AppletUser user = AppletUserUtil.getCurrentAppletUser();
+
+        // 获取环境配置
+        String vsion = appletConfigService.getContentByCode("invite_env_version");
+        String trial = "release";
+        if("0".equals(vsion)){
+            trial= "release";
+        }else if("1".equals(vsion)){
+            trial= "trial";
+        }else{
+            trial= "develop";
+        }
+
+        // 获取必要的配置信息
+        String xcxSharePage = appletConfigService.getContentByCode("xcxSharePage");
+        String backgroundImageUrl = appletConfigService.getContentByCode("qr_code_bg");
+        String webUrl = appletConfigService.getContentByCode("webUrl");
+        int webUrlCode = 0;
+//        int webUrlCode = (webUrl != null && LoginType.OFFICIAL.equals(type)) ? webUrl.hashCode() : 0;
+
+        // 获取二维码位置配置参数
+        int qrCodeX = appletConfigService.getContentByCodeAsInt("qr_code_x");
+        int qrCodeY = appletConfigService.getContentByCodeAsInt("qr_code_y");
+
+        // 优化缓存策略：使用更精确的缓存key，包含所有影响因素（包括背景图片URL和二维码位置配置）
+//        String cacheKey = String.format("inviteCode:final:%s:%s:%s:%s:%s:%s",
+//            user.getId(), trial, xcxSharePage.hashCode(), backgroundImageUrl.hashCode(), qrCodeX, qrCodeY);
+
+        // 移除图片数据的Redis缓存，避免类型转换错误
+        // 直接检查OSS中是否已存在最终图片
+
+        // 检查OSS中是否已存在最终图片
+        String finalPath = String.format("invite/final/%s_%s_%s_%s_%s_%s_%s_%s.jpg",
+                user.getId(), trial, xcxSharePage.hashCode(), backgroundImageUrl.hashCode(), qrCodeX, qrCodeY, type, webUrlCode);
+        try {
+            InputStream ossFile = OssBootUtil.getOssFile(finalPath, null);
+            if (ossFile != null) {
+                try {
+                    // 使用ByteArrayOutputStream读取InputStream中的所有字节
+                    java.io.ByteArrayOutputStream buffer = new java.io.ByteArrayOutputStream();
+                    int nRead;
+                    byte[] data = new byte[1024];
+                    while ((nRead = ossFile.read(data, 0, data.length)) != -1) {
+                        buffer.write(data, 0, nRead);
+                    }
+                    buffer.flush();
+                    byte[] ossImageBytes = buffer.toByteArray();
+
+                    // 直接返回OSS中的图片，不再缓存到Redis
+                    log.info("从OSS返回邀请码图片，用户ID: {}", user.getId());
+                    return ossImageBytes;
+                } finally {
+                    ossFile.close();
+                }
+            }
+        } catch (Exception e) {
+            log.debug("OSS中未找到最终图片，需要重新生成，用户ID: {}", user.getId());
+        }
+
+        try {
+            // 直接生成小程序码，移除Redis缓存避免类型转换错误
+            log.info("生成小程序码，用户ID: {}", user.getId());
+//            byte[] qrCodeBytes = null;
+            BufferedImage qrCodeImage = null;
+
+//            if (LoginType.APPLET.equals(type)){
+                qrCodeImage = ImageIO.read(new ByteArrayInputStream(generateWxQrCode(user, xcxSharePage, trial)));
+//            }else {
+//                qrCodeImage = QRCodeUtil.getBufferedImage(webUrl + "?inviter=" + user.getId());
+//            }
+
+            // 生成最终合成图片，传递已获取的配置参数避免重复调用
+
+            byte[] finalImage = this.generateAndCombineImagesFromUrl2(qrCodeImage, backgroundImageUrl, qrCodeX, qrCodeY);
+
+            // 异步上传到OSS（移除Redis缓存）
+            uploadToOssAsync(finalImage, finalPath);
+
+            return finalImage;
+        } catch (Exception e) {
+            log.error("生成邀请码失败，用户ID: {}", user.getId(), e);
+            return null;
+        }
+    }
+
+    @Override
+    public IPage<AppletUser> getTeam(Page<AppletUser> page, String name) {
+        return null;
+    }
+
+    @Override
+    public IPage<AppletWater> getWater(Page<AppletWater> waterPage) {
+        return null;
+    }
+
+    /**
+     * 生成微信小程序码
+     */
+    private byte[] generateWxQrCode(AppletUser user, String xcxSharePage, String trial) throws Exception {
+        // 准备微信API请求参数
+        String key = "inviter=" + user.getId();
+        Map<String, Object> param = new HashMap<>();
+        param.put("path", xcxSharePage + "?" + key);
+        param.put("scene", user.getId());
+        param.put("width", 150);
+        param.put("auto_color", false);
+        param.put("env_version", trial);
+
+        Map<String, Object> line_color = new HashMap<>();
+        line_color.put("r", 0);
+        line_color.put("g", 0);
+        line_color.put("b", 0);
+        param.put("line_color", line_color);
+        param.put("is_hyaline", true);
+
+        // 获取微信小程序码
+        String accessToken = wxHttpUtils.getAccessToken();
+        String url = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + accessToken;
+
+        // 请求微信API获取二维码图片数据
+        RestTemplate rest = new RestTemplate();
+        MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
+        HttpEntity requestEntity = new HttpEntity(JSON.toJSONString(param), headers);
+        ResponseEntity<byte[]> entity = rest.exchange(url, HttpMethod.POST, requestEntity, byte[].class, new Object[0]);
+
+        return entity.getBody();
+    }
+
+    /**
+     * 异步上传到OSS
+     */
+    private void uploadToOssAsync(byte[] imageBytes, String ossPath) {
+        // 使用线程池异步执行上传操作
+        CompletableFuture.runAsync(() -> {
+            try {
+                // 上传到OSS
+                OssBootUtil.upload(new ByteArrayInputStream(imageBytes), ossPath);
+                log.info("异步上传OSS完成，路径: {}", ossPath);
+            } catch (Exception e) {
+                log.error("异步上传OSS失败，路径: {}", ossPath, e);
+            }
+        }, asyncExecutor);
+    }
+
+
+    public byte[] generateAndCombineImagesFromUrl2(BufferedImage qrCodeImage, String backgroundUrl, int qr_code_x, int qr_code_y) {
+        File file = null;
+        try {
+            // 直接从URL加载背景图像，移除Redis缓存避免类型转换问题
+            URL backgroundImageUrl = new URL(backgroundUrl);
+            BufferedImage backgroundImage = ImageIO.read(backgroundImageUrl);
+            log.debug("从URL加载背景图片: {}", backgroundUrl);
+
+            // 从字节数组加载小程序码图像
+//            BufferedImage qrCodeImage = ImageIO.read(new ByteArrayInputStream(qrCodeImageByte));
+
+            // 使用传入的配置参数，避免重复调用配置服务
+
+            // 直接使用背景图片作为基础，避免创建新的图像导致黑边
+            BufferedImage combinedImage = new BufferedImage(
+                    backgroundImage.getWidth(),
+                    backgroundImage.getHeight(),
+                    backgroundImage.getType() // 使用背景图片的原始类型，保持透明度
+            );
+
+            Graphics2D g2d = combinedImage.createGraphics();
+
+            // 设置高质量渲染
+            g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
+            g2d.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
+            g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+
+            // 先绘制背景图像，完全覆盖画布
+            g2d.drawImage(backgroundImage, 0, 0, backgroundImage.getWidth(), backgroundImage.getHeight(), null);
+
+            int wh = backgroundImage.getWidth() / 3;
+
+            // 计算小程序码放置的位置（这里以中心位置为例）
+            int qrCodeX = (backgroundImage.getWidth() - wh) / 2;
+            int qrCodeY = (int) ((backgroundImage.getHeight() - wh) * 0.6);
+
+            // 绘制小程序码图像，使用传入的位置参数
+            g2d.drawImage(qrCodeImage, qrCodeX + qr_code_x, qrCodeY + qr_code_y, wh, wh, null);
+
+            // 释放Graphics2D资源
+            g2d.dispose();
+
+            // 将合并后的图像保存到临时文件
+            file = File.createTempFile("combined_", ".png");
+            ImageIO.write(combinedImage, "png", file);
+
+            // 读取文件字节并返回
+            return Files.readAllBytes(file.toPath());
+        } catch (Exception e) {
+            log.error("生成合并图片失败", e);
+            throw new RuntimeException("生成合并图片失败", e);
+        } finally {
+            // 删除临时文件
+            if (file != null && file.exists()) {
+                file.delete();
+            }
+        }
+    }
+
+
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletConfig/controller/AppletConfigController.java

@@ -29,6 +29,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -90,6 +91,7 @@ public class AppletConfigController extends JeecgController<AppletConfig, IApple
 	@Operation(summary="小程序配置-添加")
 	@RequiresPermissions("appletConfig:applet_config:add")
 	@PostMapping(value = "/add")
+	@CacheEvict(value = "appletConfig", allEntries = true)
 	public Result<String> add(@RequestBody AppletConfig appletConfig) {
 		appletConfigService.save(appletConfig);
 
@@ -106,6 +108,7 @@ public class AppletConfigController extends JeecgController<AppletConfig, IApple
 	@Operation(summary="小程序配置-编辑")
 	@RequiresPermissions("appletConfig:applet_config:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	@CacheEvict(value = "appletConfig", allEntries = true)
 	public Result<String> edit(@RequestBody AppletConfig appletConfig) {
 		appletConfigService.updateById(appletConfig);
 		return Result.OK("编辑成功!");

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletConfig/service/IAppletConfigService.java

@@ -11,4 +11,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IAppletConfigService extends IService<AppletConfig> {
 
+
+    String getContentByCode(String code);
+
+
+    Integer getContentByCodeAsInt(String code);
+
+
 }

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletConfig/service/impl/AppletConfigServiceImpl.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.demo.appletConfig.service.impl;
 import org.jeecg.modules.demo.appletConfig.entity.AppletConfig;
 import org.jeecg.modules.demo.appletConfig.mapper.AppletConfigMapper;
 import org.jeecg.modules.demo.appletConfig.service.IAppletConfigService;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,4 +17,23 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class AppletConfigServiceImpl extends ServiceImpl<AppletConfigMapper, AppletConfig> implements IAppletConfigService {
 
+
+    @Override
+    @Cacheable(value = "appletConfig", key = "#code")
+    public String getContentByCode(String code) {
+        AppletConfig config = lambdaQuery()
+                .eq(AppletConfig::getCode, code)
+                .one();
+        return config != null ? config.getContent() : null;
+    }
+
+
+    @Override
+    @Cacheable(value = "appletConfig", key = "'int_' + #code")
+    public Integer getContentByCodeAsInt(String code) {
+        String i = getContentByCode(code);
+        return i != null ? Integer.parseInt(i) : null;
+    }
+
+
 }

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProduct/service/IAppletProductSpecService.java

@@ -29,4 +29,21 @@ public interface IAppletProductSpecService extends IService<AppletProductSpec> {
 	 * @return boolean true-已存在，false-不存在
 	 */
 	public boolean checkSpecNameExists(String productId, String specName, String excludeId);
+
+	/**
+	 * 根据产品ID获取所有已存在的规格名称
+	 *
+	 * @param productId 产品ID
+	 * @return List<String> 已存在的规格名称列表
+	 */
+	List<String> getExistingSpecNames(String productId);
+
+	/**
+	 * 检查是否有上架的规格实体关联了该规格类型或规格项
+	 *
+	 * @param productId 产品ID
+	 * @param specTitle 规格类型或规格项的标题
+	 * @return boolean true-存在上架关联，false-不存在
+	 */
+	boolean hasOnShelfAssociatedSpecs(String productId, String specTitle);
 }

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletProduct/service/impl/AppletProductSpecServiceImpl.java

@@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.stream.Collectors;
+
 /**
  * @Description: 产品规格表
  * @Author: jeecg-boot
@@ -36,4 +38,28 @@ public class AppletProductSpecServiceImpl extends ServiceImpl<AppletProductSpecM
 		}
 		return this.count(queryWrapper) > 0;
 	}
+
+	@Override
+	public List<String> getExistingSpecNames(String productId) {
+		QueryWrapper<AppletProductSpec> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("product_id", productId);
+		queryWrapper.select("spec_name");
+		return appletProductSpecMapper.selectObjs(queryWrapper).stream()
+				.map(Object::toString)
+				.collect(Collectors.toList());
+	}
+
+	@Override
+	public boolean hasOnShelfAssociatedSpecs(String productId, String specTitle) {
+		QueryWrapper<AppletProductSpec> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("product_id", productId);
+		queryWrapper.and(wrapper -> wrapper.like("spec_name", specTitle + ":%")
+                .or().like("spec_name", "%:" + specTitle)
+                .or().eq("spec_name", specTitle)
+                .or().like("spec_name", specTitle + ",%")
+                .or().like("spec_name", "%," + specTitle)
+                .or().like("spec_name", "%," + specTitle + ",%"));
+		queryWrapper.eq("putaway", "Y"); // 检查是否上架
+		return appletProductSpecMapper.selectCount(queryWrapper) > 0;
+	}
 }

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletWater/controller/AppletWaterController.java

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

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletWater/entity/AppletWater.java

@@ -0,0 +1,83 @@
+package org.jeecg.modules.demo.appletWater.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import org.jeecg.common.constant.ProvinceCityArea;
+import org.jeecg.common.util.SpringContextUtils;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 小程序流水
+ * @Author: jeecg-boot
+ * @Date:   2025-11-04
+ * @Version: V1.0
+ */
+@Data
+@TableName("applet_water")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description="小程序流水")
+public class AppletWater implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @Schema(description = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @Schema(description = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @Schema(description = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+    @Schema(description = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**用户*/
+	@Excel(name = "用户", width = 15)
+    @Schema(description = "用户")
+    private java.lang.String userId;
+	/**订单*/
+	@Excel(name = "订单", width = 15)
+    @Schema(description = "订单")
+    private java.lang.String orderId;
+	/**金额*/
+	@Excel(name = "金额", width = 15)
+    @Schema(description = "金额")
+    private java.math.BigDecimal price;
+	/**原钱包金额*/
+	@Excel(name = "原钱包金额", width = 15)
+    @Schema(description = "原钱包金额")
+    private java.math.BigDecimal oldMoney;
+	/**来源用户*/
+	@Excel(name = "来源用户", width = 15)
+    @Schema(description = "来源用户")
+    private java.lang.String fromId;
+	/**佣金*/
+    @Excel(name = "佣金", width = 15,replace = {"是_Y","否_N"} )
+    @Schema(description = "佣金")
+    private java.lang.String isCommission;
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletWater/mapper/AppletWaterMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.demo.appletWater.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.demo.appletWater.entity.AppletWater;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 小程序流水
+ * @Author: jeecg-boot
+ * @Date:   2025-11-04
+ * @Version: V1.0
+ */
+public interface AppletWaterMapper extends BaseMapper<AppletWater> {
+
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletWater/mapper/xml/AppletWaterMapper.xml

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

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletWater/service/IAppletWaterService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.demo.appletWater.service;
+
+import org.jeecg.modules.demo.appletWater.entity.AppletWater;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 小程序流水
+ * @Author: jeecg-boot
+ * @Date:   2025-11-04
+ * @Version: V1.0
+ */
+public interface IAppletWaterService extends IService<AppletWater> {
+
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletWater/service/impl/AppletWaterServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.demo.appletWater.service.impl;
+
+import org.jeecg.modules.demo.appletWater.entity.AppletWater;
+import org.jeecg.modules.demo.appletWater.mapper.AppletWaterMapper;
+import org.jeecg.modules.demo.appletWater.service.IAppletWaterService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 小程序流水
+ * @Author: jeecg-boot
+ * @Date:   2025-11-04
+ * @Version: V1.0
+ */
+@Service
+public class AppletWaterServiceImpl extends ServiceImpl<AppletWaterMapper, AppletWater> implements IAppletWaterService {
+
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletWater/uniapp/AppletWaterForm.vue

@@ -0,0 +1,113 @@
+<template>
+    <view>
+        <!--标题和返回-->
+		<cu-custom :bgColor="NavBarColor" isBack :backRouterName="backRouteName">
+			<block slot="backText">返回</block>
+			<block slot="content">小程序流水</block>
+		</cu-custom>
+		 <!--表单区域-->
+		<view>
+			<form>
+              <view class="cu-form-group">
+                <view class="flex align-center">
+                  <view class="title"><text space="ensp">用户：</text></view>
+                  <input  placeholder="请输入用户" v-model="model.userId"/>
+                </view>
+              </view>
+              <view class="cu-form-group">
+                <view class="flex align-center">
+                  <view class="title"><text space="ensp">订单：</text></view>
+                  <input  placeholder="请输入订单" v-model="model.orderId"/>
+                </view>
+              </view>
+              <view class="cu-form-group">
+                <view class="flex align-center">
+                  <view class="title"><text space="ensp">金额：</text></view>
+                  <input type="number" placeholder="请输入金额" v-model="model.price"/>
+                </view>
+              </view>
+              <view class="cu-form-group">
+                <view class="flex align-center">
+                  <view class="title"><text space="ensp">原钱包金额：</text></view>
+                  <input type="number" placeholder="请输入原钱包金额" v-model="model.oldMoney"/>
+                </view>
+              </view>
+              <view class="cu-form-group">
+                <view class="flex align-center">
+                  <view class="title"><text space="ensp">来源用户：</text></view>
+                  <input  placeholder="请输入来源用户" v-model="model.fromId"/>
+                </view>
+              </view>
+              <view class="cu-form-group">
+                <view class="flex align-center">
+                  <view class="title"><text space="ensp">佣金：</text></view>
+                  <input  placeholder="请输入佣金" v-model="model.isCommission"/>
+                </view>
+              </view>
+				<view class="padding">
+					<button class="cu-btn block bg-blue margin-tb-sm lg" @click="onSubmit">
+						<text v-if="loading" class="cuIcon-loading2 cuIconfont-spin"></text>提交
+					</button>
+				</view>
+			</form>
+		</view>
+    </view>
+</template>
+
+<script>
+    import myDate from '@/components/my-componets/my-date.vue'
+
+    export default {
+        name: "AppletWaterForm",
+        components:{ myDate },
+        props:{
+          formData:{
+              type:Object,
+              default:()=>{},
+              required:false
+          }
+        },
+        data(){
+            return {
+				CustomBar: this.CustomBar,
+				NavBarColor: this.NavBarColor,
+				loading:false,
+                model: {},
+                backRouteName:'index',
+                url: {
+                  queryById: "/appletWater/appletWater/queryById",
+                  add: "/appletWater/appletWater/add",
+                  edit: "/appletWater/appletWater/edit",
+                },
+            }
+        },
+        created(){
+             this.initFormData();
+        },
+        methods:{
+           initFormData(){
+               if(this.formData){
+                    let dataId = this.formData.dataId;
+                    this.$http.get(this.url.queryById,{params:{id:dataId}}).then((res)=>{
+                        if(res.data.success){
+                            console.log("表单数据",res);
+                            this.model = res.data.result;
+                        }
+                    })
+                }
+            },
+            onSubmit() {
+                let myForm = {...this.model};
+                this.loading = true;
+                let url = myForm.id?this.url.edit:this.url.add;
+				this.$http.post(url,myForm).then(res=>{
+				   console.log("res",res)
+				   this.loading = false
+				   this.$Router.push({name:this.backRouteName})
+				}).catch(()=>{
+					this.loading = false
+				});
+            }
+        }
+    }
+</script>

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletWater/uniapp/AppletWaterList.vue

@@ -0,0 +1,44 @@
+<template>
+	<view>
+	   <!--标题和返回-->
+		<cu-custom :bgColor="NavBarColor" isBack>
+			<block slot="backText">返回</block>
+			<block slot="content">小程序流水</block>
+		</cu-custom>
+		<!--滚动加载列表-->
+		<mescroll-body ref="mescrollRef" bottom="88"  @init="mescrollInit" :up="upOption" :down="downOption" @down="downCallback" @up="upCallback">
+		    <view class="cu-list menu">
+				<view class="cu-item" v-for="(item,index) in list" :key="index" @click="goHome">
+					<view class="flex" style="width:100%">
+                        <text class="text-lg" style="color: #000;">
+                             {{ item.createBy}}
+                        </text>
+					</view>
+				</view>
+			</view>
+		</mescroll-body>
+	</view>
+</template>
+
+<script>
+	import MescrollMixin from "@/components/mescroll-uni/mescroll-mixins.js";
+	import Mixin from "@/common/mixin/Mixin.js";
+
+	export default {
+		name: '小程序流水',
+		mixins: [MescrollMixin,Mixin],
+		data() {
+			return {
+				CustomBar:this.CustomBar,
+				NavBarColor:this.NavBarColor,
+				url: "/appletWater/appletWater/list",
+			};
+		},
+		methods: {
+			goHome(){
+                this.$Router.push({name: "index"})
+			}
+		}
+	}
+</script>
+

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletWater/uniapp3/AppletWaterData.ts

@@ -0,0 +1,37 @@
+import { render } from '@/common/renderUtils';
+//列表数据
+export const columns = [
+    {
+    title: '用户',
+    align:"center",
+    dataIndex: 'userId'
+   },
+   {
+    title: '订单',
+    align:"center",
+    dataIndex: 'orderId'
+   },
+   {
+    title: '金额',
+    align:"center",
+    dataIndex: 'price'
+   },
+   {
+    title: '原钱包金额',
+    align:"center",
+    dataIndex: 'oldMoney'
+   },
+   {
+    title: '来源用户',
+    align:"center",
+    dataIndex: 'fromId'
+   },
+   {
+    title: '佣金',
+    align:"center",
+    dataIndex: 'isCommission',
+    customRender:({text}) => {
+       return render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}])
+     },
+   },
+];

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletWater/uniapp3/AppletWaterForm.vue

@@ -0,0 +1,281 @@
+<route lang="json5" type="page">
+{
+layout: 'default',
+style: {
+navigationStyle: 'custom',
+navigationBarTitleText: '小程序流水',
+},
+}
+</route>
+<template>
+  <PageLayout :navTitle="navTitle" :backRouteName="backRouteName">
+    <scroll-view class="scrollArea" scroll-y>
+      <view class="form-container">
+        <wd-form ref="form" :model="myFormData">
+          <wd-cell-group border>
+          <view class="{ 'mt-14px': 0 == 0 }">
+              <wd-input
+                  label-width="100px"
+                  v-model="myFormData['userId']"
+                  :label="get4Label('用户')"
+                  name='userId'
+                  prop='userId'
+                  placeholder="请选择用户"
+                  :rules="[
+                  ]"
+                  clearable
+              />
+        </view>
+          <view class="{ 'mt-14px': 1 == 0 }">
+              <wd-input
+                  label-width="100px"
+                  v-model="myFormData['orderId']"
+                  :label="get4Label('订单')"
+                  name='orderId'
+                  prop='orderId'
+                  placeholder="请选择订单"
+                  :rules="[
+                  ]"
+                  clearable
+              />
+        </view>
+          <view class="{ 'mt-14px': 0 == 0 }">
+               <wd-input
+                   label-width="100px"
+                   v-model="myFormData['price']"
+                   :label="get4Label('金额')"
+                   name='price'
+                   prop='price'
+                   placeholder="请选择金额"
+                   inputMode="numeric"
+                   :rules="[
+                   ]"
+                   clearable
+              />
+        </view>
+          <view class="{ 'mt-14px': 1 == 0 }">
+               <wd-input
+                   label-width="100px"
+                   v-model="myFormData['oldMoney']"
+                   :label="get4Label('原钱包金额')"
+                   name='oldMoney'
+                   prop='oldMoney'
+                   placeholder="请选择原钱包金额"
+                   inputMode="numeric"
+                   :rules="[
+                   ]"
+                   clearable
+              />
+        </view>
+          <view class="{ 'mt-14px': 0 == 0 }">
+              <wd-input
+                  label-width="100px"
+                  v-model="myFormData['fromId']"
+                  :label="get4Label('来源用户')"
+                  name='fromId'
+                  prop='fromId'
+                  placeholder="请选择来源用户"
+                  :rules="[
+                  ]"
+                  clearable
+              />
+        </view>
+          <view class="{ 'mt-14px': 1 == 0 }">
+        <!-- 开关 -->
+              <wd-cell
+                :label="get4Label('佣金')"
+                name='isCommission'
+                title-width="100px"
+                center
+              >
+                <wd-switch
+                  :label="get4Label('佣金')"
+                  name='isCommission'
+                  size="18px"
+                  v-model="myFormData['isCommission']"
+                  active-value="Y"
+                  inactive-value="N"
+                />
+             </wd-cell>
+        </view>
+          </wd-cell-group>
+        </wd-form>
+      </view>
+    </scroll-view>
+    <view class="footer">
+      <wd-button :disabled="loading" block :loading="loading" @click="handleSubmit">提交</wd-button>
+    </view>
+  </PageLayout>
+</template>
+
+<script lang="ts" setup>
+import { onLoad } from '@dcloudio/uni-app'
+import { http } from '@/utils/http'
+import { useToast } from 'wot-design-uni'
+import { useRouter } from '@/plugin/uni-mini-router'
+import { ref, onMounted, computed,reactive } from 'vue'
+import OnlineImage from '@/components/online/view/online-image.vue'
+import OnlineFile from '@/components/online/view/online-file.vue'
+import OnlineFileCustom from '@/components/online/view/online-file-custom.vue'
+import OnlineSelect from '@/components/online/view/online-select.vue'
+import OnlineTime from '@/components/online/view/online-time.vue'
+import OnlineDate from '@/components/online/view/online-date.vue'
+import OnlineRadio from '@/components/online/view/online-radio.vue'
+import OnlineCheckbox from '@/components/online/view/online-checkbox.vue'
+import OnlineMulti from '@/components/online/view/online-multi.vue'
+import OnlinePopupLinkRecord from '@/components/online/view/online-popup-link-record.vue'
+import OnlinePca from '@/components/online/view/online-pca.vue'
+import SelectDept from '@/components/SelectDept/SelectDept.vue'
+import SelectUser from '@/components/SelectUser/SelectUser.vue'
+import {duplicateCheck} from "@/service/api";
+defineOptions({
+  name: 'AppletWaterForm',
+  options: {
+    styleIsolation: 'shared',
+  },
+})
+const toast = useToast()
+const router = useRouter()
+const form = ref(null)
+// 定义响应式数据
+const myFormData = reactive({})
+const loading = ref(false)
+const navTitle = ref('新增')
+const dataId = ref('')
+const backRouteName = ref('AppletWaterList')
+// 定义 initForm 方法
+const initForm = (item) => {
+  console.log('initForm item', item)
+  if(item?.dataId){
+    dataId.value = item.dataId;
+    navTitle.value = item.dataId?'编辑':'新增';
+    initData();
+  }
+}
+// 初始化数据
+const initData = () => {
+  http.get("/appletWater/appletWater/queryById",{id:dataId.value}).then((res) => {
+    if (res.success) {
+      let obj = res.result
+      Object.assign(myFormData, { ...obj })
+    }else{
+      toast.error(res?.message || '表单加载失败！')
+    }
+  })
+}
+const handleSuccess = () => {
+  uni.$emit('refreshList');
+  router.back()
+}
+/**
+ * 校验唯一
+ * @param values
+ * @returns {boolean}
+ */
+async function fieldCheck(values: any) {
+   const onlyField = [
+   ];
+   for (const field of onlyField) {
+      if (values[field]) {
+          // 仅校验有值的字段
+          const res: any = await duplicateCheck({
+              tableName: 'applet_water',
+              fieldName: field,  // 使用处理后的字段名
+              fieldVal: values[field],
+              dataId: values.id,
+          });
+          if (!res.success) {
+              toast.warning(res.message);
+              return true;  // 校验失败
+          }
+      }
+   }
+   return false;  // 校验通过
+}
+// 提交表单
+const handleSubmit = async () => {
+ // 判断字段必填和正则
+  if (await fieldCheck(myFormData)) {
+    return
+  }
+  let url = dataId.value?'/appletWater/appletWater/edit':'/appletWater/appletWater/add';
+  form.value
+    .validate()
+    .then(({ valid, errors }) => {
+      if (valid) {
+        loading.value = true;
+        http.post(url,myFormData).then((res) => {
+          loading.value = false;
+          if (res.success) {
+            toast.success('保存成功');
+            handleSuccess()
+          }else{
+            toast.error(res?.message || '表单保存失败！')
+          }
+        })
+      }
+    })
+    .catch((error) => {
+      console.log(error, 'error')
+      loading.value = false;
+    })
+}
+// 标题
+const get4Label = computed(() => {
+  return (label) => {
+    return label && label.length > 4 ? label.substring(0, 4) : label;
+  }
+})
+
+// 标题
+const getFormSchema = computed(() => {
+  return (dictTable,dictCode,dictText) => {
+    return {
+      dictCode,
+      dictTable,
+      dictText
+    };
+  }
+})
+/**
+ * 获取日期控件的扩展类型
+ * @param picker
+ * @returns {string}
+ */
+const getDateExtendType = (picker: string) => {
+    let mapField = {
+      month: 'year-month',
+      year: 'year',
+      quarter: 'quarter',
+      week: 'week',
+      day: 'date',
+    }
+    return picker && mapField[picker]
+      ? mapField[picker]
+      : 'date'
+}
+//设置pop返回值
+const setFieldsValue = (data) => {
+   Object.assign(myFormData, {...data })
+}
+// onLoad 生命周期钩子
+onLoad((option) => {
+  initForm(option)
+})
+</script>
+
+<style lang="scss" scoped>
+.footer {
+  width: 100%;
+  padding: 10px 20px;
+  padding-bottom: calc(constant(safe-area-inset-bottom) + 10px);
+  padding-bottom: calc(env(safe-area-inset-bottom) + 10px);
+}
+:deep(.wd-cell__label) {
+  font-size: 14px;
+  color: #444;
+}
+:deep(.wd-cell__value) {
+  text-align: left;
+}
+</style>

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletWater/uniapp3/AppletWaterList.vue

@@ -0,0 +1,148 @@
+<route lang="json5" type="page">
+{
+layout: 'default',
+style: {
+navigationBarTitleText: '小程序流水',
+navigationStyle: 'custom',
+},
+}
+</route>
+<template>
+  <PageLayout navTitle="小程序流水"  backRouteName="index" routeMethod="pushTab">
+    <view class="wrap">
+      <z-paging
+          ref="paging"
+          :fixed="false"
+          v-model="dataList"
+          @query="queryList"
+          :default-page-size="15"
+      >
+        <template v-for="item in dataList" :key="item.id">
+          <wd-swipe-action>
+            <view class="list" @click="handleEdit(item)">
+              <template v-for="(cItem, cIndex) in columns" :key="cIndex">
+                <view v-if="cIndex < 3" class="box" :style="getBoxStyle">
+                  <view class="field ellipsis">{{ cItem.title }}</view>
+                  <view class="value cu-text-grey">{{ item[cItem.dataIndex] }}</view>
+                </view>
+              </template>
+            </view>
+            <template #right>
+              <view class="action">
+                <view class="button" @click="handleAction('del', item)">删除</view>
+              </view>
+            </template>
+          </wd-swipe-action>
+        </template>
+      </z-paging>
+      <view class="add u-iconfont u-icon-add" @click="handleAdd"></view>
+    </view>
+  </PageLayout>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted, computed } from 'vue'
+import { http } from '@/utils/http'
+import usePageList from '@/hooks/usePageList'
+import {columns} from './AppletWaterData';
+defineOptions({
+  name: 'AppletWaterList',
+  options: {
+    styleIsolation: 'shared',
+  }
+})
+//分页加载配置
+let { toast, router, paging, dataList, queryList } = usePageList('/appletWater/appletWater/list');
+
+//样式
+const getBoxStyle = computed(() => {
+  return { width: "calc(33% - 5px)" }
+})
+
+// 其他操作
+const handleAction = (val, item) => {
+  if (val == 'del') {
+    http.delete("/appletWater/appletWater/delete?id="+item.id,{id:item.id}).then((res) => {
+      toast.success('删除成功~')
+      paging.value.reload()
+    })
+  }
+}
+
+// go 新增页
+const handleAdd = () => {
+  router.push({
+    name: 'AppletWaterForm'
+  })
+}
+
+//go 编辑页
+const handleEdit = (record) => {
+  router.push({
+    name: 'AppletWaterForm',
+    params: {dataId: record.id},
+  })
+}
+
+onMounted(() => {
+  // 监听刷新列表事件
+  uni.$on('refreshList', () => {
+    queryList(1,10)
+  })
+})
+</script>
+
+<style lang="scss" scoped>
+.wrap {
+  height: 100%;
+}
+:deep(.wd-swipe-action) {
+  margin-top: 10px;
+  background-color: #fff;
+}
+.list {
+  padding: 10px 10px;
+  width: 100%;
+  text-align: left;
+  display: flex;
+  justify-content: space-between;
+  .box {
+    width: 33%;
+    .field {
+      margin-bottom: 10px;
+      line-height: 20px;
+    }
+  }
+}
+.action {
+  width: 60px;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  .button {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex: 1;
+    height: 100%;
+    color: #fff;
+    &:first-child {
+      background-color: #fa4350;
+    }
+  }
+}
+.add {
+  height: 70upx;
+  width: 70upx;
+  text-align: center;
+  line-height: 70upx;
+  background-color: #fff;
+  border-radius: 50%;
+  position: fixed;
+  bottom: 80upx;
+  right: 30upx;
+  box-shadow: 0 0 5px 2px rgba(0, 0, 0, 0.1);
+  color: #666;
+}
+</style>

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletWater/vue3/AppletWater.api.ts

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

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletWater/vue3/AppletWater.data.ts

@@ -0,0 +1,105 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+import { getWeekMonthQuarterYear } from '/@/utils';
+//列表数据
+export const columns: BasicColumn[] = [
+   {
+    title: '用户',
+    align:"center",
+    dataIndex: 'userId'
+   },
+   {
+    title: '订单',
+    align:"center",
+    dataIndex: 'orderId'
+   },
+   {
+    title: '金额',
+    align:"center",
+    dataIndex: 'price'
+   },
+   {
+    title: '原钱包金额',
+    align:"center",
+    dataIndex: 'oldMoney'
+   },
+   {
+    title: '来源用户',
+    align:"center",
+    dataIndex: 'fromId'
+   },
+   {
+    title: '佣金',
+    align:"center",
+    dataIndex: 'isCommission',
+    customRender:({text}) => {
+       return  render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}])
+     },
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '用户',
+    field: 'userId',
+    component: 'Input',
+  },
+  {
+    label: '订单',
+    field: 'orderId',
+    component: 'Input',
+  },
+  {
+    label: '金额',
+    field: 'price',
+    component: 'InputNumber',
+  },
+  {
+    label: '原钱包金额',
+    field: 'oldMoney',
+    component: 'InputNumber',
+  },
+  {
+    label: '来源用户',
+    field: 'fromId',
+    component: 'Input',
+  },
+  {
+    label: '佣金',
+    field: 'isCommission',
+     component: 'JSwitch',
+     componentProps:{
+     },
+  },
+	// TODO 主键隐藏字段，目前写死为ID
+	{
+	  label: '',
+	  field: 'id',
+	  component: 'Input',
+	  show: false
+	},
+];
+
+// 高级查询数据
+export const superQuerySchema = {
+  userId: {title: '用户',order: 0,view: 'text', type: 'string',},
+  orderId: {title: '订单',order: 1,view: 'text', type: 'string',},
+  price: {title: '金额',order: 2,view: 'number', type: 'number',},
+  oldMoney: {title: '原钱包金额',order: 3,view: 'number', type: 'number',},
+  fromId: {title: '来源用户',order: 4,view: 'text', type: 'string',},
+  isCommission: {title: '佣金',order: 5,view: 'switch', type: 'string',},
+};
+
+/**
+* 流程表单调用这个方法获取formSchema
+* @param param
+*/
+export function getBpmFormSchema(_formData): FormSchema[]{
+  // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema
+  return formSchema;
+}

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletWater/vue3/AppletWaterList.vue

@@ -0,0 +1,206 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" v-auth="'appletWater:applet_water:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" v-auth="'appletWater:applet_water:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button type="primary" v-auth="'appletWater:applet_water:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+
+          <a-dropdown v-if="selectedRowKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button v-auth="'appletWater:applet_water:deleteBatch'">批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template v-slot:bodyCell="{ column, record, index, text }">
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <AppletWaterModal @register="registerModal" @success="handleSuccess"></AppletWaterModal>
+  </div>
+</template>
+
+<script lang="ts" name="appletWater-appletWater" setup>
+  import {ref, reactive, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import AppletWaterModal from './components/AppletWaterModal.vue'
+  import {columns, searchFormSchema, superQuerySchema} from './AppletWater.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './AppletWater.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import { useUserStore } from '/@/store/modules/user';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { getDateByPicker } from '/@/utils';
+  //日期个性化选择
+  const fieldPickers = reactive({
+  });
+  const queryParam = reactive<any>({});
+  const checkedKeys = ref<Array<string | number>>([]);
+  const userStore = useUserStore();
+  const { createMessage } = useMessage();
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '小程序流水',
+           api: list,
+           columns,
+           canResize:true,
+           formConfig: {
+              //labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToNumber: [
+              ],
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+               fixed:'right'
+            },
+            beforeFetch: (params) => {
+              if (params && fieldPickers) {
+                for (let key in fieldPickers) {
+                  if (params[key]) {
+                    params[key] = getDateByPicker(params[key], fieldPickers[key]);
+                  }
+                }
+              }
+              return Object.assign(params, queryParam);
+            },
+      },
+       exportConfig: {
+            name:"小程序流水",
+            url: getExportUrl,
+            params: queryParam,
+          },
+          importConfig: {
+            url: getImportUrl,
+            success: handleSuccess
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, handleSuccess);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: selectedRowKeys.value}, handleSuccess);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      (selectedRowKeys.value = []) && reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+           auth: 'appletWater:applet_water:edit'
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+       return [
+         {
+           label: '详情',
+           onClick: handleDetail.bind(null, record),
+         }, {
+           label: '删除',
+           popConfirm: {
+             title: '是否确认删除',
+             confirm: handleDelete.bind(null, record),
+             placement: 'topLeft',
+           },
+           auth: 'appletWater:applet_water:delete'
+         }
+       ]
+   }
+
+
+
+
+</script>
+
+<style lang="less" scoped>
+  :deep(.ant-picker),:deep(.ant-input-number){
+    width: 100%;
+  }
+</style>

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletWater/vue3/V20251104_1__menu_insert_AppletWater.sql

@@ -0,0 +1,26 @@
+-- 注意：该页面对应的前台目录为views/appletWater文件夹下
+-- 如果你想更改到其他目录，请修改sql中component字段对应的值
+
+
+INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) 
+VALUES ('2025110405506810160', NULL, '小程序流水', '/appletWater/appletWaterList', 'appletWater/AppletWaterList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2025-11-04 17:50:16', NULL, NULL, 0);
+
+-- 权限控制sql
+-- 新增
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025110405506810161', '2025110405506810160', '添加小程序流水', NULL, NULL, 0, NULL, NULL, 2, 'appletWater:applet_water:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-11-04 17:50:16', NULL, NULL, 0, 0, '1', 0);
+-- 编辑
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025110405506810162', '2025110405506810160', '编辑小程序流水', NULL, NULL, 0, NULL, NULL, 2, 'appletWater:applet_water:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-11-04 17:50:16', NULL, NULL, 0, 0, '1', 0);
+-- 删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025110405506810163', '2025110405506810160', '删除小程序流水', NULL, NULL, 0, NULL, NULL, 2, 'appletWater:applet_water:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-11-04 17:50:16', NULL, NULL, 0, 0, '1', 0);
+-- 批量删除
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025110405506810164', '2025110405506810160', '批量删除小程序流水', NULL, NULL, 0, NULL, NULL, 2, 'appletWater:applet_water:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-11-04 17:50:16', NULL, NULL, 0, 0, '1', 0);
+-- 导出excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025110405506810165', '2025110405506810160', '导出excel_小程序流水', NULL, NULL, 0, NULL, NULL, 2, 'appletWater:applet_water:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-11-04 17:50:16', NULL, NULL, 0, 0, '1', 0);
+-- 导入excel
+INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
+VALUES ('2025110405506810166', '2025110405506810160', '导入excel_小程序流水', NULL, NULL, 0, NULL, NULL, 2, 'appletWater:applet_water:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2025-11-04 17:50:16', NULL, NULL, 0, 0, '1', 0);

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletWater/vue3/components/AppletWaterForm.vue

@@ -0,0 +1,70 @@
+<template>
+    <div style="min-height: 400px">
+        <BasicForm @register="registerForm"></BasicForm>
+        <div style="width: 100%;text-align: center" v-if="!formDisabled">
+            <a-button @click="submitForm" pre-icon="ant-design:check" type="primary">提 交</a-button>
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {computed, defineComponent} from 'vue';
+    import {defHttp} from '/@/utils/http/axios';
+    import { propTypes } from '/@/utils/propTypes';
+    import {getBpmFormSchema} from '../AppletWater.data';
+    import {saveOrUpdate} from '../AppletWater.api';
+    
+    export default defineComponent({
+        name: "AppletWaterForm",
+        components:{
+            BasicForm
+        },
+        props:{
+            formData: propTypes.object.def({}),
+            formBpm: propTypes.bool.def(true),
+        },
+        setup(props){
+            const [registerForm, { setFieldsValue, setProps, getFieldsValue }] = useForm({
+                labelWidth: 150,
+                schemas: getBpmFormSchema(props.formData),
+                showActionButtonGroup: false,
+                baseColProps: {span: 24}
+            });
+
+            const formDisabled = computed(()=>{
+                if(props.formData.disabled === false){
+                    return false;
+                }
+                return true;
+            });
+
+            let formData = {};
+            const queryByIdUrl = '/appletWater/appletWater/queryById';
+            async function initFormData(){
+                let params = {id: props.formData.dataId};
+                const data = await defHttp.get({url: queryByIdUrl, params});
+                formData = {...data}
+                //设置表单的值
+                await setFieldsValue(formData);
+                //默认是禁用
+                await setProps({disabled: formDisabled.value})
+            }
+
+            async function submitForm() {
+                let data = getFieldsValue();
+                let params = Object.assign({}, formData, data);
+                console.log('表单数据', params)
+                await saveOrUpdate(params, true)
+            }
+
+            initFormData();
+            
+            return {
+                registerForm,
+                formDisabled,
+                submitForm,
+            }
+        }
+    });
+</script>

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletWater/vue3/components/AppletWaterModal.vue

@@ -0,0 +1,99 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="800" @ok="handleSubmit">
+      <BasicForm @register="registerForm" name="AppletWaterForm" />
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref, reactive} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../AppletWater.data';
+    import {saveOrUpdate} from '../AppletWater.api';
+    import { useMessage } from '/@/hooks/web/useMessage';
+    import { getDateByPicker } from '/@/utils';
+    const { createMessage } = useMessage();
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    const isDetail = ref(false);
+    //表单配置
+    const [registerForm, { setProps,resetFields, setFieldsValue, validate, scrollToField }] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+        baseColProps: {span: 24}
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        isDetail.value = !!data?.showFooter;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //日期个性化选择
+    const fieldPickers = reactive({
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : !unref(isDetail) ? '详情' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            // 预处理日期数据
+            changeDateValue(values);
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } catch ({ errorFields }) {
+           if (errorFields) {
+             const firstField = errorFields[0];
+             if (firstField) {
+               scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+             }
+           }
+           return Promise.reject(errorFields);
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+
+    /**
+     * 处理日期值
+     * @param formData 表单数据
+     */
+    const changeDateValue = (formData) => {
+        if (formData && fieldPickers) {
+            for (let key in fieldPickers) {
+                if (formData[key]) {
+                    formData[key] = getDateByPicker(formData[key], fieldPickers[key]);
+                }
+            }
+        }
+    };
+
+</script>
+
+<style lang="less" scoped>
+	/** 时间和数字输入框样式 */
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+
+  :deep(.ant-calendar-picker) {
+    width: 100%;
+  }
+</style>

jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletproductspectype/controller/AppletproductspectypeController.java

@@ -9,6 +9,8 @@ import java.util.stream.Collectors;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.util.HashSet;
+import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
@@ -90,13 +92,36 @@ public class AppletproductspectypeController extends JeecgController<Appletprodu
 	 */
 	@AutoLog(value = "小程序产品规格类型-添加")
 	@Operation(summary="小程序产品规格类型-添加")
-	@RequiresPermissions("appletproductspectype:appletproductspectype:add")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody Appletproductspectype appletproductspectype) {
-		appletproductspectypeService.save(appletproductspectype);
+//	@RequiresPermissions("appletproductspectype:appletproductspectype:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody Appletproductspectype appletproductspectype) {
+        // 参数校验：产品ID、类型必填；并约束二级分类的父子关系
+        if (oConvertUtils.isEmpty(appletproductspectype.getProductId()) || oConvertUtils.isEmpty(appletproductspectype.getType())) {
+            return Result.error("缺少产品ID或类型");
+        }
 
-		return Result.OK("添加成功！");
-	}
+        // type=0 -> 规格类型，父ID强制为"0"
+        if ("0".equals(appletproductspectype.getType())) {
+            appletproductspectype.setPid("0");
+        }
+
+        // type=1 -> 规格项，必须有有效的父规格类型（同一产品）
+        if ("1".equals(appletproductspectype.getType())) {
+            String pid = appletproductspectype.getPid();
+            if (oConvertUtils.isEmpty(pid)) {
+                return Result.error("规格项必须关联父规格类型");
+            }
+            QueryWrapper<Appletproductspectype> parentQuery = new QueryWrapper<>();
+            parentQuery.eq("id", pid).eq("product_id", appletproductspectype.getProductId()).eq("type", "0");
+            Appletproductspectype parentType = appletproductspectypeService.getOne(parentQuery);
+            if (parentType == null) {
+                return Result.error("父规格类型不存在或不匹配该产品");
+            }
+        }
+
+        appletproductspectypeService.save(appletproductspectype);
+        return Result.OK("添加成功！");
+    }
 	
 	/**
 	 *  编辑
@@ -106,12 +131,48 @@ public class AppletproductspectypeController extends JeecgController<Appletprodu
 	 */
 	@AutoLog(value = "小程序产品规格类型-编辑")
 	@Operation(summary="小程序产品规格类型-编辑")
-	@RequiresPermissions("appletproductspectype:appletproductspectype:edit")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody Appletproductspectype appletproductspectype) {
-		appletproductspectypeService.updateById(appletproductspectype);
-		return Result.OK("编辑成功!");
-	}
+//	@RequiresPermissions("appletproductspectype:appletproductspectype:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+    public Result<String> edit(@RequestBody Appletproductspectype appletproductspectype) {
+        if (oConvertUtils.isEmpty(appletproductspectype.getId())) {
+            return Result.error("缺少ID");
+        }
+        if (oConvertUtils.isEmpty(appletproductspectype.getProductId()) || oConvertUtils.isEmpty(appletproductspectype.getType())) {
+            return Result.error("缺少产品ID或类型");
+        }
+
+        // 获取旧的规格类型或规格项信息
+        Appletproductspectype oldEntity = appletproductspectypeService.getById(appletproductspectype.getId());
+        if (oldEntity == null) {
+            return Result.error("未找到对应数据");
+        }
+
+        // 如果名称发生变化，需要检查是否关联了上架的规格实体
+        if (!oldEntity.getTitle().equals(appletproductspectype.getTitle())) {
+            if (appletProductSpecService.hasOnShelfAssociatedSpecs(appletproductspectype.getProductId(), oldEntity.getTitle())) {
+                return Result.error("该规格类型或规格项已关联上架的规格实体，无法修改名称！");
+            }
+        }
+
+        // 约束父子关系
+        if ("0".equals(appletproductspectype.getType())) {
+            appletproductspectype.setPid("0");
+        } else if ("1".equals(appletproductspectype.getType())) {
+            String pid = appletproductspectype.getPid();
+            if (oConvertUtils.isEmpty(pid)) {
+                return Result.error("规格项必须关联父规格类型");
+            }
+            QueryWrapper<Appletproductspectype> parentQuery = new QueryWrapper<>();
+            parentQuery.eq("id", pid).eq("product_id", appletproductspectype.getProductId()).eq("type", "0");
+            Appletproductspectype parentType = appletproductspectypeService.getOne(parentQuery);
+            if (parentType == null) {
+                return Result.error("父规格类型不存在或不匹配该产品");
+            }
+        }
+
+        appletproductspectypeService.updateById(appletproductspectype);
+        return Result.OK("编辑成功!");
+    }
 	
 	/**
 	 *   通过id删除
@@ -121,12 +182,38 @@ public class AppletproductspectypeController extends JeecgController<Appletprodu
 	 */
 	@AutoLog(value = "小程序产品规格类型-通过id删除")
 	@Operation(summary="小程序产品规格类型-通过id删除")
-	@RequiresPermissions("appletproductspectype:appletproductspectype:delete")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		appletproductspectypeService.removeById(id);
-		return Result.OK("删除成功!");
-	}
+//	@RequiresPermissions("appletproductspectype:appletproductspectype:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+        Appletproductspectype entity = appletproductspectypeService.getById(id);
+        if (entity == null) {
+            return Result.error("未找到对应数据");
+        }
+
+        // 获取产品ID
+        String productId = entity.getProductId();
+
+        // 检查是否有上架的规格实体关联
+        if (appletProductSpecService.hasOnShelfAssociatedSpecs(productId, entity.getTitle())) {
+            return Result.error("该规格类型或规格项已关联上架的规格实体，无法删除！");
+        }
+
+        if ("0".equals(entity.getType())) {
+            // 如果是规格类型，需要检查其下的所有规格项
+            QueryWrapper<Appletproductspectype> childQuery = new QueryWrapper<>();
+            childQuery.eq("pid", id);
+            List<Appletproductspectype> childItems = appletproductspectypeService.list(childQuery);
+            for (Appletproductspectype item : childItems) {
+                if (appletProductSpecService.hasOnShelfAssociatedSpecs(productId, item.getTitle())) {
+                    return Result.error("该规格类型下的规格项 \"" + item.getTitle() + "\" 已关联上架的规格实体，无法删除！");
+                }
+            }
+            // 删除子规格项
+            appletproductspectypeService.remove(childQuery);
+        }
+        appletproductspectypeService.removeById(id);
+        return Result.OK("删除成功!");
+    }
 	
 	/**
 	 *  批量删除
@@ -136,12 +223,22 @@ public class AppletproductspectypeController extends JeecgController<Appletprodu
 	 */
 	@AutoLog(value = "小程序产品规格类型-批量删除")
 	@Operation(summary="小程序产品规格类型-批量删除")
-	@RequiresPermissions("appletproductspectype:appletproductspectype:deleteBatch")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.appletproductspectypeService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
+//	@RequiresPermissions("appletproductspectype:appletproductspectype:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+        List<String> idList = Arrays.asList(ids.split(","));
+        // 批量级联删除：先处理各自子项，再删除本体
+        for (String id : idList) {
+            Appletproductspectype entity = appletproductspectypeService.getById(id);
+            if (entity != null && "0".equals(entity.getType())) {
+                QueryWrapper<Appletproductspectype> childQuery = new QueryWrapper<>();
+                childQuery.eq("pid", id);
+                appletproductspectypeService.remove(childQuery);
+            }
+        }
+        this.appletproductspectypeService.removeByIds(idList);
+        return Result.OK("批量删除成功!");
+    }
 	
 	/**
 	 * 通过id查询
@@ -203,17 +300,29 @@ public class AppletproductspectypeController extends JeecgController<Appletprodu
 	 * @return
 	 */
 	@Operation(summary="生成规格实体")
-	@PostMapping(value = "/generateSpecs")
-	public Result<String> generateSpecs(@RequestParam(name="productId",required=true) String productId) {
-		try {
-			// 查询该产品的所有规格类型和规格项
-			QueryWrapper<Appletproductspectype> queryWrapper = new QueryWrapper<>();
-			queryWrapper.eq("product_id", productId);
-			queryWrapper.orderByAsc("type", "create_time");
-			
+    @PostMapping(value = "/generateSpecs")
+    public Result<String> generateSpecs(String productId) {
+        try {
+            // 查询该产品的所有规格类型和规格项
+            QueryWrapper<Appletproductspectype> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("product_id", productId);
+            queryWrapper.orderByAsc("type", "create_time");
+
 			List<Appletproductspectype> allSpecs = appletproductspectypeService.list(queryWrapper);
-			
-			// 分离规格类型和规格项
+
+			// 获取所有已存在的规格名称，用于后续快速判断
+            List<String> existingSpecNamesList = appletProductSpecService.getExistingSpecNames(productId);
+            Set<String> existingSpecNames = new HashSet<>(existingSpecNamesList);
+
+            // 获取所有已存在的规格实体，用于后续清理
+            QueryWrapper<AppletProductSpec> allExistingSpecsQuery = new QueryWrapper<>();
+            allExistingSpecsQuery.eq("product_id", productId);
+            List<AppletProductSpec> allExistingSpecs = appletProductSpecService.list(allExistingSpecsQuery);
+
+            // 用于存储新生成的规格名称，以便与现有规格进行比较
+            Set<String> newGeneratedSpecNames = new HashSet<>();
+
+            // 分离规格类型和规格项
 			List<Appletproductspectype> specTypes = allSpecs.stream()
 					.filter(spec -> "0".equals(spec.getType()))
 					.collect(Collectors.toList());
@@ -240,9 +349,10 @@ public class AppletproductspectypeController extends JeecgController<Appletprodu
 				String specName = combination.stream()
 						.map(Appletproductspectype::getTitle)
 						.collect(Collectors.joining(","));
+				newGeneratedSpecNames.add(specName); // 添加到新生成的规格名称集合中
 				
 				// 检查规格名称是否已存在
-				if (appletProductSpecService.checkSpecNameExists(productId, specName, null)) {
+				if (existingSpecNames.contains(specName)) {
 					log.warn("规格名称已存在，跳过创建: {}", specName);
 					continue;
 				}
@@ -263,13 +373,105 @@ public class AppletproductspectypeController extends JeecgController<Appletprodu
 				appletProductSpecService.save(spec);
 				generatedCount++;
 			}
-			
-			return Result.OK("成功生成 " + generatedCount + " 个规格组合，请在产品规格管理中完善价格、库存等信息");
+
+			// 清理不再在规格组合范围内且未上架的实体
+			int deletedCount = 0;
+			for (AppletProductSpec existingSpec : allExistingSpecs) {
+				if (!newGeneratedSpecNames.contains(existingSpec.getSpecName()) && "N".equals(existingSpec.getPutaway())) {
+					appletProductSpecService.removeById(existingSpec.getId());
+					deletedCount++;
+				}
+			}
+
+			return Result.OK("成功生成 " + generatedCount + " 个规格组合，清理 " + deletedCount + " 个废弃规格实体，请在产品规格管理中完善价格、库存等信息");
 		} catch (Exception e) {
 			log.error("生成规格实体失败", e);
 			return Result.error("生成失败：" + e.getMessage());
 		}
 	}
+
+	/**
+	 * 添加规格实体
+	 *
+	 * 不使用@RequestBody，直接接收表单/查询参数
+	 * @param spec 规格实体
+	 * @return 操作结果
+	 */
+	@Operation(summary="添加规格实体")
+	@PostMapping(value = "/spec/add")
+	public Result<String> addSpec(AppletProductSpec spec) {
+		if (oConvertUtils.isEmpty(spec.getProductId()) || oConvertUtils.isEmpty(spec.getSpecName())) {
+			return Result.error("缺少产品ID或规格名称");
+		}
+		// 规格名称唯一性校验（同一产品下）
+		if (appletProductSpecService.checkSpecNameExists(spec.getProductId(), spec.getSpecName(), null)) {
+			return Result.error("规格名称已存在");
+		}
+		// 默认值兜底
+		if (spec.getPutaway() == null) {
+			spec.setPutaway("N");
+		}
+		if (spec.getInventory() == null) {
+			spec.setInventory(0);
+		}
+		if (spec.getPrice() == null) {
+			spec.setPrice(new java.math.BigDecimal("0.00"));
+		}
+		if (spec.getSortOrder() == null) {
+			spec.setSortOrder(0);
+		}
+		appletProductSpecService.save(spec);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 * 编辑规格实体
+	 *
+	 * 不使用@RequestBody，直接接收表单/查询参数
+	 * @param spec 规格实体
+	 * @return 操作结果
+	 */
+	@Operation(summary="编辑规格实体")
+	@RequestMapping(value = "/spec/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+	public Result<String> editSpec(AppletProductSpec spec) {
+		if (oConvertUtils.isEmpty(spec.getId())) {
+			return Result.error("缺少ID");
+		}
+		if (oConvertUtils.isEmpty(spec.getProductId()) || oConvertUtils.isEmpty(spec.getSpecName())) {
+			return Result.error("缺少产品ID或规格名称");
+		}
+		// 规格名称唯一性校验（排除自身ID）
+		if (appletProductSpecService.checkSpecNameExists(spec.getProductId(), spec.getSpecName(), spec.getId())) {
+			return Result.error("规格名称已存在");
+		}
+		appletProductSpecService.updateById(spec);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 * 删除规格实体
+	 * @param id 规格实体ID
+	 * @return 操作结果
+	 */
+	@Operation(summary="删除规格实体")
+	@DeleteMapping(value = "/spec/delete")
+	public Result<String> deleteSpec(@RequestParam(name = "id", required = true) String id) {
+		appletProductSpecService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 * 批量删除规格实体
+	 * @param ids 逗号分隔的ID集合
+	 * @return 操作结果
+	 */
+	@Operation(summary="批量删除规格实体")
+	@DeleteMapping(value = "/spec/deleteBatch")
+	public Result<String> deleteBatchSpec(@RequestParam(name = "ids", required = true) String ids) {
+		List<String> idList = Arrays.asList(ids.split(","));
+		appletProductSpecService.removeBatchByIds(idList);
+		return Result.OK("批量删除成功!");
+	}
 	
 	/**
 	 * 生成规格组合

jeecgboot-vue3/src/views/applet/product/AppletProduct.api.ts

@@ -5,8 +5,8 @@ const { createConfirm } = useMessage();
 
 enum Api {
   list = '/appletProduct/appletProduct/list',
-  save='/appletProduct/appletProduct/add',
-  edit='/appletProduct/appletProduct/edit',
+  save = '/appletProduct/appletProduct/add',
+  edit = '/appletProduct/appletProduct/edit',
   deleteOne = '/appletProduct/appletProduct/delete',
   deleteBatch = '/appletProduct/appletProduct/deleteBatch',
   importExcel = '/appletProduct/appletProduct/importExcel',

jeecgboot-vue3/src/views/applet/product/AppletProductSpecConfig.api.ts

@@ -16,6 +16,11 @@ enum Api {
   queryByProductId = '/appletproductspectype/appletproductspectype/queryByProductId',
   // 生成规格实体
   generateSpecs = '/appletproductspectype/appletproductspectype/generateSpecs',
+  // 规格实体管理
+  addSpec = '/appletproductspectype/appletproductspectype/spec/add',
+  editSpec = '/appletproductspectype/appletproductspectype/spec/edit',
+  deleteSpec = '/appletproductspectype/appletproductspectype/spec/delete',
+  deleteSpecBatch = '/appletproductspectype/appletproductspectype/spec/deleteBatch',
 }
 
 /**
@@ -72,6 +77,14 @@ export const saveOrUpdate = (params, isUpdate) => {
   return defHttp.post({url: url, params}, {isTransformResponse: false});
 }
 
+/**
+ * 保存或更新规格实体（避免@RequestBody，参数拼接到URL）
+ */
+export const saveOrUpdateSpecEntity = (params, isUpdate) => {
+  const url = isUpdate ? Api.editSpec : Api.addSpec;
+  return defHttp.post({ url, params }, { joinParamsToUrl: true });
+}
+
 /**
  * 根据ID查询
  */
@@ -91,4 +104,31 @@ export const queryByProductId = (params) => {
  */
 export const generateSpecs = (params) => {
   return defHttp.post({url: Api.generateSpecs, params});
+}
+
+/**
+ * 删除规格实体
+ */
+export const deleteSpecEntity = (params, handleSuccess) => {
+  return defHttp.delete({ url: Api.deleteSpec, params }, { joinParamsToUrl: true }).then(() => {
+    handleSuccess && handleSuccess();
+  });
+}
+
+/**
+ * 批量删除规格实体
+ */
+export const batchDeleteSpecEntity = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({ url: Api.deleteSpecBatch, params }, { joinParamsToUrl: true }).then(() => {
+        handleSuccess && handleSuccess();
+      });
+    }
+  });
 }

jeecgboot-vue3/src/views/applet/product/AppletProductSpecConfig.data.ts

@@ -166,10 +166,16 @@ export const specEntityFormSchema: FormSchema[] = [
   {
     label: '规格名称',
     field: 'specName',
-    component: 'Input',
+    component: 'Select',
     required: true,
     componentProps: {
-      disabled: true,
+      options: [],
+      showSearch: true,
+      placeholder: '请选择规格名称',
+      allowClear: false,
+      filterOption: (input: string, option: any) => {
+        return (option?.label ?? '').toLowerCase().includes((input || '').toLowerCase());
+      },
     },
   },
   {

jeecgboot-vue3/src/views/applet/product/AppletProductSpecConfig.vue

@@ -40,7 +40,7 @@
                 </div>
                 
                 <!-- 规格项列表 -->
-                <div v-if="selectedSpecType?.id === specType.id" class="spec-items">
+                <div class="spec-items">
                   <div class="spec-items-header">
                     <span>规格项</span>
                     <a-button type="link" size="small" @click="handleAddSpecItem(specType)">
@@ -48,6 +48,14 @@
                       添加规格项
                     </a-button>
                   </div>
+                  <!-- 当该规格类型暂无规格项时的提示 -->
+                  <a-alert
+                    v-if="getSpecItems(specType.id).length === 0"
+                    type="warning"
+                    show-icon
+                    message="该规格类型暂无规格项"
+                    description="请点击“添加规格项”按钮"
+                  />
                   <div 
                     v-for="item in getSpecItems(specType.id)" 
                     :key="item.id"
@@ -67,14 +75,14 @@
               </div>
             </div>
             
-            <!-- 生成规格实体按钮 -->
-            <div class="generate-section" v-if="specTypes.length > 0">
+            <!-- 生成规格实体按钮（按需求禁用，改为在规格项变更时自动生成） -->
+            <!-- <div class="generate-section" v-if="specTypes.length > 0">
               <a-button type="primary" @click="handleGenerateSpecs" :loading="generateLoading">
                 <Icon icon="ant-design:thunderbolt-outlined" />
                 生成规格实体
               </a-button>
               <p class="generate-tip">根据规格类型和规格项自动生成规格实体</p>
-            </div>
+            </div> -->
           </div>
         </a-card>
       </div>
@@ -84,9 +92,10 @@
         <a-card title="规格实体管理" size="small" class="spec-card">
           <BasicTable @register="registerTable" :rowSelection="rowSelection">
             <template #tableTitle>
-              <a-button type="primary" @click="handleAddSpecEntity" preIcon="ant-design:plus-outlined">
+              <!-- 新增规格实体按钮按需求禁用 -->
+              <!-- <a-button type="primary" @click="handleAddSpecEntity" preIcon="ant-design:plus-outlined">
                 新增规格实体
-              </a-button>
+              </a-button> -->
               <a-dropdown v-if="selectedRowKeys.length > 0">
                 <template #overlay>
                   <a-menu>
@@ -128,7 +137,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, reactive, onMounted, computed } from 'vue';
+  import { ref, reactive, onMounted, computed, nextTick } from 'vue';
   import { useRoute, useRouter } from 'vue-router';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { BasicModal, useModal } from '/@/components/Modal';
@@ -148,14 +157,28 @@
     deleteOne, 
     batchDelete, 
     queryByProductId,
-    generateSpecs 
+    generateSpecs,
+    saveOrUpdateSpecEntity,
+    deleteSpecEntity,
+    batchDeleteSpecEntity 
   } from './AppletProductSpecConfig.api';
-  import { queryAppletProductSpecByMainId } from './AppletProduct.api';
+  import { appletProductSpecList } from './AppletProduct.api';
+  import { defHttp } from '/@/utils/http/axios';
 
   const route = useRoute();
   const router = useRouter();
   const { createMessage, createConfirm } = useMessage();
 
+  // 提交前移除为 undefined 的字段，避免传递 "undefined" 给后端
+  const omitUndefined = (obj: Record<string, any>) => {
+    const cleaned: Record<string, any> = {};
+    Object.keys(obj || {}).forEach((key) => {
+      const val = obj[key];
+      if (val !== undefined) cleaned[key] = val;
+    });
+    return cleaned;
+  };
+
   // 产品信息
   const productInfo = ref<any>({});
   const productId = ref<string>('');
@@ -169,9 +192,10 @@
   // 表格相关
   const [registerTable, { reload, getSelectRows }] = useTable({
     title: '规格实体列表',
-    api: queryAppletProductSpecByMainId,
+    api: (params) => defHttp.get({ url: appletProductSpecList, params }),
     columns: specEntityColumns,
     canResize: true,
+    pagination: false,
     actionColumn: {
       width: 120,
       title: '操作',
@@ -206,7 +230,7 @@
     showActionButtonGroup: false,
   });
 
-  const [registerSpecEntityForm, { resetFields: resetSpecEntityFields, setFieldsValue: setSpecEntityValues, validate: validateSpecEntity }] = useForm({
+  const [registerSpecEntityForm, { resetFields: resetSpecEntityFields, setFieldsValue: setSpecEntityValues, validate: validateSpecEntity, updateSchema: updateSpecEntitySchema }] = useForm({
     labelWidth: 100,
     schemas: specEntityFormSchema,
     showActionButtonGroup: false,
@@ -216,12 +240,92 @@
   const currentSpecType = ref<any>(null);
   const currentSpecItem = ref<any>(null);
   const currentSpecEntity = ref<any>(null);
+  // 记录新增/编辑规格项的父规格类型ID，确保提交时关联父ID
+  const currentSpecItemParentId = ref<string>('');
 
   // 获取指定规格类型下的规格项
   const getSpecItems = (specTypeId: string) => {
     return specItems.value.filter(item => item.pid === specTypeId);
   };
 
+  // 生成规格名称选项（参考后端生成组合逻辑：按规格类型顺序，每类选一个规格项，名称为项title用英文逗号拼接）
+  const computeSpecNameOptions = (): Array<{ label: string; value: string }> => {
+    // 按父规格类型分组规格项
+    const itemsByType: Record<string, any[]> = {};
+    for (const item of specItems.value) {
+      const pid = item.pid;
+      if (!itemsByType[pid]) itemsByType[pid] = [];
+      itemsByType[pid].push(item);
+    }
+
+    const result: Array<{ label: string; value: string }> = [];
+    const currentCombo: any[] = [];
+
+    const dfs = (index: number) => {
+      if (index >= specTypes.value.length) {
+        const name = currentCombo.map((i) => i.title).join(',');
+        result.push({ label: name, value: name });
+        return;
+      }
+      const type = specTypes.value[index];
+      const items = itemsByType[type.id] || [];
+      for (const it of items) {
+        currentCombo.push(it);
+        dfs(index + 1);
+        currentCombo.pop();
+      }
+    };
+
+    // 若存在任一规格类型没有规格项，则无可选组合
+    const hasEmpty = specTypes.value.some((t) => (itemsByType[t.id] || []).length === 0);
+    if (specTypes.value.length === 0 || hasEmpty) return [];
+
+    dfs(0);
+    // 去重（防御性处理）
+    const seen = new Set<string>();
+    return result.filter((opt) => {
+      if (seen.has(opt.value)) return false;
+      seen.add(opt.value);
+      return true;
+    });
+  };
+
+  // 查询已使用的规格名称（当前产品），用于过滤下拉框
+  const fetchUsedSpecNames = async (): Promise<Set<string>> => {
+    try {
+      const rows = await defHttp.get({ url: appletProductSpecList, params: { id: productId.value } });
+      const list = Array.isArray(rows) ? rows : (rows || []);
+      const used = new Set<string>();
+      for (const r of list) {
+        if (r && typeof r.specName === 'string') used.add(r.specName);
+      }
+      return used;
+    } catch (e) {
+      console.warn('获取已使用规格名称失败：', e);
+      return new Set<string>();
+    }
+  };
+
+  // 刷新规格名称选择项：生成所有组合 -> 过滤掉已使用的（保留当前编辑值）-> 注入到表单schema
+  const refreshSpecNameOptions = async () => {
+    const allOptions = computeSpecNameOptions();
+    const used = await fetchUsedSpecNames();
+    const currentName = currentSpecEntity.value?.specName || '';
+
+    let filtered = allOptions.filter((opt) => !used.has(opt.value) || opt.value === currentName);
+    // 若当前编辑值不在组合中（历史数据），也需要保留选项以便显示
+    if (currentName && !filtered.some((opt) => opt.value === currentName)) {
+      filtered = [{ label: currentName, value: currentName }, ...filtered];
+    }
+
+    updateSpecEntitySchema({
+      field: 'specName',
+      componentProps: {
+        options: filtered,
+      },
+    });
+  };
+
   // 初始化数据
   onMounted(() => {
     productId.value = route.query.productId as string;
@@ -247,10 +351,10 @@
   const loadSpecData = async () => {
     try {
       const result = await queryByProductId({ productId: productId.value });
+      // 接口返回的是 {specTypes:[], specItems:[]} 结构，直接赋值回显
       if (result) {
-        const allSpecs = result || [];
-        specTypes.value = allSpecs.filter(item => item.type === '0');
-        specItems.value = allSpecs.filter(item => item.type === '1');
+        specTypes.value = Array.isArray(result.specTypes) ? result.specTypes : [];
+        specItems.value = Array.isArray(result.specItems) ? result.specItems : [];
       }
     } catch (error) {
       console.error('加载规格数据失败:', error);
@@ -259,30 +363,31 @@
 
   // 选择规格类型
   const selectSpecType = (specType: any) => {
-    selectedSpecType.value = selectedSpecType.value?.id === specType.id ? null : specType;
+    // 保持所有规格类型与规格项同时展开，点击仅用于高亮当前规格类型
+    selectedSpecType.value = specType;
   };
 
   // 添加规格类型
   const handleAddSpecType = () => {
     currentSpecType.value = null;
-    resetSpecTypeFields();
-    setSpecTypeValues({
-      productId: productId.value,
-      type: '0',
-      pid: '0'
-    });
-    openSpecTypeModal(true, {
-      title: '添加规格类型'
+    openSpecTypeModal(true, { title: '添加规格类型' });
+    nextTick(() => {
+      resetSpecTypeFields();
+      setSpecTypeValues({
+        productId: productId.value,
+        type: '0',
+        pid: '0',
+      });
     });
   };
 
   // 编辑规格类型
   const handleEditSpecType = (record: any) => {
     currentSpecType.value = record;
-    resetSpecTypeFields();
-    setSpecTypeValues(record);
-    openSpecTypeModal(true, {
-      title: '编辑规格类型'
+    openSpecTypeModal(true, { title: '编辑规格类型' });
+    nextTick(() => {
+      resetSpecTypeFields();
+      setSpecTypeValues(record);
     });
   };
 
@@ -309,6 +414,8 @@
   const handleSpecTypeSubmit = async () => {
     try {
       const values = await validateSpecType();
+      // 提交时确保携带产品ID
+      values.productId = productId.value;
       const isUpdate = !!currentSpecType.value;
       if (isUpdate) {
         values.id = currentSpecType.value.id;
@@ -317,7 +424,9 @@
       await saveOrUpdate(values, isUpdate);
       createMessage.success(isUpdate ? '更新成功' : '添加成功');
       closeSpecTypeModal();
+      // 新增/编辑规格类型后刷新页面数据（左侧+右侧表格）
       loadSpecData();
+      reload();
     } catch (error) {
       createMessage.error('操作失败');
     }
@@ -326,24 +435,26 @@
   // 添加规格项
   const handleAddSpecItem = (specType: any) => {
     currentSpecItem.value = null;
-    resetSpecItemFields();
-    setSpecItemValues({
-      productId: productId.value,
-      type: '1',
-      pid: specType.id
-    });
-    openSpecItemModal(true, {
-      title: `添加规格项 - ${specType.title}`
+    currentSpecItemParentId.value = specType.id;
+    openSpecItemModal(true, { title: `添加规格项 - ${specType.title}` });
+    nextTick(() => {
+      resetSpecItemFields();
+      setSpecItemValues({
+        productId: productId.value,
+        type: '1',
+        pid: specType.id
+      });
     });
   };
 
   // 编辑规格项
   const handleEditSpecItem = (record: any) => {
     currentSpecItem.value = record;
-    resetSpecItemFields();
-    setSpecItemValues(record);
-    openSpecItemModal(true, {
-      title: '编辑规格项'
+    currentSpecItemParentId.value = record?.pid || '';
+    openSpecItemModal(true, { title: '编辑规格项' });
+    nextTick(() => {
+      resetSpecItemFields();
+      setSpecItemValues(record);
     });
   };
 
@@ -355,9 +466,19 @@
       content: '确认删除该规格项吗？',
       onOk: async () => {
         try {
-          await deleteOne({ id: record.id }, () => {
+          await deleteOne({ id: record.id }, async () => {
             createMessage.success('删除成功');
-            loadSpecData();
+            await loadSpecData();
+            try {
+              generateLoading.value = true;
+              await generateSpecs({ productId: productId.value });
+              createMessage.success('已自动生成规格实体');
+            } catch (e) {
+              console.warn('自动生成规格实体失败:', e);
+            } finally {
+              generateLoading.value = false;
+              reload();
+            }
           });
         } catch (error) {
           createMessage.error('删除失败');
@@ -370,15 +491,39 @@
   const handleSpecItemSubmit = async () => {
     try {
       const values = await validateSpecItem();
+      // 提交时确保携带产品ID
+      values.productId = productId.value;
       const isUpdate = !!currentSpecItem.value;
       if (isUpdate) {
         values.id = currentSpecItem.value.id;
+      } else {
+        // 新增规格项时强制关联父规格类型ID
+        if (!values.pid) {
+          values.pid = currentSpecItemParentId.value;
+        }
+        if (!values.pid) {
+          createMessage.error('缺少父规格类型ID，请在对应规格类型下添加规格项');
+          return;
+        }
+        // 类型强制为规格项
+        values.type = '1';
       }
       
       await saveOrUpdate(values, isUpdate);
       createMessage.success(isUpdate ? '更新成功' : '添加成功');
       closeSpecItemModal();
-      loadSpecData();
+      // 新增/编辑规格项后刷新页面数据，并自动生成规格实体
+      await loadSpecData();
+      try {
+        generateLoading.value = true;
+        await generateSpecs({ productId: productId.value });
+        createMessage.success('已自动生成规格实体');
+      } catch (e) {
+        console.warn('自动生成规格实体失败:', e);
+      } finally {
+        generateLoading.value = false;
+        reload();
+      }
     } catch (error) {
       createMessage.error('操作失败');
     }
@@ -424,24 +569,26 @@
   // 添加规格实体
   const handleAddSpecEntity = () => {
     currentSpecEntity.value = null;
-    resetSpecEntityFields();
-    setSpecEntityValues({
-      productId: productId.value,
-      putaway: 'N',
-      sortOrder: 0
-    });
-    openSpecEntityModal(true, {
-      title: '添加规格实体'
+    openSpecEntityModal(true, { title: '添加规格实体' });
+    nextTick(async () => {
+      await refreshSpecNameOptions();
+      resetSpecEntityFields();
+      setSpecEntityValues({
+        productId: productId.value,
+        putaway: 'N',
+        sortOrder: 0
+      });
     });
   };
 
   // 编辑规格实体
   const handleEditSpecEntity = (record: any) => {
     currentSpecEntity.value = record;
-    resetSpecEntityFields();
-    setSpecEntityValues(record);
-    openSpecEntityModal(true, {
-      title: '编辑规格实体'
+    openSpecEntityModal(true, { title: '编辑规格实体' });
+    nextTick(async () => {
+      await refreshSpecNameOptions();
+      resetSpecEntityFields();
+      setSpecEntityValues(record);
     });
   };
 
@@ -453,7 +600,7 @@
       content: '确认删除该规格实体吗？',
       onOk: async () => {
         try {
-          await deleteOne({ id: record.id }, () => {
+          await deleteSpecEntity({ id: record.id }, () => {
             createMessage.success('删除成功');
             reload();
           });
@@ -468,12 +615,16 @@
   const handleSpecEntitySubmit = async () => {
     try {
       const values = await validateSpecEntity();
+      // 提交时确保携带产品ID
+      values.productId = productId.value;
       const isUpdate = !!currentSpecEntity.value;
       if (isUpdate) {
         values.id = currentSpecEntity.value.id;
       }
-      
-      await saveOrUpdate(values, isUpdate);
+      // 保存/更新规格实体前移除为 undefined 的字段，避免传递 "undefined"
+      const payload = omitUndefined(values);
+      // 不使用@RequestBody，参数拼接到URL
+      await saveOrUpdateSpecEntity(payload, isUpdate);
       createMessage.success(isUpdate ? '更新成功' : '添加成功');
       closeSpecEntityModal();
       reload();
@@ -489,8 +640,7 @@
       createMessage.warning('请选择要删除的数据');
       return;
     }
-    
-    await batchDelete({ ids: rows.map(row => row.id) }, () => {
+    await batchDeleteSpecEntity({ ids: rows.map(row => row.id).join(',') }, () => {
       createMessage.success('批量删除成功');
       reload();
     });