Merge branch 'master' into tys

ruoyi-api/ruoyi-api-external/src/main/java/org/dromara/external/api/thirdparty/domain/bo/ThirdpartyAfterOrderAddBo.java

@@ -1,5 +1,7 @@
 package org.dromara.external.api.thirdparty.domain.bo;
 
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.io.Serial;
@@ -20,9 +22,15 @@ public class ThirdpartyAfterOrderAddBo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 售后单号
+     * 订单ID
      */
-    private String orderID;
+    private Long orderId;
+
+    /**
+     * 订单编号
+     */
+    @NotBlank(message = "订单编号不能为空")
+    private String orderNo;
 
     /**
      * 售后金额
@@ -39,14 +47,23 @@ public class ThirdpartyAfterOrderAddBo implements Serializable {
      */
     private Integer state;
 
+    /**
+     * 售后类型 1退换货 4 仅退款
+     */
+    @NotBlank(message = "售后类型不能为空")
+    private String serviceType;
+
+
     /**
      * 售后原因
      */
-    private String reason;
+    @NotNull(message = "售后原因")
+    private Long return_reason_id;
 
     /**
      * 售后描述
      */
+    @NotBlank(message = "售后描述")
     private String desc;
 
     /**

ruoyi-api/ruoyi-api-external/src/main/java/org/dromara/external/api/thirdparty/domain/bo/ThirdpartyAfterOrderBo.java

@@ -19,5 +19,11 @@ public class ThirdpartyAfterOrderBo implements Serializable {
     /**
      * 售后订单号
      */
-    private String orderID;
+    private String orderNo;
+
+
+    /**
+     * 退货单号
+     */
+    private String returnNo;
 }

ruoyi-api/ruoyi-api-external/src/main/java/org/dromara/external/api/thirdparty/domain/bo/ThirdpartyAfterOrderListBo.java

@@ -34,7 +34,7 @@ public class ThirdpartyAfterOrderListBo implements Serializable {
     /**
      * 售后单号
      */
-    private String orderID;
+    private String returnNo;
 
     /**
      * 订单状态
@@ -84,10 +84,15 @@ public class ThirdpartyAfterOrderListBo implements Serializable {
     /**
      * 物流状态
      */
-    private Integer logisticstatus;
+    private Integer logisticsStatus;
 
     /**
      * 发货状态
      */
     private Integer deliverystatus;
+
+    /**
+     * 退货原因id
+     */
+    private Long returnReasonId;
 }

ruoyi-api/ruoyi-api-external/src/main/java/org/dromara/external/api/thirdparty/domain/bo/ThirdpartyOrderAddBo.java

@@ -0,0 +1,72 @@
+package org.dromara.external.api.thirdparty.domain.bo;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class ThirdpartyOrderAddBo {
+
+    /**
+     * 所属公司
+     */
+    @NotNull(message = "所属公司不能为空")
+    private Long companyId;
+
+    /**
+     * 客户ID（关联客户主表）
+     */
+    @NotNull(message = "客户ID（关联客户主表）不能为空")
+    private Long customerId;
+
+    /**
+     * 收货地址ID
+     */
+    @NotNull(message = "收货地址ID不能为空")
+    private Long shippingAddressId;
+
+    /**
+     * 采购事由
+     */
+    @NotBlank(message = "采购事由不能为空")
+    private String purchaseReason;
+
+    /**
+     * 支付方式
+     */
+    @NotBlank(message = "支付方式不能为空")
+    private String payType;
+
+    /**
+     * 发货仓库
+     */
+    @NotNull(message = "发货仓库不能为空")
+    private Long warehouseId;
+
+    /**
+     * 预计送达时间
+     */
+    @NotNull(message = "预计送达时间不能为空")
+    private Date expectedDeliveryTime;
+
+    /**
+     * 费用类型
+     */
+    @NotBlank(message = "费用类型不能为空")
+    private String expenseType;
+
+    /**
+     * 订单附件文件路径
+     */
+    private String attachmentPath;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    List<ThirdpartyOrderProductBo> orderProductList;
+}

ruoyi-api/ruoyi-api-external/src/main/java/org/dromara/external/api/thirdparty/domain/bo/ThirdpartyOrderProductBo.java

@@ -0,0 +1,16 @@
+package org.dromara.external.api.thirdparty.domain.bo;
+
+import lombok.Data;
+
+@Data
+public class ThirdpartyOrderProductBo {
+    /**
+     * 产品编号
+     */
+    private String productNo;
+
+    /**
+     * 数量
+     */
+    private Integer orderQuantity;
+}

ruoyi-api/ruoyi-api-external/src/main/java/org/dromara/external/api/thirdparty/domain/bo/ThirdpartySetAfterStateBo.java

@@ -22,7 +22,7 @@ public class ThirdpartySetAfterStateBo implements Serializable {
     private String orderID;
 
     /**
-     * 订单状态0-申请 1-已确认、2-已取消、3-售后中、4-售后完成、5-拒绝售后
+     * 售后订单状态
      */
-    private Integer state;
+    private String returnState;
 }

ruoyi-api/ruoyi-api-external/src/main/java/org/dromara/external/api/thirdparty/domain/bo/ThirdpartySetOrderPayStateBo.java

@@ -24,5 +24,5 @@ public class ThirdpartySetOrderPayStateBo implements Serializable {
     /**
      * 支付状态  0-待支付 1-已支付
      */
-    private Integer paystatus;
+    private Integer payStatus;
 }

ruoyi-api/ruoyi-api-external/src/main/java/org/dromara/external/api/thirdparty/domain/bo/ThirdpartyTrackingBo.java

@@ -25,4 +25,24 @@ public class ThirdpartyTrackingBo implements Serializable {
      * 订单编号
      */
     private String orderID;
+
+    /**
+     * 物流包裹号
+     */
+    private String logisticPackNo;
+
+    /**
+     * 承运物流公司
+     */
+    private Long logisticsCompanyId;
+
+    /**
+     * 收货人电话
+     */
+    private String consigneePhone;
+
+    /**
+     * 客户编号
+     */
+    private String customerNo;
 }

ruoyi-api/ruoyi-api-external/src/main/java/org/dromara/external/api/thirdparty/domain/bo/ThirdpartyTrackingStatusBo.java

@@ -20,4 +20,14 @@ public class ThirdpartyTrackingStatusBo implements Serializable {
      * 物流单号
      */
     private String logisticsNo;
+
+    /**
+     * 订单ID (关联订单主表)
+     */
+    private Long orderId;
+
+    /**
+     * 客户ID (关联客户主表)
+     */
+    private Long customerId;
 }

ruoyi-api/ruoyi-api-external/src/main/java/org/dromara/external/api/thirdparty/domain/dto/ThirdpartyAfterOrderStatusDto.java

@@ -16,13 +16,18 @@ public class ThirdpartyAfterOrderStatusDto implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 售后订单id
+     */
+    private Long id;
+
     /**
      * 售后订单号
      */
-    private String orderID;
+    private String orderNo;
 
     /**
      * 状态
      */
-    private Integer state;
+    private Integer returnStatus;
 }

ruoyi-api/ruoyi-api-external/src/main/java/org/dromara/external/api/thirdparty/domain/dto/ThirdpartyOrderPayStateDto.java

@@ -16,13 +16,18 @@ public class ThirdpartyOrderPayStateDto implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
     /**
      * 订单编号
      */
-    private String orderID;
+    private String orderNo;
 
     /**
      * 支付状态  0-待支付 1-已支付
      */
-    private Integer paystate;
+    private Integer payState;
 }

ruoyi-api/ruoyi-api-external/src/main/java/org/dromara/external/api/thirdparty/domain/dto/ThirdpartyTrackingDto.java

@@ -35,7 +35,7 @@ public class ThirdpartyTrackingDto implements Serializable {
     /**
      * 物流单号
      */
-    private String logisticsNo;
+    private String logisticsNos;
 
     /**
      * 发货时间系统时间
@@ -45,13 +45,18 @@ public class ThirdpartyTrackingDto implements Serializable {
     /**
      * 0自有物流，1第三方物流
      */
-    private Integer type;
+    private Integer deliverMethod;
 
     /**
      * 物流状态0-待发货、1-发货中、2-已签收、3-拒签（只有当 type =0时此字段才有效）
      */
     private Integer logisticsStates;
 
+    /**
+     * 物流状态名称
+     */
+    private String statesName;
+
     /**
      * 订单商品信息
      */

ruoyi-api/ruoyi-api-external/src/main/java/org/dromara/external/api/thirdparty/domain/dto/ThirdpartyTrackingStatusDto.java

@@ -30,4 +30,9 @@ public class ThirdpartyTrackingStatusDto implements Serializable {
      * 物流状态：0-待发货、1-发货中、2-已签收、3-拒签
      */
     private Integer LogisticsStatus;
+
+    /**
+     * 状态名称
+     */
+    private String statusName;
 }

ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java

@@ -238,8 +238,8 @@ public class TokenController {
         LoginBody loginBody = JsonUtils.parseObject(body, LoginBody.class);
         ValidatorUtils.validate(loginBody);
         // 授权类型和客户端id
-        String clientId = loginBody.getClientId();
-        String grantType = loginBody.getGrantType();
+        String clientId = "e5cd7e4891bf95d1d19206ce24a7b32e";
+        String grantType = "password";
         RemoteClientVo clientVo = remoteClientService.queryByClientId(clientId);
 
         // 查询不到 client 或 client 内不包含 grantType

ruoyi-auth/src/main/resources/application.yml

@@ -32,3 +32,8 @@ spring:
       - optional:nacos:application-common.yml
       - optional:nacos:datasource.yml
       - optional:nacos:${spring.application.name}.yml
+
+tr:
+  wechat:
+    appid: wx3d002d66868332a1
+    secret: 269c120e6973c2a15a97f564d2c4c65

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java

@@ -16,13 +16,11 @@ public class LoginBody {
     /**
      * 客户端id
      */
-    @NotBlank(message = "{auth.clientid.not.blank}")
     private String clientId;
 
     /**
      * 授权类型
      */
-    @NotBlank(message = "{auth.grant.type.not.blank}")
     private String grantType;
 
     /**

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlatformDataScopeInterceptor.java

@@ -113,7 +113,8 @@ public class PlatformDataScopeInterceptor implements Interceptor {
         "erp_staff",
         "partner_prepared",
         "partner_prepared_product",
-        "protocol_"
+        "protocol_",
+        "ns_diy_"
         // 注意：前缀匹配需特殊处理（如 qrtz_），见 isIgnoreTable 方法
     ));
 
@@ -235,6 +236,7 @@ public class PlatformDataScopeInterceptor implements Interceptor {
             || tableName.startsWith("order_")
             || tableName.startsWith("external_")
             || tableName.startsWith("protocol_")
+            || tableName.startsWith("ns_diy_")
             ;
     }
 

ruoyi-modules/ruoyi-bill/src/main/java/org/dromara/bill/service/impl/StatementInvoiceServiceImpl.java

@@ -12,14 +12,12 @@ import org.dromara.bill.domain.bo.InvoiceInfoBo;
 import org.dromara.bill.domain.bo.StatementInvoiceBo;
 import org.dromara.bill.domain.bo.StatementInvoiceDetailBo;
 import org.dromara.bill.domain.bo.StatementInvoiceProductBo;
-import org.dromara.bill.domain.vo.InvoiceInfoVo;
-import org.dromara.bill.domain.vo.StatementInvoiceDetailVo;
-import org.dromara.bill.domain.vo.StatementInvoiceProductVo;
-import org.dromara.bill.domain.vo.StatementInvoiceVo;
+import org.dromara.bill.domain.vo.*;
 import org.dromara.bill.mapper.*;
 import org.dromara.bill.service.IStatementInvoiceService;
 import org.dromara.common.core.enums.InvoiceStatus;
 import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.ObjectUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -419,6 +417,23 @@ public class StatementInvoiceServiceImpl extends ServiceImpl<StatementInvoiceMap
         StatementInvoice invoice = new StatementInvoice();
         invoice.setId(bo.getId());
         invoice.setInvoiceStatus(bo.getInvoiceStatus());
+        if (baseMapper.updateById(invoice)>0){
+            StatementInvoiceVo invoiceVo = baseMapper.selectVoById(invoice.getId());
+            if (ObjectUtils.isNotEmpty(invoiceVo)){
+                List<StatementInvoiceDetail> statementInvoiceDetails = statementInvoiceDetailMapper.selectList(new LambdaQueryWrapper<StatementInvoiceDetail>().eq(StatementInvoiceDetail::getStatementInvoiceId, invoiceVo.getId()));
+                if (CollectionUtil.isNotEmpty(statementInvoiceDetails)){
+                    for (StatementInvoiceDetail statementInvoiceDetail : statementInvoiceDetails) {
+                        StatementOrder statementOrder = statementOrderMapper.selectById(statementInvoiceDetail.getStatementOrderId());
+                        if (ObjectUtils.isNotEmpty(statementOrder)){
+                            StatementOrder update = new StatementOrder();
+                            update.setId(statementOrder.getId());
+                            update.setIsInvoiceStatus("1");//将是否已开票的状态改为已开票
+                            statementOrderMapper.updateById(update);
+                        }
+                    }
+                }
+            }
+        }
         return baseMapper.updateById(invoice);
     }
 

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/controller/mini/MiniCustomerAddressController.java

@@ -0,0 +1,165 @@
+package org.dromara.customer.controller.mini;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.enums.IsDefault;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.customer.domain.bo.CustomerShippingAddressBo;
+import org.dromara.customer.domain.vo.CustomerShippingAddressVo;
+import org.dromara.customer.service.ICustomerShippingAddressService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ *mini端 - 收货地址管理
+ *
+ * @author Claude
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/miniAddress")
+public class MiniCustomerAddressController extends BaseController {
+
+    private final ICustomerShippingAddressService customerShippingAddressService;
+
+    /**
+     *mini 查询当前企业的收货地址列表
+     * mini端用户只能查询自己企业的地址
+     */
+    @GetMapping("/list")
+    public TableDataInfo<CustomerShippingAddressVo> list(CustomerShippingAddressBo bo, PageQuery pageQuery) {
+        // 获取当前登录用户的企业ID
+        Long customerId = LoginHelper.getLoginUser().getCustomerId();
+        // 强制设置企业ID，防止越权访问
+        bo.setCustomerId(customerId);
+
+        return customerShippingAddressService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取收货地址详细信息
+     * mini端用户只能查询自己企业的地址
+     *
+     * @param id 主键
+     */
+    @GetMapping("/{id}")
+    public R<CustomerShippingAddressVo> getInfo(@NotNull(message = "主键不能为空")
+                                                @PathVariable("id") Long id) {
+        // 查询地址信息
+        CustomerShippingAddressVo vo = customerShippingAddressService.queryById(id);
+
+        // 验证地址是否属于当前用户的企业
+        if (vo != null) {
+            Long customerId = LoginHelper.getLoginUser().getCustomerId();
+            if (!customerId.equals(vo.getCustomerId())) {
+                return R.fail("无权访问该地址");
+            }
+        }
+
+        return R.ok(vo);
+    }
+
+    /**
+     *mini 新增收货地址
+     */
+    @Log(title = "PC端-收货地址", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody CustomerShippingAddressBo bo) {
+        // 获取当前登录用户的企业ID
+        Long customerId = LoginHelper.getLoginUser().getCustomerId();
+        // 强制设置企业ID，防止为其他企业添加地址
+        bo.setCustomerId(customerId);
+
+        return toAjax(customerShippingAddressService.insertByBo(bo));
+    }
+
+    /**
+     *mini 修改收货地址
+     */
+    @Log(title = "PC端-收货地址", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody CustomerShippingAddressBo bo) {
+        // 获取当前登录用户的企业ID
+        Long customerId = LoginHelper.getLoginUser().getCustomerId();
+
+        // 验证地址是否属于当前用户的企业
+        CustomerShippingAddressVo existingAddress = customerShippingAddressService.queryById(bo.getId());
+        if (existingAddress == null) {
+            return R.fail("地址不存在");
+        }
+        if (!customerId.equals(existingAddress.getCustomerId())) {
+            return R.fail("无权修改该地址");
+        }
+
+        // 强制设置企业ID
+        bo.setCustomerId(customerId);
+
+        return toAjax(customerShippingAddressService.updateByBo(bo));
+    }
+
+    /**
+     *mini 删除收货地址
+     *
+     * @param ids 主键串
+     */
+    @Log(title = "PC端-收货地址", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        // 获取当前登录用户的企业ID
+        Long customerId = LoginHelper.getLoginUser().getCustomerId();
+
+        // 验证所有地址是否都属于当前用户的企业
+        for (Long id : ids) {
+            CustomerShippingAddressVo address = customerShippingAddressService.queryById(id);
+            if (address == null) {
+                return R.fail("地址ID " + id + " 不存在");
+            }
+            if (!customerId.equals(address.getCustomerId())) {
+                return R.fail("无权删除地址ID " + id);
+            }
+        }
+
+        return toAjax(customerShippingAddressService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    /**
+     *mini 设置默认地址
+     */
+    @Log(title = "PC端-收货地址", businessType = BusinessType.UPDATE)
+    @PutMapping("/default")
+    public R<Void> changeDefaultAddress(@RequestBody CustomerShippingAddressBo bo) {
+        // 获取当前登录用户的企业ID
+        Long customerId = LoginHelper.getLoginUser().getCustomerId();
+
+        // 验证地址是否属于当前用户的企业
+        CustomerShippingAddressVo address = customerShippingAddressService.queryById(bo.getId());
+        if (address == null) {
+            return R.fail("地址不存在");
+        }
+        if (!customerId.equals(address.getCustomerId())) {
+            return R.fail("无权设置该地址为默认");
+        }
+
+        // 强制设置企业ID
+        bo.setCustomerId(customerId);
+        bo.setDefaultAddress(IsDefault.Yes.getCode());
+
+        return toAjax(customerShippingAddressService.changeDefaultAddress(bo));
+    }
+}

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/controller/mini/MiniEnterpriseController.java

@@ -0,0 +1,69 @@
+package org.dromara.customer.controller.mini;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.customer.domain.bo.CustomerInfoBo;
+import org.dromara.customer.domain.vo.CustomerInfoVo;
+import org.dromara.customer.service.ICustomerInfoService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ *mini端 - 企业信息
+ *
+ * @author Claude
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/miniEnterprise")
+public class MiniEnterpriseController extends BaseController {
+
+    private final ICustomerInfoService customerInfoService;
+
+    /**
+     *mini 查询当前企业信息
+     *mini端用户只能查询自己所属企业的信息
+     */
+    @GetMapping("/info")
+    public R<CustomerInfoVo> getInfo() {
+        // 获取当前登录用户的企业ID
+        Long customerId = LoginHelper.getLoginUser().getCustomerId();
+        if (customerId == null) {
+            return R.fail("用户未登录或企业信息不存在");
+        }
+
+        // 查询企业信息
+        CustomerInfoVo vo = customerInfoService.queryById(customerId);
+        if (vo == null) {
+            return R.fail("企业信息不存在");
+        }
+
+        return R.ok(vo);
+    }
+
+    /**
+     *mini 修改当前企业信息
+     * mini端用户只能修改自己所属企业的信息
+     */
+    @Log(title = "PC端-企业信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/updateEnterprise")
+    public R<Void> updateInfo(@Validated @RequestBody CustomerInfoBo bo) {
+        // 获取当前登录用户的企业ID
+        Long customerId = LoginHelper.getLoginUser().getCustomerId();
+        if (customerId == null) {
+            return R.fail("用户未登录或企业信息不存在");
+        }
+
+        // 强制设置企业ID，防止越权修改其他企业信息
+        bo.setId(customerId);
+
+        // 调用Service更新企业信息
+        boolean result = customerInfoService.pcUpdateCustomerInfo(bo);
+        return toAjax(result);
+    }
+}

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/CustomerInfo.java

@@ -1,16 +1,14 @@
 package org.dromara.customer.domain;
 
-import cn.idev.excel.annotation.ExcelProperty;
-import org.dromara.common.tenant.core.TenantEntity;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.common.tenant.core.TenantEntity;
 
 import java.io.Serial;
+import java.util.Date;
 
 /**
  * 客户信息对象 customer_info
@@ -199,4 +197,19 @@ public class CustomerInfo extends TenantEntity {
      */
     private String sellInvoiceType;
 
+    /**
+     * 业务负责人
+     */
+    private Long salesPersonId;
+
+    /**
+     * 客服支持
+     */
+    private Long serviceStaffId;
+
+    /**
+     * 所属部门
+     */
+    private Long belongingDepartmentId;
+
 }

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/bo/CustomerInfoBo.java

@@ -1,19 +1,14 @@
 package org.dromara.customer.domain.bo;
 
-import org.dromara.customer.domain.CustomerInfo;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.customer.domain.CustomerInfo;
 
 import java.util.Date;
 import java.util.List;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-
 /**
  * 客户信息业务对象 customer_info
  *
@@ -202,6 +197,21 @@ public class CustomerInfoBo extends BaseEntity {
     /** 是否公海 (true/false) */
     private String isHighSeas;
 
+    /**
+     * 业务负责人
+     */
+    private Long salesPersonId;
+
+    /**
+     * 客服支持
+     */
+    private Long serviceStaffId;
+
+    /**
+     * 所属部门
+     */
+    private Long belongingDepartmentId;
+
     private CustomerBusinessInfoBo customerBusinessBo;
 
     private CustomerSalesInfoBo customerSalesInfoBo;

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/vo/CustomerInfoVo.java

@@ -1,22 +1,16 @@
 package org.dromara.customer.domain.vo;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.dromara.customer.domain.CustomerInfo;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.dromara.customer.domain.bo.CustomerBusinessInfoBo;
-import org.dromara.customer.domain.bo.CustomerContactBo;
-import org.dromara.customer.domain.bo.CustomerSalesInfoBo;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.customer.domain.CustomerInfo;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -233,6 +227,27 @@ public class CustomerInfoVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 业务负责人
+     */
+    private Long salesPersonId;
+
+    /**
+     * 客服支持
+     */
+    private Long serviceStaffId;
+
+    /**
+     * 所属部门
+     */
+    private Long belongingDepartmentId;
+
+    private String salesPersonName;
+
+    private String serviceStaffName;
+
+    private String belongingDepartmentName;
+
     /*部门额度*/
     private BigDecimal deptCredit;
 

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/thirdparty/ThirdpartyAfterOrderController.java

@@ -0,0 +1,82 @@
+package org.dromara.external.controller.thirdparty;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.external.api.thirdparty.domain.bo.ThirdpartyAfterOrderAddBo;
+import org.dromara.external.api.thirdparty.domain.bo.ThirdpartyAfterOrderBo;
+import org.dromara.external.api.thirdparty.domain.bo.ThirdpartyAfterOrderListBo;
+import org.dromara.external.api.thirdparty.domain.bo.ThirdpartySetAfterStateBo;
+import org.dromara.external.api.thirdparty.domain.dto.ThirdpartyAfterOrderDto;
+import org.dromara.external.api.thirdparty.domain.dto.ThirdpartyAfterOrderStatusDto;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 优易达（武汉）有限公司-售后接口
+ */
+@Tag(name = "售后接口")
+@Slf4j
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/thirdparty")
+public class ThirdpartyAfterOrderController {
+
+    /**
+     * 售后订单新增
+     */
+    @Operation(summary = "售后订单新增")
+    @PostMapping("/AfterOrder/addAfterOrder")
+    public R<String> addAfterOrder(@RequestBody ThirdpartyAfterOrderAddBo bo) {
+        // TODO: 实现售后订单新增逻辑
+        return R.ok("新增成功");
+    }
+
+    /**
+     * 售后订单状态查询
+     */
+    @Operation(summary = "售后订单状态查询")
+    @PostMapping("/AfterOrder/getAfterStatus")
+    public R<ThirdpartyAfterOrderStatusDto> getAfterStatus(@RequestBody ThirdpartyAfterOrderBo bo) {
+        // TODO: 实现售后订单状态查询逻辑
+        return R.ok();
+    }
+
+    /**
+     * 售后订单状态修改
+     */
+    @Operation(summary = "售后订单状态修改")
+    @PostMapping("/AfterOrder/setAfterState")
+    public R<String> setAfterState(@RequestBody ThirdpartySetAfterStateBo bo) {
+        // TODO: 实现售后订单状态修改逻辑
+        return R.ok();
+    }
+
+    /**
+     * 售后订单列表查询
+     */
+    @Operation(summary = "售后订单列表查询")
+    @PostMapping("/AfterOrder/getAfterOrderList")
+    public TableDataInfo<ThirdpartyAfterOrderDto> getAfterOrderList(@RequestBody ThirdpartyAfterOrderListBo bo, PageQuery pageQuery) {
+        // TODO: 实现售后订单列表查询逻辑
+        return TableDataInfo.build();
+    }
+
+    /**
+     * 售后订单查询
+     */
+    @Operation(summary = "售后订单查询")
+    @PostMapping("/AfterOrder/getAfterOrder")
+    public R<ThirdpartyAfterOrderDto> getAfterOrder(@RequestBody ThirdpartyAfterOrderBo bo) {
+        // TODO: 实现售后订单查询逻辑
+        return R.ok();
+    }
+}

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/thirdparty/ThirdpartyCommonController.java

@@ -0,0 +1,72 @@
+package org.dromara.external.controller.thirdparty;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.R;
+import org.dromara.external.api.thirdparty.domain.bo.ThirdpartyProductBrandBo;
+import org.dromara.external.api.thirdparty.domain.bo.ThirdpartyProductUnitBo;
+import org.dromara.external.api.thirdparty.domain.dto.ThirdpartyAreaDto;
+import org.dromara.external.api.thirdparty.domain.dto.ThirdpartyProductBrandDto;
+import org.dromara.external.api.thirdparty.domain.dto.ThirdpartyProductCateDto;
+import org.dromara.external.api.thirdparty.domain.dto.ThirdpartyProductUnitDto;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 优易达（武汉）有限公司-公共数据接口
+ */
+@Tag(name = "公共数据")
+@Slf4j
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/thirdparty")
+public class ThirdpartyCommonController {
+
+    /**
+     * 获取区域地址
+     */
+    @Operation(summary = "获取区域地址")
+    @PostMapping("/Product/getSysArea")
+    public R<List<ThirdpartyAreaDto>> getSysArea() {
+        // TODO: 实现获取区域地址逻辑
+        return R.ok();
+    }
+
+    /**
+     * 产品分类查询
+     */
+    @Operation(summary = "产品分类查询")
+    @PostMapping("/product/getProductCates")
+    public R<List<ThirdpartyProductCateDto>> getProductCates() {
+        // TODO: 实现产品分类查询逻辑
+        return R.ok();
+    }
+
+    /**
+     * 产品品牌查询
+     */
+    @Operation(summary = "产品品牌查询")
+    @PostMapping("/product/getProductBrand")
+    public R<List<ThirdpartyProductBrandDto>> getProductBrand(@RequestBody ThirdpartyProductBrandBo bo) {
+        // TODO: 实现产品品牌查询逻辑
+        return R.ok();
+    }
+
+    /**
+     * 产品单位查询
+     */
+    @Operation(summary = "产品单位查询")
+    @PostMapping("/product/getProductUnit")
+    public R<ThirdpartyProductUnitDto> getProductUnit(@RequestBody ThirdpartyProductUnitBo bo) {
+        // TODO: 实现产品单位查询逻辑
+        return R.ok();
+    }
+}

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/thirdparty/ThirdpartyController.java

@@ -1,308 +0,0 @@
-package org.dromara.external.controller.thirdparty;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.core.domain.R;
-import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.external.api.thirdparty.domain.bo.*;
-import org.dromara.external.api.thirdparty.domain.dto.*;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 第三方平台接口对接控制器
- * 优易达（武汉）有限公司-平台接口对接稳定V2.0
- * 时间:2026/1/5，19:03
- */
-@Slf4j
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/api/thirdparty")
-public class ThirdpartyController {
-
-    /**
-     * 产品列表查询
-     */
-    @PostMapping("/product/getListProducts")
-    public TableDataInfo<ThirdpartyProductDto> getListProducts(@RequestBody ThirdpartyProductBo bo, PageQuery pageQuery) {
-        // TODO: 实现产品列表查询逻辑
-        return TableDataInfo.build();
-    }
-
-    /**
-     * 产品表体接口
-     */
-    @PostMapping("/product/getProductBody")
-    public R<ThirdpartyProductDto> getProductBody(@RequestBody ThirdpartyProductDetailBo bo) {
-        // TODO: 实现产品表体查询逻辑
-        return R.ok();
-    }
-
-    /**
-     * 产品详情查询
-     */
-    @PostMapping("/product/getProductDetails")
-    public R<ThirdpartyProductDetailDto> getProductDetails(@RequestBody ThirdpartyProductDetailBo bo) {
-        // TODO: 实现产品详情查询逻辑
-        return R.ok();
-    }
-
-    /**
-     * 产品价格查询
-     */
-    @PostMapping("/product/getPrice")
-    public R<ThirdpartyProductPriceDto> getPrice(@RequestBody ThirdpartyProductDetailBo bo) {
-        // TODO: 实现产品价格查询逻辑
-        return R.ok();
-    }
-
-    /**
-     * 商品查询价格（批量）
-     */
-    @PostMapping("/product/getBatchPrice")
-    public R<List<ThirdpartyProductPriceDto>> getBatchPrice(@RequestBody ThirdpartyProductDetailBo bo) {
-        // TODO: 实现批量价格查询逻辑
-        return R.ok();
-    }
-
-    /**
-     * 商品库存查询
-     */
-    @PostMapping("/product/getProductStock")
-    public R<ThirdpartyProductStockDto> getProductStock(@RequestBody ThirdpartyProductStockBo bo) {
-        // TODO: 实现商品库存查询逻辑
-        return R.ok();
-    }
-
-    /**
-     * 产品状态查询
-     */
-    @PostMapping("/product/getStatus")
-    public R<ThirdpartyProductStatusDto> getStatus(@RequestBody ThirdpartyProductDetailBo bo) {
-        // TODO: 实现产品状态查询逻辑
-        return R.ok();
-    }
-
-    /**
-     * 产品品牌查询
-     */
-    @PostMapping("/product/getProductBrand")
-    public R<List<ThirdpartyProductBrandDto>> getProductBrand(@RequestBody ThirdpartyProductBrandBo bo) {
-        // TODO: 实现产品品牌查询逻辑
-        return R.ok();
-    }
-
-    /**
-     * 产品单位查询
-     */
-    @PostMapping("/product/getProductUnit")
-    public R<ThirdpartyProductUnitDto> getProductUnit(@RequestBody ThirdpartyProductUnitBo bo) {
-        // TODO: 实现产品单位查询逻辑
-        return R.ok();
-    }
-
-    /**
-     * 产品分类查询
-     */
-    @PostMapping("/product/getProductCates")
-    public R<List<ThirdpartyProductCateDto>> getProductCates() {
-        // TODO: 实现产品分类查询逻辑
-        return R.ok();
-    }
-
-    /**
-     * 获取区域地址
-     */
-    @PostMapping("/Product/getSysArea")
-    public R<List<ThirdpartyAreaDto>> getSysArea() {
-        // TODO: 实现获取区域地址逻辑
-        return R.ok();
-    }
-
-    /**
-     * 订单新增
-     */
-    @PostMapping("/order/addOrder")
-    public R<ThirdpartyOrderDto> addOrder(@RequestBody ThirdpartyOrderBo bo) {
-        // TODO: 实现订单新增逻辑
-        return R.ok();
-    }
-
-    /**
-     * 订单查询
-     */
-    @PostMapping("/order/getOrder")
-    public R<ThirdpartyOrderDto> getOrder(@RequestBody ThirdpartyOrderBo bo) {
-        // TODO: 实现订单查询逻辑
-        return R.ok();
-    }
-
-    /**
-     * 订单列表查询
-     */
-    @PostMapping("/order/getOrders")
-    public TableDataInfo<ThirdpartyOrderDto> getOrders(@RequestBody ThirdpartyOrderListBo bo, PageQuery pageQuery) {
-        // TODO: 实现订单列表查询逻辑
-        return TableDataInfo.build();
-    }
-
-    /**
-     * 主订单查询
-     */
-    @PostMapping("/order/getRootOrder")
-    public R<ThirdpartyRootOrderDto> getRootOrder(@RequestBody ThirdpartyRootOrderBo bo) {
-        // TODO: 实现主订单查询逻辑
-        return R.ok();
-    }
-
-    /**
-     * 订单状态查询
-     */
-    @PostMapping("/order/getOrderStatus")
-    public R<ThirdpartyOrderStatusDto> getOrderStatus(@RequestBody ThirdpartyOrderStatusBo bo) {
-        // TODO: 实现订单状态查询逻辑
-        return R.ok();
-    }
-
-    /**
-     * 撤销订单
-     */
-    @PostMapping("/order/confirmOrder")
-    public R<String> confirmOrder(@RequestBody ThirdpartyConfirmOrderBo bo) {
-        // TODO: 实现撤销订单逻辑
-        return R.ok();
-    }
-
-    /**
-     * 订单支付状态查询
-     */
-    @PostMapping("/order/getOrderPayState")
-    public R<ThirdpartyOrderPayStateDto> getOrderPayState(@RequestBody ThirdpartyOrderStatusBo bo) {
-        // TODO: 实现订单支付状态查询逻辑
-        return R.ok();
-    }
-
-    /**
-     * 订单支付状态写入
-     */
-    @PostMapping("/Order/setOrderPayState")
-    public R<String> setOrderPayState(@RequestBody ThirdpartySetOrderPayStateBo bo) {
-        // TODO: 实现订单支付状态写入逻辑
-        return R.ok();
-    }
-
-    /**
-     * 售后订单新增
-     */
-    @PostMapping("/AfterOrder/addAfterOrder")
-    public R<String> addAfterOrder(@RequestBody ThirdpartyAfterOrderAddBo bo) {
-        // TODO: 实现售后订单新增逻辑
-        return R.ok("新增成功");
-    }
-
-    /**
-     * 售后订单状态查询
-     */
-    @PostMapping("/AfterOrder/getAfterStatus")
-    public R<ThirdpartyAfterOrderStatusDto> getAfterStatus(@RequestBody ThirdpartyAfterOrderBo bo) {
-        // TODO: 实现售后订单状态查询逻辑
-        return R.ok();
-    }
-
-    /**
-     * 售后订单状态修改
-     */
-    @PostMapping("/AfterOrder/setAfterState")
-    public R<String> setAfterState(@RequestBody ThirdpartySetAfterStateBo bo) {
-        // TODO: 实现售后订单状态修改逻辑
-        return R.ok();
-    }
-
-    /**
-     * 售后订单列表查询
-     */
-    @PostMapping("/AfterOrder/getAfterOrderList")
-    public TableDataInfo<ThirdpartyAfterOrderDto> getAfterOrderList(@RequestBody ThirdpartyAfterOrderListBo bo, PageQuery pageQuery) {
-        // TODO: 实现售后订单列表查询逻辑
-        return TableDataInfo.build();
-    }
-
-    /**
-     * 售后订单查询
-     */
-    @PostMapping("/AfterOrder/getAfterOrder")
-    public R<ThirdpartyAfterOrderDto> getAfterOrder(@RequestBody ThirdpartyAfterOrderBo bo) {
-        // TODO: 实现售后订单查询逻辑
-        return R.ok();
-    }
-
-    /**
-     * 物流查询
-     */
-    @PostMapping("/Other/geTtracking")
-    public R<ThirdpartyTrackingDto> geTtracking(@RequestBody ThirdpartyTrackingBo bo) {
-        // TODO: 实现物流查询逻辑
-        return R.ok();
-    }
-
-    /**
-     * 物流状态查询
-     */
-    @PostMapping("/Other/getTrackingStatus")
-    public R<ThirdpartyTrackingStatusDto> getTrackingStatus(@RequestBody ThirdpartyTrackingStatusBo bo) {
-        // TODO: 实现物流状态查询逻辑
-        return R.ok();
-    }
-
-    /**
-     * 对账列表查询
-     */
-    @PostMapping("/Other/getReconList")
-    public TableDataInfo<ThirdpartyReconDto> getReconList(@RequestBody ThirdpartyReconListBo bo, PageQuery pageQuery) {
-        // TODO: 实现对账列表查询逻辑
-        return TableDataInfo.build();
-    }
-
-    /**
-     * 对账申请
-     */
-    @PostMapping("/Other/applyRecon")
-    public R<String> applyRecon(@RequestBody ThirdpartyApplyReconBo bo) {
-        // TODO: 实现对账申请逻辑
-        return R.ok();
-    }
-
-    /**
-     * 对账状态查询
-     */
-    @PostMapping("/Other/getReconState")
-    public R<ThirdpartyReconStateDto> getReconState(@RequestBody ThirdpartyReconStateBo bo) {
-        // TODO: 实现对账状态查询逻辑
-        return R.ok();
-    }
-
-    /**
-     * 申请开票
-     */
-    @PostMapping("/Other/orderInvoice")
-    public R<String> orderInvoice(@RequestBody ThirdpartyOrderInvoiceBo bo) {
-        // TODO: 实现申请开票逻辑
-        return R.ok();
-    }
-
-    /**
-     * 开票信息查询
-     */
-    @PostMapping("/Other/getOrderInvoice")
-    public R<ThirdpartyOrderInvoiceDto> getOrderInvoice(@RequestBody ThirdpartyOrderInvoiceBo bo) {
-        // TODO: 实现开票信息查询逻辑
-        return R.ok();
-    }
-}

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/thirdparty/ThirdpartyInvoiceController.java

@@ -0,0 +1,46 @@
+package org.dromara.external.controller.thirdparty;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.R;
+import org.dromara.external.api.thirdparty.domain.bo.ThirdpartyOrderInvoiceBo;
+import org.dromara.external.api.thirdparty.domain.dto.ThirdpartyOrderInvoiceDto;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 优易达（武汉）有限公司-开票接口
+ */
+@Tag(name = "开票接口")
+@Slf4j
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/thirdparty")
+public class ThirdpartyInvoiceController {
+
+    /**
+     * 申请开票
+     */
+    @Operation(summary = "申请开票")
+    @PostMapping("/Other/orderInvoice")
+    public R<String> orderInvoice(@RequestBody ThirdpartyOrderInvoiceBo bo) {
+        // TODO: 实现申请开票逻辑
+        return R.ok();
+    }
+
+    /**
+     * 开票信息查询
+     */
+    @Operation(summary = "开票信息查询")
+    @PostMapping("/Other/getOrderInvoice")
+    public R<ThirdpartyOrderInvoiceDto> getOrderInvoice(@RequestBody ThirdpartyOrderInvoiceBo bo) {
+        // TODO: 实现开票信息查询逻辑
+        return R.ok();
+    }
+}

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/thirdparty/ThirdpartyOrderController.java

@@ -0,0 +1,117 @@
+package org.dromara.external.controller.thirdparty;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.external.api.thirdparty.domain.bo.ThirdpartyConfirmOrderBo;
+import org.dromara.external.api.thirdparty.domain.bo.ThirdpartyOrderAddBo;
+import org.dromara.external.api.thirdparty.domain.bo.ThirdpartyOrderBo;
+import org.dromara.external.api.thirdparty.domain.bo.ThirdpartyOrderListBo;
+import org.dromara.external.api.thirdparty.domain.bo.ThirdpartyOrderStatusBo;
+import org.dromara.external.api.thirdparty.domain.bo.ThirdpartyRootOrderBo;
+import org.dromara.external.api.thirdparty.domain.bo.ThirdpartySetOrderPayStateBo;
+import org.dromara.external.api.thirdparty.domain.dto.ThirdpartyOrderDto;
+import org.dromara.external.api.thirdparty.domain.dto.ThirdpartyOrderPayStateDto;
+import org.dromara.external.api.thirdparty.domain.dto.ThirdpartyOrderStatusDto;
+import org.dromara.external.api.thirdparty.domain.dto.ThirdpartyRootOrderDto;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 优易达（武汉）有限公司-订单接口
+ */
+@Tag(name = "订单接口")
+@Slf4j
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/thirdparty")
+public class ThirdpartyOrderController {
+
+    /**
+     * 订单新增
+     */
+    @Operation(summary = "订单新增")
+    @PostMapping("/order/addOrder")
+    public R<String> addOrder(@RequestBody ThirdpartyOrderAddBo bo) {
+        // TODO: 实现订单新增逻辑
+        return R.ok();
+    }
+
+    /**
+     * 订单查询
+     */
+    @Operation(summary = "订单查询")
+    @PostMapping("/order/getOrder")
+    public R<ThirdpartyOrderDto> getOrder(@RequestBody ThirdpartyOrderBo bo) {
+        // TODO: 实现订单查询逻辑
+        return R.ok();
+    }
+
+    /**
+     * 订单列表查询
+     */
+    @Operation(summary = "订单列表查询")
+    @PostMapping("/order/getOrders")
+    public TableDataInfo<ThirdpartyOrderDto> getOrders(@RequestBody ThirdpartyOrderListBo bo, PageQuery pageQuery) {
+        // TODO: 实现订单列表查询逻辑
+        return TableDataInfo.build();
+    }
+
+    /**
+     * 主订单查询
+     */
+    @Operation(summary = "主订单查询")
+    @PostMapping("/order/getRootOrder")
+    public R<ThirdpartyRootOrderDto> getRootOrder(@RequestBody ThirdpartyRootOrderBo bo) {
+        // TODO: 实现主订单查询逻辑
+        return R.ok();
+    }
+
+    /**
+     * 订单状态查询
+     */
+    @Operation(summary = "订单状态查询")
+    @PostMapping("/order/getOrderStatus")
+    public R<ThirdpartyOrderStatusDto> getOrderStatus(@RequestBody ThirdpartyOrderStatusBo bo) {
+        // TODO: 实现订单状态查询逻辑
+        return R.ok();
+    }
+
+    /**
+     * 撤销订单
+     */
+    @Operation(summary = "撤销订单")
+    @PostMapping("/order/confirmOrder")
+    public R<String> confirmOrder(@RequestBody ThirdpartyConfirmOrderBo bo) {
+        // TODO: 实现撤销订单逻辑
+        return R.ok();
+    }
+
+    /**
+     * 订单支付状态查询
+     */
+    @Operation(summary = "订单支付状态查询")
+    @PostMapping("/order/getOrderPayState")
+    public R<ThirdpartyOrderPayStateDto> getOrderPayState(@RequestBody ThirdpartyOrderStatusBo bo) {
+        // TODO: 实现订单支付状态查询逻辑
+        return R.ok();
+    }
+
+    /**
+     * 订单支付状态写入
+     */
+    @Operation(summary = "订单支付状态写入")
+    @PostMapping("/Order/setOrderPayState")
+    public R<String> setOrderPayState(@RequestBody ThirdpartySetOrderPayStateBo bo) {
+        // TODO: 实现订单支付状态写入逻辑
+        return R.ok();
+    }
+}

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/thirdparty/ThirdpartyProductController.java

@@ -0,0 +1,106 @@
+package org.dromara.external.controller.thirdparty;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.external.api.thirdparty.domain.bo.ThirdpartyProductBo;
+import org.dromara.external.api.thirdparty.domain.bo.ThirdpartyProductDetailBo;
+import org.dromara.external.api.thirdparty.domain.bo.ThirdpartyProductStockBo;
+import org.dromara.external.api.thirdparty.domain.dto.ThirdpartyProductDetailDto;
+import org.dromara.external.api.thirdparty.domain.dto.ThirdpartyProductDto;
+import org.dromara.external.api.thirdparty.domain.dto.ThirdpartyProductPriceDto;
+import org.dromara.external.api.thirdparty.domain.dto.ThirdpartyProductStatusDto;
+import org.dromara.external.api.thirdparty.domain.dto.ThirdpartyProductStockDto;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 优易达（武汉）有限公司-产品接口
+ */
+@Tag(name = "产品接口")
+@Slf4j
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/thirdparty")
+public class ThirdpartyProductController {
+
+    /**
+     * 产品列表查询
+     */
+    @Operation(summary = "产品列表查询")
+    @PostMapping("/product/getListProducts")
+    public TableDataInfo<ThirdpartyProductDto> getListProducts(@RequestBody ThirdpartyProductBo bo, PageQuery pageQuery) {
+        // TODO: 实现产品列表查询逻辑
+        return TableDataInfo.build();
+    }
+
+    /**
+     * 产品表体接口
+     */
+    @Operation(summary = "产品表体接口")
+    @PostMapping("/product/getProductBody")
+    public R<ThirdpartyProductDto> getProductBody(@RequestBody ThirdpartyProductDetailBo bo) {
+        // TODO: 实现产品表体查询逻辑
+        return R.ok();
+    }
+
+    /**
+     * 产品详情查询
+     */
+    @Operation(summary = "产品详情查询")
+    @PostMapping("/product/getProductDetails")
+    public R<ThirdpartyProductDetailDto> getProductDetails(@RequestBody ThirdpartyProductDetailBo bo) {
+        // TODO: 实现产品详情查询逻辑
+        return R.ok();
+    }
+
+    /**
+     * 产品价格查询
+     */
+    @Operation(summary = "产品价格查询")
+    @PostMapping("/product/getPrice")
+    public R<ThirdpartyProductPriceDto> getPrice(@RequestBody ThirdpartyProductDetailBo bo) {
+        // TODO: 实现产品价格查询逻辑
+        return R.ok();
+    }
+
+    /**
+     * 商品查询价格（批量）
+     */
+    @Operation(summary = "商品查询价格（批量）")
+    @PostMapping("/product/getBatchPrice")
+    public R<List<ThirdpartyProductPriceDto>> getBatchPrice(@RequestBody ThirdpartyProductDetailBo bo) {
+        // TODO: 实现批量价格查询逻辑
+        return R.ok();
+    }
+
+    /**
+     * 商品库存查询
+     */
+    @Operation(summary = "商品库存查询")
+    @PostMapping("/product/getProductStock")
+    public R<ThirdpartyProductStockDto> getProductStock(@RequestBody ThirdpartyProductStockBo bo) {
+        // TODO: 实现商品库存查询逻辑
+        return R.ok();
+    }
+
+    /**
+     * 产品状态查询
+     */
+    @Operation(summary = "产品状态查询")
+    @PostMapping("/product/getStatus")
+    public R<ThirdpartyProductStatusDto> getStatus(@RequestBody ThirdpartyProductDetailBo bo) {
+        // TODO: 实现产品状态查询逻辑
+        return R.ok();
+    }
+}

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/thirdparty/ThirdpartyReconController.java

@@ -0,0 +1,61 @@
+package org.dromara.external.controller.thirdparty;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.external.api.thirdparty.domain.bo.ThirdpartyApplyReconBo;
+import org.dromara.external.api.thirdparty.domain.bo.ThirdpartyReconListBo;
+import org.dromara.external.api.thirdparty.domain.bo.ThirdpartyReconStateBo;
+import org.dromara.external.api.thirdparty.domain.dto.ThirdpartyReconDto;
+import org.dromara.external.api.thirdparty.domain.dto.ThirdpartyReconStateDto;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 优易达（武汉）有限公司-对账接口
+ */
+@Tag(name = "对账接口")
+@Slf4j
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/thirdparty")
+public class ThirdpartyReconController {
+
+    /**
+     * 对账列表查询
+     */
+    @Operation(summary = "对账列表查询")
+    @PostMapping("/Other/getReconList")
+    public TableDataInfo<ThirdpartyReconDto> getReconList(@RequestBody ThirdpartyReconListBo bo, PageQuery pageQuery) {
+        // TODO: 实现对账列表查询逻辑
+        return TableDataInfo.build();
+    }
+
+    /**
+     * 对账申请
+     */
+    @Operation(summary = "对账申请")
+    @PostMapping("/Other/applyRecon")
+    public R<String> applyRecon(@RequestBody ThirdpartyApplyReconBo bo) {
+        // TODO: 实现对账申请逻辑
+        return R.ok();
+    }
+
+    /**
+     * 对账状态查询
+     */
+    @Operation(summary = "对账状态查询")
+    @PostMapping("/Other/getReconState")
+    public R<ThirdpartyReconStateDto> getReconState(@RequestBody ThirdpartyReconStateBo bo) {
+        // TODO: 实现对账状态查询逻辑
+        return R.ok();
+    }
+}

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/thirdparty/ThirdpartyTrackingController.java

@@ -0,0 +1,48 @@
+package org.dromara.external.controller.thirdparty;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.R;
+import org.dromara.external.api.thirdparty.domain.bo.ThirdpartyTrackingBo;
+import org.dromara.external.api.thirdparty.domain.bo.ThirdpartyTrackingStatusBo;
+import org.dromara.external.api.thirdparty.domain.dto.ThirdpartyTrackingDto;
+import org.dromara.external.api.thirdparty.domain.dto.ThirdpartyTrackingStatusDto;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 优易达（武汉）有限公司-物流接口
+ */
+@Tag(name = "物流接口")
+@Slf4j
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/thirdparty")
+public class ThirdpartyTrackingController {
+
+    /**
+     * 物流查询
+     */
+    @Operation(summary = "物流查询")
+    @PostMapping("/Other/geTtracking")
+    public R<ThirdpartyTrackingDto> geTtracking(@RequestBody ThirdpartyTrackingBo bo) {
+        // TODO: 实现物流查询逻辑
+        return R.ok();
+    }
+
+    /**
+     * 物流状态查询
+     */
+    @Operation(summary = "物流状态查询")
+    @PostMapping("/Other/getTrackingStatus")
+    public R<ThirdpartyTrackingStatusDto> getTrackingStatus(@RequestBody ThirdpartyTrackingStatusBo bo) {
+        // TODO: 实现物流状态查询逻辑
+        return R.ok();
+    }
+}

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/NavigationConfigController.java

@@ -0,0 +1,59 @@
+package org.dromara.mall.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mall.domain.bo.MNavigationConfigBo;
+import org.dromara.mall.domain.vo.MNavigationConfigVo;
+import org.dromara.mall.service.IMNavigationConfigService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 底部菜单导航配置
+ * 前端访问路由地址为:/mall/navigationConfig
+ *
+ * @author LionLi
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/navigationConfig")
+public class NavigationConfigController extends BaseController {
+
+    private final IMNavigationConfigService navigationConfigService;
+
+    /**
+     * 获取当前导航配置
+     */
+    @GetMapping("/current")
+    public R<MNavigationConfigVo> getCurrent() {
+        return R.ok(navigationConfigService.getCurrentConfig());
+    }
+
+    /**
+     * 获取导航配置详细信息
+     *
+     * @param id 主键
+     */
+    @GetMapping("/{id}")
+    public R<MNavigationConfigVo> getInfo(@NotNull(message = "主键不能为空")
+                                          @PathVariable("id") Long id) {
+        return R.ok(navigationConfigService.queryById(id));
+    }
+
+    /**
+     * 保存导航配置
+     */
+    @Log(title = "保存导航配置", businessType = BusinessType.UPDATE)
+    @PostMapping("/save")
+    public R<Void> save(@Validated @RequestBody MNavigationConfigBo bo) {
+        return toAjax(navigationConfigService.saveConfig(bo));
+    }
+
+}
+

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/MBottomNavItems.java

@@ -0,0 +1,60 @@
+package org.dromara.mall.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+import java.io.Serial;
+
+/**
+ * 底部菜单-底部导航菜单项对象 m_bottom_nav_items
+ *
+ * @author
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("m_bottom_nav_items")
+public class MBottomNavItems extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 外键，关联 m_navigation_config.id
+     */
+    private Long configId;
+
+    /**
+     * 排序序号
+     */
+    private Integer orderIndex;
+
+    /**
+     * 正常状态图标路径
+     */
+    private String iconNormal;
+
+    /**
+     * 选中状态图标路径
+     */
+    private String iconSelected;
+
+    /**
+     * 显示文字
+     */
+    private String text;
+
+    /**
+     * 跳转链接
+     */
+    private String linkUrl;
+
+}

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/MNavigationConfig.java

@@ -0,0 +1,63 @@
+package org.dromara.mall.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+import java.io.Serial;
+
+/**
+ * 底部菜单-全局导航配置对象 m_navigation_config
+ *
+ * @author
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("m_navigation_config")
+public class MNavigationConfig extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 顶部文字颜色
+     */
+    private String topNavTextColor;
+
+    /**
+     * 顶部背景颜色
+     */
+    private String topNavBgColor;
+
+    /**
+     * 底部背景颜色
+     */
+    private String bottomNavBgColor;
+
+    /**
+     * 底部文字颜色
+     */
+    private String bottomNavTextColor;
+
+    /**
+     * 底部选中项颜色
+     */
+    private String bottomNavSelectedColor;
+
+    /**
+     * 导航样式：仅图标 / 仅文字 / 图标+文字
+     */
+    private String navStyle;
+
+    private String status;
+
+
+}

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/MBottomNavItemsBo.java

@@ -0,0 +1,60 @@
+package org.dromara.mall.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.mall.domain.MBottomNavItems;
+
+/**
+ * 底部菜单-底部导航菜单项业务对象 m_bottom_nav_items
+ *
+ * @author LionLi
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = MBottomNavItems.class, reverseConvertGenerate = false)
+public class MBottomNavItemsBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 外键，关联 m_navigation_config.id
+     */
+    // @NotNull(message = "外键不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long configId;
+
+    /**
+     * 排序序号
+     */
+    // @NotNull(message = "排序序号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Integer orderIndex;
+
+    /**
+     * 正常状态图标路径
+     */
+    // @NotBlank(message = "正常状态图标路径不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String iconNormal;
+
+    /**
+     * 选中状态图标路径
+     */
+    // @NotBlank(message = "选中状态图标路径不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String iconSelected;
+
+    /**
+     * 显示文字
+     */
+    // @NotBlank(message = "显示文字不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String text;
+
+    /**
+     * 跳转链接
+     */
+    // @NotBlank(message = "跳转链接不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String linkUrl;
+
+}

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/bo/MNavigationConfigBo.java

@@ -0,0 +1,72 @@
+package org.dromara.mall.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.mall.domain.MNavigationConfig;
+
+import java.util.List;
+
+/**
+ * 底部菜单-全局导航配置业务对象 m_navigation_config
+ *
+ * @author LionLi
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = MNavigationConfig.class, reverseConvertGenerate = false)
+public class MNavigationConfigBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 顶部文字颜色
+     */
+    @NotBlank(message = "顶部文字颜色不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String topNavTextColor;
+
+    /**
+     * 顶部背景颜色
+     */
+    @NotBlank(message = "顶部背景颜色不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String topNavBgColor;
+
+    /**
+     * 底部背景颜色
+     */
+    @NotBlank(message = "底部背景颜色不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String bottomNavBgColor;
+
+    /**
+     * 底部文字颜色
+     */
+    @NotBlank(message = "底部文字颜色不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String bottomNavTextColor;
+
+    /**
+     * 底部选中项颜色
+     */
+    @NotBlank(message = "底部选中项颜色不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String bottomNavSelectedColor;
+
+    /**
+     * 导航样式：仅图标 / 仅文字 / 图标+文字
+     */
+    @NotBlank(message = "导航样式不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String navStyle;
+
+    private String status;
+
+    /**
+     * 导航菜单项列表
+     */
+    private List<MBottomNavItemsBo> navItems;
+
+}

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/MBottomNavItemsVo.java

@@ -0,0 +1,57 @@
+package org.dromara.mall.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.mall.domain.MBottomNavItems;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 底部菜单-底部导航菜单项视图对象 m_bottom_nav_items
+ *
+ * @author LionLi
+ */
+@Data
+@AutoMapper(target = MBottomNavItems.class)
+public class MBottomNavItemsVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 外键，关联 m_navigation_config.id
+     */
+    private Long configId;
+
+    /**
+     * 排序序号
+     */
+    private Integer orderIndex;
+
+    /**
+     * 正常状态图标路径
+     */
+    private String iconNormal;
+
+    /**
+     * 选中状态图标路径
+     */
+    private String iconSelected;
+
+    /**
+     * 显示文字
+     */
+    private String text;
+
+    /**
+     * 跳转链接
+     */
+    private String linkUrl;
+
+}

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/domain/vo/MNavigationConfigVo.java

@@ -0,0 +1,65 @@
+package org.dromara.mall.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.mall.domain.MNavigationConfig;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 底部菜单-全局导航配置视图对象 m_navigation_config
+ *
+ * @author
+ */
+@Data
+@AutoMapper(target = MNavigationConfig.class)
+public class MNavigationConfigVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 顶部文字颜色
+     */
+    private String topNavTextColor;
+
+    /**
+     * 顶部背景颜色
+     */
+    private String topNavBgColor;
+
+    /**
+     * 底部背景颜色
+     */
+    private String bottomNavBgColor;
+
+    /**
+     * 底部文字颜色
+     */
+    private String bottomNavTextColor;
+
+    /**
+     * 底部选中项颜色
+     */
+    private String bottomNavSelectedColor;
+
+    /**
+     * 导航样式：仅图标 / 仅文字 / 图标+文字
+     */
+    private String navStyle;
+
+    private String status;
+
+    /**
+     * 导航菜单项列表
+     */
+    private List<MBottomNavItemsVo> navItems;
+
+}

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/MBottomNavItemsMapper.java

@@ -0,0 +1,14 @@
+package org.dromara.mall.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.mall.domain.MBottomNavItems;
+import org.dromara.mall.domain.vo.MBottomNavItemsVo;
+
+/**
+ * 底部菜单-底部导航菜单项Mapper接口
+ *
+ * @author LionLi
+ */
+public interface MBottomNavItemsMapper extends BaseMapperPlus<MBottomNavItems, MBottomNavItemsVo> {
+
+}

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/mapper/MNavigationConfigMapper.java

@@ -0,0 +1,14 @@
+package org.dromara.mall.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.mall.domain.MNavigationConfig;
+import org.dromara.mall.domain.vo.MNavigationConfigVo;
+
+/**
+ * 底部菜单-全局导航配置Mapper接口
+ *
+ * @author LionLi
+ */
+public interface MNavigationConfigMapper extends BaseMapperPlus<MNavigationConfig, MNavigationConfigVo> {
+
+}

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IMBottomNavItemsService.java

@@ -0,0 +1,34 @@
+package org.dromara.mall.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.mall.domain.MBottomNavItems;
+import org.dromara.mall.domain.bo.MBottomNavItemsBo;
+import org.dromara.mall.domain.vo.MBottomNavItemsVo;
+
+import java.util.List;
+
+/**
+ * 底部菜单-底部导航菜单项Service接口
+ *
+ * @author LionLi
+ */
+public interface IMBottomNavItemsService extends IService<MBottomNavItems> {
+
+    /**
+     * 根据配置ID查询导航菜单项列表
+     *
+     * @param configId 配置ID
+     * @return 导航菜单项列表
+     */
+    List<MBottomNavItemsVo> queryListByConfigId(Long configId);
+
+    /**
+     * 批量保存菜单项
+     *
+     * @param configId 配置ID
+     * @param items    菜单项列表
+     * @return 是否保存成功
+     */
+    Boolean saveBatchByConfigId(Long configId, List<MBottomNavItemsBo> items);
+
+}

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/IMNavigationConfigService.java

@@ -0,0 +1,38 @@
+package org.dromara.mall.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.mall.domain.MNavigationConfig;
+import org.dromara.mall.domain.bo.MNavigationConfigBo;
+import org.dromara.mall.domain.vo.MNavigationConfigVo;
+
+/**
+ * 底部菜单-全局导航配置Service接口
+ *
+ * @author LionLi
+ */
+public interface IMNavigationConfigService extends IService<MNavigationConfig> {
+
+    /**
+     * 查询导航配置详细信息（包含菜单项）
+     *
+     * @param id 主键
+     * @return 导航配置详细信息
+     */
+    MNavigationConfigVo queryById(Long id);
+
+    /**
+     * 获取当前导航配置（如果没有则创建默认配置）
+     *
+     * @return 导航配置详细信息
+     */
+    MNavigationConfigVo getCurrentConfig();
+
+    /**
+     * 保存导航配置（包括配置和菜单项）
+     *
+     * @param bo 导航配置业务对象
+     * @return 是否保存成功
+     */
+    Boolean saveConfig(MNavigationConfigBo bo);
+
+}

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/MBottomNavItemsServiceImpl.java

@@ -0,0 +1,75 @@
+package org.dromara.mall.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.mall.domain.MBottomNavItems;
+import org.dromara.mall.domain.bo.MBottomNavItemsBo;
+import org.dromara.mall.domain.vo.MBottomNavItemsVo;
+import org.dromara.mall.mapper.MBottomNavItemsMapper;
+import org.dromara.mall.service.IMBottomNavItemsService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 底部菜单-底部导航菜单项Service业务层处理
+ *
+ * @author LionLi
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class MBottomNavItemsServiceImpl extends ServiceImpl<MBottomNavItemsMapper, MBottomNavItems> implements IMBottomNavItemsService {
+
+    private final MBottomNavItemsMapper baseMapper;
+
+    /**
+     * 根据配置ID查询导航菜单项列表
+     *
+     * @param configId 配置ID
+     * @return 导航菜单项列表
+     */
+    @Override
+    public List<MBottomNavItemsVo> queryListByConfigId(Long configId) {
+        LambdaQueryWrapper<MBottomNavItems> lqw = Wrappers.lambdaQuery();
+        lqw.eq(MBottomNavItems::getConfigId, configId);
+        lqw.orderByAsc(MBottomNavItems::getOrderIndex);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 批量保存菜单项
+     *
+     * @param configId 配置ID
+     * @param items    菜单项列表
+     * @return 是否保存成功
+     */
+    @Override
+    public Boolean saveBatchByConfigId(Long configId, List<MBottomNavItemsBo> items) {
+        // 先删除旧的菜单项
+        LambdaQueryWrapper<MBottomNavItems> lqw = Wrappers.lambdaQuery();
+        lqw.eq(MBottomNavItems::getConfigId, configId);
+        baseMapper.delete(lqw);
+
+        // 保存新的菜单项
+        if (items != null && !items.isEmpty()) {
+            List<MBottomNavItems> navItems = items.stream()
+                .map(item -> {
+                    MBottomNavItems navItem = MapstructUtils.convert(item, MBottomNavItems.class);
+                    navItem.setConfigId(configId);
+                    return navItem;
+                })
+                .collect(Collectors.toList());
+
+            return this.saveBatch(navItems);
+        }
+
+        return true;
+    }
+
+}

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/service/impl/MNavigationConfigServiceImpl.java

@@ -0,0 +1,128 @@
+package org.dromara.mall.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.mall.domain.MNavigationConfig;
+import org.dromara.mall.domain.bo.MNavigationConfigBo;
+import org.dromara.mall.domain.vo.MNavigationConfigVo;
+import org.dromara.mall.mapper.MNavigationConfigMapper;
+import org.dromara.mall.service.IMBottomNavItemsService;
+import org.dromara.mall.service.IMNavigationConfigService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 底部菜单-全局导航配置Service业务层处理
+ *
+ * @author LionLi
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class MNavigationConfigServiceImpl extends ServiceImpl<MNavigationConfigMapper, MNavigationConfig> implements IMNavigationConfigService {
+
+    private final MNavigationConfigMapper baseMapper;
+    private final IMBottomNavItemsService bottomNavItemsService;
+
+    /**
+     * 查询导航配置详细信息（包含菜单项）
+     *
+     * @param id 主键
+     * @return 导航配置详细信息
+     */
+    @Override
+    public MNavigationConfigVo queryById(Long id) {
+        MNavigationConfigVo vo = baseMapper.selectVoById(id);
+        if (vo != null) {
+            // 查询关联的菜单项
+            vo.setNavItems(bottomNavItemsService.queryListByConfigId(id));
+        }
+        return vo;
+    }
+
+    /**
+     * 获取当前导航配置（如果没有则创建默认配置）
+     *
+     * @return 导航配置详细信息
+     */
+    @Override
+    public MNavigationConfigVo getCurrentConfig() {
+        // 查询是否有配置
+        LambdaQueryWrapper<MNavigationConfig> lqw = Wrappers.lambdaQuery();
+        lqw.last("LIMIT 1");
+        MNavigationConfig config = baseMapper.selectOne(lqw);
+
+        if (config == null) {
+            // 如果没有配置，创建默认配置
+            config = createDefaultConfig();
+        }
+
+        MNavigationConfigVo vo = baseMapper.selectVoById(config.getId());
+        if (vo != null) {
+            // 查询关联的菜单项
+            vo.setNavItems(bottomNavItemsService.queryListByConfigId(vo.getId()));
+        }
+
+        return vo;
+    }
+
+    /**
+     * 保存导航配置（包括配置和菜单项）
+     *
+     * @param bo 导航配置业务对象
+     * @return 是否保存成功
+     */
+    @Override
+    public Boolean saveConfig(MNavigationConfigBo bo) {
+        MNavigationConfig update = MapstructUtils.convert(bo, MNavigationConfig.class);
+        validEntityBeforeSave(update);
+
+        boolean flag;
+        if (update.getId() != null) {
+            // 更新
+            flag = baseMapper.updateById(update) > 0;
+        } else {
+            // 新增
+            flag = baseMapper.insert(update) > 0;
+            if (flag) {
+                bo.setId(update.getId());
+            }
+        }
+
+        // 保存菜单项
+        if (flag && bo.getNavItems() != null && !bo.getNavItems().isEmpty()) {
+            // 转换navItems从Bo到Vo再到普通的item进行保存
+            // 这里需要将List<MBottomNavItemsBo>转换为List<MBottomNavItemsBo>
+            bottomNavItemsService.saveBatchByConfigId(update.getId() != null ? update.getId() : bo.getId(), bo.getNavItems());
+        }
+
+        return flag;
+    }
+
+    /**
+     * 创建默认配置
+     */
+    private MNavigationConfig createDefaultConfig() {
+        MNavigationConfig config = new MNavigationConfig();
+        config.setTopNavTextColor("black");
+        config.setTopNavBgColor("#FFFFFF");
+        config.setBottomNavBgColor("#FFFFFF");
+        config.setBottomNavTextColor("#666666");
+        config.setBottomNavSelectedColor("#00CC00");
+        config.setNavStyle("icon_text");
+
+        baseMapper.insert(config);
+        return config;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(MNavigationConfig entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+}

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/controller/OrderReturnController.java

@@ -112,4 +112,14 @@ public class OrderReturnController extends BaseController {
     public R<Void> changeReturnStatus(@RequestBody OrderReturnBo bo) {
         return toAjax(orderReturnService.updateReturnStatus(bo));
     }
+
+
+    /**
+     * 撤回申请
+     */
+    @Log(title = "退货主", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public R<Void> changeStatus(@RequestBody OrderReturnBo bo) {
+        return toAjax(orderReturnService.updateStatus(bo));
+    }
 }

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/controller/pc/PcOrderReturnController.java

@@ -142,4 +142,13 @@ public class PcOrderReturnController extends BaseController {
 
         return toAjax(orderReturnService.deleteWithValidByIds(List.of(ids), true));
     }
+
+    /**
+     * 撤回申请
+     */
+    @Log(title = "退货主", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public R<Void> changeStatus(@RequestBody OrderReturnBo bo) {
+        return toAjax(orderReturnService.updateStatus(bo));
+    }
 }

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/OrderReturn.java

@@ -203,7 +203,7 @@ public class OrderReturn extends TenantEntity {
     private String logisticsNo;
 
     /**
-     * 状态（0正常 1停用）
+     * 状态（0正常 1已撤回）
      */
     private String status;
 

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/IOrderReturnService.java

@@ -62,6 +62,13 @@ public interface IOrderReturnService extends IService<OrderReturn> {
     Boolean updateByBo(OrderReturnBo bo);
 
     int updateReturnStatus(OrderReturnBo bo);
+    /**
+     * 修改退货状态
+     *
+     * @param bo
+     * @return
+     */
+    int updateStatus(OrderReturnBo bo);
 
     /**
      * 校验并批量删除退货主信息

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/OrderAssignmentServiceImpl.java

@@ -9,10 +9,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.dromara.common.core.context.PlatformContext;
-import org.dromara.common.core.enums.AssigneeTypeConstants;
-import org.dromara.common.core.enums.OrderAssignStatus;
-import org.dromara.common.core.enums.OrderSplitStatus;
-import org.dromara.common.core.enums.SysPlatformCode;
+import org.dromara.common.core.enums.*;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.PlatformContextUtil;
@@ -523,7 +520,7 @@ public class OrderAssignmentServiceImpl extends ServiceImpl<OrderAssignmentMappe
         child.setOrderSource(parent.getOrderSource());
         child.setProductQuantity(parent.getProductQuantity());
         child.setQuantityShipped(parent.getQuantityShipped());
-        child.setOrderStatus(parent.getOrderStatus()); // 继承状态，后续由子订单独立流转
+        child.setOrderStatus(OrderStatus.PENDING_CONFIRMATION.getCode()); // 子订单状态初始化为待确认  被分配者需要重新确认
         child.setOrderTime(parent.getOrderTime());
         child.setConfirmTime(parent.getConfirmTime());
         child.setDeliveryType(parent.getDeliveryType());
@@ -532,7 +529,8 @@ public class OrderAssignmentServiceImpl extends ServiceImpl<OrderAssignmentMappe
         child.setDataSource(parent.getDataSource());
         child.setRemark(parent.getRemark());
         child.setAttachmentPath(parent.getAttachmentPath());
-
+        child.setCreateBy(parent.getCreateBy());
+        child.setCreateDept(parent.getCreateDept());
         // 新增分配字段
         child.setAssigneeId(assigneeId);
         child.setAssigneeType(assigneeType);

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/OrderReturnServiceImpl.java

@@ -319,6 +319,14 @@ public class OrderReturnServiceImpl extends ServiceImpl<OrderReturnMapper, Order
         return baseMapper.updateById(orderReturn);
     }
 
+    @Override
+    public int updateStatus(OrderReturnBo bo) {
+        OrderReturn orderReturn = new OrderReturn();
+        orderReturn.setId(bo.getId());
+        orderReturn.setStatus(bo.getStatus());
+        return baseMapper.updateById(orderReturn);
+    }
+
     /**
      * 保存前的数据校验
      */

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/controller/ProductPptTemplateController.java

@@ -0,0 +1,106 @@
+package org.dromara.product.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.product.domain.vo.ProductPptTemplateVo;
+import org.dromara.product.domain.bo.ProductPptTemplateBo;
+import org.dromara.product.service.IProductPptTemplateService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * PPT 模板库（公共底版）
+ * 前端访问路由地址为:/product/pptTemplate
+ *
+ * @author LionLi
+ * @date 2026-04-26
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/pptTemplate")
+public class ProductPptTemplateController extends BaseController {
+
+    private final IProductPptTemplateService productPptTemplateService;
+
+    /**
+     * 查询PPT 模板库（公共底版）列表
+     */
+    //@SaCheckPermission("product:pptTemplate:list")
+    @GetMapping("/list")
+    public TableDataInfo<ProductPptTemplateVo> list(ProductPptTemplateBo bo, PageQuery pageQuery) {
+        return productPptTemplateService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出PPT 模板库（公共底版）列表
+     */
+    //@SaCheckPermission("product:pptTemplate:export")
+    @Log(title = "PPT 模板库（公共底版）", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ProductPptTemplateBo bo, HttpServletResponse response) {
+        List<ProductPptTemplateVo> list = productPptTemplateService.queryList(bo);
+        ExcelUtil.exportExcel(list, "PPT 模板库（公共底版）", ProductPptTemplateVo.class, response);
+    }
+
+    /**
+     * 获取PPT 模板库（公共底版）详细信息
+     *
+     * @param id 主键
+     */
+    //@SaCheckPermission("product:pptTemplate:query")
+    @GetMapping("/{id}")
+    public R<ProductPptTemplateVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(productPptTemplateService.queryById(id));
+    }
+
+    /**
+     * 新增PPT 模板库（公共底版）
+     */
+    //@SaCheckPermission("product:pptTemplate:add")
+    @Log(title = "PPT 模板库（公共底版）", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ProductPptTemplateBo bo) {
+        return toAjax(productPptTemplateService.insertByBo(bo));
+    }
+
+    /**
+     * 修改PPT 模板库（公共底版）
+     */
+    //@SaCheckPermission("product:pptTemplate:edit")
+    @Log(title = "PPT 模板库（公共底版）", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProductPptTemplateBo bo) {
+        return toAjax(productPptTemplateService.updateByBo(bo));
+    }
+
+    /**
+     * 删除PPT 模板库（公共底版）
+     *
+     * @param ids 主键串
+     */
+    //@SaCheckPermission("product:pptTemplate:remove")
+    @Log(title = "PPT 模板库（公共底版）", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(productPptTemplateService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/controller/ProuctPptSchemeController.java

@@ -0,0 +1,115 @@
+package org.dromara.product.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.product.domain.vo.ProuctPptSchemeVo;
+import org.dromara.product.domain.bo.ProuctPptSchemeBo;
+import org.dromara.product.service.IProuctPptSchemeService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * PPT 方案主
+ * 前端访问路由地址为:/product/pptScheme
+ *
+ * @author LionLi
+ * @date 2026-04-26
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/pptScheme")
+public class ProuctPptSchemeController extends BaseController {
+
+    private final IProuctPptSchemeService prouctPptSchemeService;
+
+    /**
+     * 查询PPT 方案主列表
+     */
+    //@SaCheckPermission("product:pptScheme:list")
+    @GetMapping("/list")
+    public TableDataInfo<ProuctPptSchemeVo> list(ProuctPptSchemeBo bo, PageQuery pageQuery) {
+        return prouctPptSchemeService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出PPT 方案主列表
+     */
+    //@SaCheckPermission("product:pptScheme:export")
+    @Log(title = "PPT 方案主", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ProuctPptSchemeBo bo, HttpServletResponse response) {
+        List<ProuctPptSchemeVo> list = prouctPptSchemeService.queryList(bo);
+        ExcelUtil.exportExcel(list, "PPT 方案主", ProuctPptSchemeVo.class, response);
+    }
+
+    /**
+     * 获取PPT 方案主详细信息
+     *
+     * @param id 主键
+     */
+    //@SaCheckPermission("product:pptScheme:query")
+    @GetMapping("/{id}")
+    public R<ProuctPptSchemeVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(prouctPptSchemeService.queryById(id));
+    }
+
+    /**
+     * 新增PPT 方案主
+     */
+    //@SaCheckPermission("product:pptScheme:add")
+    @Log(title = "PPT 方案主", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ProuctPptSchemeBo bo) {
+        return toAjax(prouctPptSchemeService.insertByBo(bo));
+    }
+
+    /**
+     * 修改PPT 方案主
+     */
+    //@SaCheckPermission("product:pptScheme:edit")
+    @Log(title = "PPT 方案主", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ProuctPptSchemeBo bo) {
+        return toAjax(prouctPptSchemeService.updateByBo(bo));
+    }
+
+    /**
+     * 删除PPT 方案主
+     *
+     * @param ids 主键串
+     */
+    //@SaCheckPermission("product:pptScheme:remove")
+    @Log(title = "PPT 方案主", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(prouctPptSchemeService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    /**
+    * 分享方案
+    * */
+    @PostMapping("/share")
+    public R<Void> share(@RequestBody ProuctPptSchemeBo bo) {
+        prouctPptSchemeService.share(bo);
+        return R.ok();
+    }
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/controller/mini/MiniProductController.java

@@ -1,19 +1,24 @@
 package org.dromara.product.controller.mini;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.product.domain.ProductShoppingCart;
 import org.dromara.product.domain.bo.PcProductBo;
 import org.dromara.product.domain.bo.ProductBaseBo;
+import org.dromara.product.domain.bo.ProductShoppingCartBo;
 import org.dromara.product.domain.vo.PcProductVo;
 import org.dromara.product.domain.vo.ProductBaseVo;
 import org.dromara.product.service.IProductBaseService;
+import org.dromara.product.service.IProductShoppingCartService;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.Objects;
 
 /**
  * 首页
@@ -30,6 +35,9 @@ public class MiniProductController {
     //商品
     private final IProductBaseService productBaseService;
 
+    //购物车
+    private final IProductShoppingCartService productShoppingCartService;
+
     /**
      * 获取客户商品池的商品
      */
@@ -57,4 +65,81 @@ public class MiniProductController {
     public R<ProductBaseVo> getProductDetail(@PathVariable Long productId) {
         return R.ok(productBaseService.queryById(productId));
     }
+
+    /**
+     * mini将商品添加到购物车
+     */
+    @PostMapping("/addProductShoppingCart")
+    public R addProductShoppingCart(@RequestBody ProductShoppingCartBo bo) {
+        Long userId = LoginHelper.getUserId();
+        //校验是否存在库存和商品是否上架
+        ProductBaseVo productBaseVo = productBaseService.queryById(bo.getProductId());
+        if (!Objects.equals(productBaseVo.getProductStatus(), 1)) {
+            return R.fail("商品已下架");
+        }
+        if (productBaseVo.getTotalInventory() - bo.getProductNum() < 0) {
+            return R.fail("商品库存不足");
+        }
+        //查看是否存在同一个商品
+        ProductShoppingCart one = productShoppingCartService.getOne(Wrappers.lambdaQuery(ProductShoppingCart.class)
+            .eq(ProductShoppingCart::getUserId, userId)
+            .eq(ProductShoppingCart::getProductId, bo.getProductId())
+        );
+        if (one != null) {
+            one.setProductNum(one.getProductNum() + bo.getProductNum());
+            productShoppingCartService.updateById(one);
+            return R.ok();
+        } else {
+            bo.setUserId(userId);
+            productShoppingCartService.insertByBo(bo);
+        }
+        return R.ok();
+    }
+
+    /**
+     * mini更新购物车商品数量
+     * */
+    @PostMapping("/updateProductShoppingCart")
+    public R updateProductShoppingCart(@RequestBody ProductShoppingCartBo bo) {
+        productShoppingCartService.update(Wrappers.lambdaUpdate(ProductShoppingCart.class)
+            .eq(ProductShoppingCart::getUserId, LoginHelper.getUserId())
+            .eq(ProductShoppingCart::getProductId, bo.getProductId())
+            .set(ProductShoppingCart::getProductNum, bo.getProductNum())
+        );
+        return R.ok();
+    }
+
+    /**
+     * mini删除购物车商品
+     */
+    @DeleteMapping("/deleteProductShoppingCart/{ids}")
+    public R deleteProductShoppingCart(@PathVariable Long[] ids) {
+        productShoppingCartService.removeByIds(Arrays.asList(ids));
+        return R.ok();
+    }
+
+    /**
+     * mini查询购物车的商品
+     */
+    @GetMapping("/getProductShoppingCartPage")
+    public TableDataInfo<PcProductVo> getProductShoppingCartPage(String id, PageQuery pageQuery) {
+        return productBaseService.getProductShoppingCartPage(id, LoginHelper.getUserId(), pageQuery);
+    }
+
+    /**
+     * mini获取购物车商品未失效的商品数量
+     */
+    @GetMapping("/getProductShoppingCartCount")
+    public R getProductShoppingCartCount() {
+        return R.ok(productBaseService.getProductShoppingCartCount(LoginHelper.getUserId(), 0));
+    }
+
+    /**
+     *mini 协议供货商品列表
+     */
+    @GetMapping("/getAgreementSupplyProductPage")
+    public TableDataInfo<PcProductVo> getProtocolProductsPage(PcProductBo bo, PageQuery pageQuery) {
+        bo.setCustomerId(LoginHelper.getLoginUser().getCustomerId());
+        return productBaseService.getProtocolProductsPage(bo, pageQuery);
+    }
 }

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/controller/pc/MyProductController.java

@@ -157,7 +157,6 @@ public class MyProductController {
         productCollectService.remove(Wrappers.lambdaQuery(ProductCollect.class)
             .eq(ProductCollect::getUserId, LoginHelper.getUserId())
             .eq(ProductCollect::getProductId, bo.getProductId())
-            .eq(ProductCollect::getFavoritesId, bo.getFavoritesId())
         );
         return R.ok();
     }

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/ProductPptTemplate.java

@@ -0,0 +1,106 @@
+package org.dromara.product.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * PPT 模板库（公共底版）对象 product_ppt_template
+ *
+ * @author LionLi
+ * @date 2026-04-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("product_ppt_template")
+public class ProductPptTemplate extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 模板主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 模板名称（显示在列表）
+     */
+    private String name;
+
+    /**
+     * 封面底图（Base64 或 CDN URL）
+     */
+    private String cover;
+
+    /**
+     * 整篇主题色（Hex）
+     */
+    private String themeColor;
+
+    /**
+     * 商品排版模式：1简约 2交错 3明细
+     */
+    private Long itemsPerPage;
+
+    /**
+     * 品牌名称
+     */
+    private String brandName;
+
+    /**
+     * 品牌口号 Slogan
+     */
+    private String brandSlogan;
+
+    /**
+     * 官网地址
+     */
+    private String website;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 封面底部 Logo（Base64 或 URL）
+     */
+    private String coverLogo;
+
+    /**
+     * 内容页页眉 Logo（Base64 或 URL）
+     */
+    private String contentLogo;
+
+    /**
+     * 封面主标题（如：诞生珍礼，非你莫属）
+     */
+    private String coverTitle;
+
+    /**
+     * 封面副标题（如：卓越品质，专属定制）
+     */
+    private String coverSubTitle;
+
+    /**
+     * 内容页统一分类标题
+     */
+    private String contentTitle;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/ProuctPptScheme.java

@@ -0,0 +1,168 @@
+package org.dromara.product.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * PPT 方案主对象 prouct_ppt_scheme
+ *
+ * @author LionLi
+ * @date 2026-04-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("prouct_ppt_scheme")
+public class ProuctPptScheme extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 方案主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 方案名称（用户自定义）
+     */
+    private String name;
+
+    /**
+     * 选用的原始模板 ID（ppt_template.id），仅用于溯源
+     */
+    private Long templateId;
+
+    /**
+     * （快照）模板名称
+     */
+    private String tplName;
+
+    /**
+     * （快照）封面底图
+     */
+    private String tplCover;
+
+    /**
+     * （快照）封面 Logo
+     */
+    private String tplCoverLogo;
+
+    /**
+     * （快照）内容页 Logo
+     */
+    private String tplContentLogo;
+
+    /**
+     * （快照）主题色
+     */
+    private String tplThemeColor;
+
+    /**
+     * （快照）商品排版模式
+     */
+    private Long tplItemsPerPage;
+
+    /**
+     * （快照）封面主标题
+     */
+    private String tplCoverTitle;
+
+    /**
+     * （快照）封面副标题
+     */
+    private String tplCoverSubTitle;
+
+    /**
+     * （快照）方案截止日期，如：方案有效期：2026年12月31日
+     */
+    private String tplValidity;
+
+    /**
+     * （快照）品牌名称
+     */
+    private String tplBrandName;
+
+    /**
+     * （快照）品牌口号
+     */
+    private String tplBrandSlogan;
+
+    /**
+     * （快照）官网
+     */
+    private String tplWebsite;
+
+    /**
+     * （快照）电话
+     */
+    private String tplPhone;
+
+    /**
+     * （快照）内容页标题
+     */
+    private String tplContentTitle;
+
+    /**
+     * 方案归属者 user_id（可以是分享接收者）
+     */
+    private Long ownerId;
+
+    /**
+     * 是否公开：0私有 1公开（支撑"其他人创建"Tab）
+     */
+    private String isPublic;
+
+    /**
+     * 是否由他人分享而来：0否 1是（支撑"分享给我的"Tab）
+     */
+    private String isShared;
+
+    /**
+     * 来源方案 ID（从哪个原始方案分享过来的）
+     */
+    private Long sourceSchemeId;
+
+    /**
+     * 分享人 user_id
+     */
+    private Long sharerId;
+
+    /**
+     * 分享人姓名
+     */
+    private String sharerName;
+
+    /**
+     * 分享时间
+     */
+    private Date shareTime;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+    * 商品数据(json)
+    * */
+    private String productData;
+    /**
+    * 商品数量
+    * */
+    private Integer productNum;
+
+
+
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/bo/ProductBaseBo.java

@@ -374,6 +374,11 @@ public class ProductBaseBo extends BaseEntity {
      */
     private Long minOrderQuantity;
 
+    /**
+    * 产品描述
+    * */
+    private String productDescription;
+
     /**
      * 是否可定制
      */

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/bo/ProductPptTemplateBo.java

@@ -0,0 +1,118 @@
+package org.dromara.product.domain.bo;
+
+import org.dromara.product.domain.ProductPptTemplate;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * PPT 模板库（公共底版）业务对象 product_ppt_template
+ *
+ * @author LionLi
+ * @date 2026-04-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ProductPptTemplate.class, reverseConvertGenerate = false)
+public class ProductPptTemplateBo extends BaseEntity {
+
+    /**
+     * 模板主键
+     */
+    private Long id;
+
+    /**
+     * 模板名称（显示在列表）
+     */
+    private String name;
+
+    /**
+     * 封面底图（Base64 或 CDN URL）
+     */
+    //@NotBlank(message = "封面底图（Base64 或 CDN URL）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String cover;
+
+    /**
+     * 整篇主题色（Hex）
+     */
+    //@NotBlank(message = "整篇主题色（Hex）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String themeColor;
+
+    /**
+     * 商品排版模式：1简约 2交错 3明细
+     */
+    //@NotNull(message = "商品排版模式：1简约 2交错 3明细不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long itemsPerPage;
+
+    /**
+     * 品牌名称
+     */
+    //@NotBlank(message = "品牌名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String brandName;
+
+    /**
+     * 品牌口号 Slogan
+     */
+    //@NotBlank(message = "品牌口号 Slogan不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String brandSlogan;
+
+    /**
+     * 官网地址
+     */
+    //@NotBlank(message = "官网地址不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String website;
+
+    /**
+     * 联系电话
+     */
+    //@NotBlank(message = "联系电话不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String phone;
+
+    /**
+     * 封面底部 Logo（Base64 或 URL）
+     */
+    //@NotBlank(message = "封面底部 Logo（Base64 或 URL）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String coverLogo;
+
+    /**
+     * 内容页页眉 Logo（Base64 或 URL）
+     */
+    //@NotBlank(message = "内容页页眉 Logo（Base64 或 URL）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String contentLogo;
+
+    /**
+     * 封面主标题（如：诞生珍礼，非你莫属）
+     */
+    //@NotBlank(message = "封面主标题（如：诞生珍礼，非你莫属）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String coverTitle;
+
+    /**
+     * 封面副标题（如：卓越品质，专属定制）
+     */
+    //@NotBlank(message = "封面副标题（如：卓越品质，专属定制）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String coverSubTitle;
+
+    /**
+     * 内容页统一分类标题
+     */
+    //@NotBlank(message = "内容页统一分类标题不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String contentTitle;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    //@NotBlank(message = "状态（0正常 1停用）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String status;
+
+    /**
+     * 备注
+     */
+    //@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/bo/ProuctPptSchemeBo.java

@@ -0,0 +1,196 @@
+package org.dromara.product.domain.bo;
+
+import org.dromara.product.domain.ProuctPptScheme;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * PPT 方案主业务对象 prouct_ppt_scheme
+ *
+ * @author LionLi
+ * @date 2026-04-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ProuctPptScheme.class, reverseConvertGenerate = false)
+public class ProuctPptSchemeBo extends BaseEntity {
+
+    /**
+     * 方案主键
+     */
+    private Long id;
+
+    /**
+     * 方案名称（用户自定义）
+     */
+    private String name;
+
+    /**
+     * 选用的原始模板 ID（ppt_template.id），仅用于溯源
+     */
+    private Long templateId;
+
+    /**
+     * （快照）模板名称
+     */
+    //@NotBlank(message = "（快照）模板名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tplName;
+
+    /**
+     * （快照）封面底图
+     */
+    //@NotBlank(message = "（快照）封面底图不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tplCover;
+
+    /**
+     * （快照）封面 Logo
+     */
+    //@NotBlank(message = "（快照）封面 Logo不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tplCoverLogo;
+
+    /**
+     * （快照）内容页 Logo
+     */
+    //@NotBlank(message = "（快照）内容页 Logo不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tplContentLogo;
+
+    /**
+     * （快照）主题色
+     */
+    //@NotBlank(message = "（快照）主题色不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tplThemeColor;
+
+    /**
+     * （快照）商品排版模式
+     */
+    //@NotNull(message = "（快照）商品排版模式不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long tplItemsPerPage;
+
+    /**
+     * （快照）封面主标题
+     */
+    //@NotBlank(message = "（快照）封面主标题不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tplCoverTitle;
+
+    /**
+     * （快照）封面副标题
+     */
+    //@NotBlank(message = "（快照）封面副标题不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tplCoverSubTitle;
+
+    /**
+     * （快照）方案截止日期，如：方案有效期：2026年12月31日
+     */
+    //@NotBlank(message = "（快照）方案截止日期，如：方案有效期：2026年12月31日不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tplValidity;
+
+    /**
+     * （快照）品牌名称
+     */
+    //@NotBlank(message = "（快照）品牌名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tplBrandName;
+
+    /**
+     * （快照）品牌口号
+     */
+    //@NotBlank(message = "（快照）品牌口号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tplBrandSlogan;
+
+    /**
+     * （快照）官网
+     */
+    //@NotBlank(message = "（快照）官网不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tplWebsite;
+
+    /**
+     * （快照）电话
+     */
+    //@NotBlank(message = "（快照）电话不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tplPhone;
+
+    /**
+     * （快照）内容页标题
+     */
+    //@NotBlank(message = "（快照）内容页标题不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tplContentTitle;
+
+    /**
+     * 方案归属者 user_id（可以是分享接收者）
+     */
+    private Long ownerId;
+
+    /**
+     * 是否公开：0私有 1公开（支撑"其他人创建"Tab）
+     */
+    //@NotBlank(message = "是否公开：0私有 1公开（支撑"其他人创建"Tab）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String isPublic;
+
+    /**
+     * 是否由他人分享而来：0否 1是（支撑"分享给我的"Tab）
+     */
+    //@NotBlank(message = "是否由他人分享而来：0否 1是（支撑"分享给我的"Tab）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String isShared;
+
+    /**
+     * 来源方案 ID（从哪个原始方案分享过来的）
+     */
+    //@NotNull(message = "来源方案 ID（从哪个原始方案分享过来的）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long sourceSchemeId;
+
+    /**
+     * 分享人 user_id
+     */
+    //@NotNull(message = "分享人 user_id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long sharerId;
+
+    /**
+     * 分享人姓名
+     */
+    //@NotBlank(message = "分享人姓名不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String sharerName;
+
+    /**
+     * 分享时间
+     */
+    //@NotNull(message = "分享时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date shareTime;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    //@NotBlank(message = "状态（0正常 1停用）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String status;
+
+    /**
+     * 备注
+     */
+    //@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+    /**
+    * 被分享者
+    * */
+    private List<Long> userIds;
+
+    private List<Long> productIds;
+
+    /**
+     * 商品数据(json)
+     * */
+    private String productData;
+    /**
+     * 商品数量
+     * */
+    private Integer productNum;
+
+
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/vo/ProductBaseVo.java

@@ -440,6 +440,11 @@ public class ProductBaseVo implements Serializable {
      * */
     private Long virtualInventory;
 
+    /**
+     * 产品描述
+     * */
+    private String productDescription;
+
 
     /**
      * 定制说明

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/vo/ProductPptTemplateVo.java

@@ -0,0 +1,136 @@
+package org.dromara.product.domain.vo;
+
+import org.dromara.product.domain.ProductPptTemplate;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * PPT 模板库（公共底版）视图对象 product_ppt_template
+ *
+ * @author LionLi
+ * @date 2026-04-26
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ProductPptTemplate.class)
+public class ProductPptTemplateVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 模板主键
+     */
+    @ExcelProperty(value = "模板主键")
+    private Long id;
+
+    /**
+     * 模板名称（显示在列表）
+     */
+    @ExcelProperty(value = "模板名称", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "显=示在列表")
+    private String name;
+
+    /**
+     * 封面底图（Base64 或 CDN URL）
+     */
+    @ExcelProperty(value = "封面底图", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "B=ase64,或=,C=DN,U=RL")
+    private String cover;
+
+    /**
+     * 整篇主题色（Hex）
+     */
+    @ExcelProperty(value = "整篇主题色", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "H=ex")
+    private String themeColor;
+
+    /**
+     * 商品排版模式：1简约 2交错 3明细
+     */
+    @ExcelProperty(value = "商品排版模式：1简约 2交错 3明细")
+    private Long itemsPerPage;
+
+    /**
+     * 品牌名称
+     */
+    @ExcelProperty(value = "品牌名称")
+    private String brandName;
+
+    /**
+     * 品牌口号 Slogan
+     */
+    @ExcelProperty(value = "品牌口号 Slogan")
+    private String brandSlogan;
+
+    /**
+     * 官网地址
+     */
+    @ExcelProperty(value = "官网地址")
+    private String website;
+
+    /**
+     * 联系电话
+     */
+    @ExcelProperty(value = "联系电话")
+    private String phone;
+
+    /**
+     * 封面底部 Logo（Base64 或 URL）
+     */
+    @ExcelProperty(value = "封面底部 Logo", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "B=ase64,或=,U=RL")
+    private String coverLogo;
+
+    /**
+     * 内容页页眉 Logo（Base64 或 URL）
+     */
+    @ExcelProperty(value = "内容页页眉 Logo", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "B=ase64,或=,U=RL")
+    private String contentLogo;
+
+    /**
+     * 封面主标题（如：诞生珍礼，非你莫属）
+     */
+    @ExcelProperty(value = "封面主标题", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "如=：诞生珍礼，非你莫属")
+    private String coverTitle;
+
+    /**
+     * 封面副标题（如：卓越品质，专属定制）
+     */
+    @ExcelProperty(value = "封面副标题", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "如=：卓越品质，专属定制")
+    private String coverSubTitle;
+
+    /**
+     * 内容页统一分类标题
+     */
+    @ExcelProperty(value = "内容页统一分类标题")
+    private String contentTitle;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/domain/vo/ProuctPptSchemeVo.java

@@ -0,0 +1,217 @@
+package org.dromara.product.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.product.domain.ProuctPptScheme;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * PPT 方案主视图对象 prouct_ppt_scheme
+ *
+ * @author LionLi
+ * @date 2026-04-26
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ProuctPptScheme.class)
+public class ProuctPptSchemeVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 方案主键
+     */
+    @ExcelProperty(value = "方案主键")
+    private Long id;
+
+    /**
+     * 方案名称（用户自定义）
+     */
+    @ExcelProperty(value = "方案名称", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "用=户自定义")
+    private String name;
+
+    /**
+     * 选用的原始模板 ID（ppt_template.id），仅用于溯源
+     */
+    @ExcelProperty(value = "选用的原始模板 ID", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "p=pt_template.id")
+    private Long templateId;
+
+    /**
+     * （快照）模板名称
+     */
+    @ExcelProperty(value = "", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=照")
+    private String tplName;
+
+    /**
+     * （快照）封面底图
+     */
+    @ExcelProperty(value = "", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=照")
+    private String tplCover;
+
+    /**
+     * （快照）封面 Logo
+     */
+    @ExcelProperty(value = "", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=照")
+    private String tplCoverLogo;
+
+    /**
+     * （快照）内容页 Logo
+     */
+    @ExcelProperty(value = "", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=照")
+    private String tplContentLogo;
+
+    /**
+     * （快照）主题色
+     */
+    @ExcelProperty(value = "", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=照")
+    private String tplThemeColor;
+
+    /**
+     * （快照）商品排版模式
+     */
+    @ExcelProperty(value = "", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=照")
+    private Long tplItemsPerPage;
+
+    /**
+     * （快照）封面主标题
+     */
+    @ExcelProperty(value = "", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=照")
+    private String tplCoverTitle;
+
+    /**
+     * （快照）封面副标题
+     */
+    @ExcelProperty(value = "", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=照")
+    private String tplCoverSubTitle;
+
+    /**
+     * （快照）方案截止日期，如：方案有效期：2026年12月31日
+     */
+    @ExcelProperty(value = "", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=照")
+    private String tplValidity;
+
+    /**
+     * （快照）品牌名称
+     */
+    @ExcelProperty(value = "", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=照")
+    private String tplBrandName;
+
+    /**
+     * （快照）品牌口号
+     */
+    @ExcelProperty(value = "", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=照")
+    private String tplBrandSlogan;
+
+    /**
+     * （快照）官网
+     */
+    @ExcelProperty(value = "", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=照")
+    private String tplWebsite;
+
+    /**
+     * （快照）电话
+     */
+    @ExcelProperty(value = "", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=照")
+    private String tplPhone;
+
+    /**
+     * （快照）内容页标题
+     */
+    @ExcelProperty(value = "", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=照")
+    private String tplContentTitle;
+
+    /**
+     * 方案归属者 user_id（可以是分享接收者）
+     */
+    @ExcelProperty(value = "方案归属者 user_id", converter = ExcelDictConvert.class)
+    private Long ownerId;
+
+    /**
+     * 是否公开：0私有 1公开（支撑"其他人创建"Tab）
+     */
+    @ExcelProperty(value = "是否公开：0私有 1公开", converter = ExcelDictConvert.class)
+    private String isPublic;
+
+    /**
+     * 是否由他人分享而来：0否 1是（支撑"分享给我的"Tab）
+     */
+    @ExcelProperty(value = "是否由他人分享而来：0否 1是", converter = ExcelDictConvert.class)
+    private String isShared;
+
+    /**
+     * 来源方案 ID（从哪个原始方案分享过来的）
+     */
+    @ExcelProperty(value = "来源方案 ID", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "从=哪个原始方案分享过来的")
+    private Long sourceSchemeId;
+
+    /**
+     * 分享人 user_id
+     */
+    @ExcelProperty(value = "分享人 user_id")
+    private Long sharerId;
+
+    /**
+     * 分享人姓名
+     */
+    @ExcelProperty(value = "分享人姓名")
+    private String sharerName;
+
+    /**
+     * 分享时间
+     */
+    @ExcelProperty(value = "分享时间")
+    private Date shareTime;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 商品数据(json)
+     * */
+    private String productData;
+    /**
+     * 商品数量
+     * */
+    private Integer productNum;
+
+
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/mapper/ProductPptTemplateMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.product.mapper;
+
+import org.dromara.product.domain.ProductPptTemplate;
+import org.dromara.product.domain.vo.ProductPptTemplateVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * PPT 模板库（公共底版）Mapper接口
+ *
+ * @author LionLi
+ * @date 2026-04-26
+ */
+public interface ProductPptTemplateMapper extends BaseMapperPlus<ProductPptTemplate, ProductPptTemplateVo> {
+
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/mapper/ProuctPptSchemeMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.product.mapper;
+
+import org.dromara.product.domain.ProuctPptScheme;
+import org.dromara.product.domain.vo.ProuctPptSchemeVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * PPT 方案主Mapper接口
+ *
+ * @author LionLi
+ * @date 2026-04-26
+ */
+public interface ProuctPptSchemeMapper extends BaseMapperPlus<ProuctPptScheme, ProuctPptSchemeVo> {
+
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/service/IProductPptTemplateService.java

@@ -0,0 +1,70 @@
+package org.dromara.product.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.product.domain.ProductPptTemplate;
+import org.dromara.product.domain.vo.ProductPptTemplateVo;
+import org.dromara.product.domain.bo.ProductPptTemplateBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * PPT 模板库（公共底版）Service接口
+ *
+ * @author LionLi
+ * @date 2026-04-26
+ */
+public interface IProductPptTemplateService extends IService<ProductPptTemplate>{
+
+    /**
+     * 查询PPT 模板库（公共底版）
+     *
+     * @param id 主键
+     * @return PPT 模板库（公共底版）
+     */
+    ProductPptTemplateVo queryById(Long id);
+
+    /**
+     * 分页查询PPT 模板库（公共底版）列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return PPT 模板库（公共底版）分页列表
+     */
+    TableDataInfo<ProductPptTemplateVo> queryPageList(ProductPptTemplateBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的PPT 模板库（公共底版）列表
+     *
+     * @param bo 查询条件
+     * @return PPT 模板库（公共底版）列表
+     */
+    List<ProductPptTemplateVo> queryList(ProductPptTemplateBo bo);
+
+    /**
+     * 新增PPT 模板库（公共底版）
+     *
+     * @param bo PPT 模板库（公共底版）
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(ProductPptTemplateBo bo);
+
+    /**
+     * 修改PPT 模板库（公共底版）
+     *
+     * @param bo PPT 模板库（公共底版）
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(ProductPptTemplateBo bo);
+
+    /**
+     * 校验并批量删除PPT 模板库（公共底版）信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/service/IProuctPptSchemeService.java

@@ -0,0 +1,75 @@
+package org.dromara.product.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.product.domain.ProuctPptScheme;
+import org.dromara.product.domain.vo.ProuctPptSchemeVo;
+import org.dromara.product.domain.bo.ProuctPptSchemeBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * PPT 方案主Service接口
+ *
+ * @author LionLi
+ * @date 2026-04-26
+ */
+public interface IProuctPptSchemeService extends IService<ProuctPptScheme>{
+
+    /**
+     * 查询PPT 方案主
+     *
+     * @param id 主键
+     * @return PPT 方案主
+     */
+    ProuctPptSchemeVo queryById(Long id);
+
+    /**
+     * 分页查询PPT 方案主列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return PPT 方案主分页列表
+     */
+    TableDataInfo<ProuctPptSchemeVo> queryPageList(ProuctPptSchemeBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的PPT 方案主列表
+     *
+     * @param bo 查询条件
+     * @return PPT 方案主列表
+     */
+    List<ProuctPptSchemeVo> queryList(ProuctPptSchemeBo bo);
+
+    /**
+     * 新增PPT 方案主
+     *
+     * @param bo PPT 方案主
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(ProuctPptSchemeBo bo);
+
+    /**
+     * 修改PPT 方案主
+     *
+     * @param bo PPT 方案主
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(ProuctPptSchemeBo bo);
+
+    /**
+     * 校验并批量删除PPT 方案主信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+    * 分享方案
+    * */
+    void share(ProuctPptSchemeBo bo);
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/service/impl/ProductAttributesServiceImpl.java

@@ -2,6 +2,7 @@ package org.dromara.product.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -124,7 +125,21 @@ public class ProductAttributesServiceImpl  extends ServiceImpl<ProductAttributes
      * 保存前的数据校验
      */
     private void validEntityBeforeSave(ProductAttributes entity){
-        //TODO 做一些数据校验,如唯一约束
+        // 校验同一分类下是否存在相同属性名称的属性
+        if (entity.getCategoryId() != null && entity.getProductAttributesName() != null) {
+            LambdaQueryWrapper<ProductAttributes> lqw = Wrappers.lambdaQuery();
+            lqw.ne(ObjectUtil.isNotEmpty(entity.getId()), ProductAttributes::getId, entity.getId());
+            lqw.eq(ProductAttributes::getCategoryId, entity.getCategoryId());
+            lqw.eq(ProductAttributes::getProductAttributesName, entity.getProductAttributesName());
+            // 编辑时排除当前记录
+            if (entity.getId() != null) {
+                lqw.ne(ProductAttributes::getId, entity.getId());
+            }
+            long count = baseMapper.selectCount(lqw);
+            if (count > 0) {
+                throw new ServiceException("同一分类下请不要添加相同属性");
+            }
+        }
     }
 
     /**

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/service/impl/ProductBaseAuditServiceImpl.java

@@ -193,6 +193,7 @@ public class ProductBaseAuditServiceImpl extends ServiceImpl<ProductBaseAuditMap
     public Boolean insertByBo(ProductBaseAuditBo bo) {
         ProductBaseAudit add = MapstructUtils.convert(bo, ProductBaseAudit.class);
         LoginUser loginUser = LoginHelper.getLoginUser();
+        add.setId(null);
         if(ObjectUtil.isNotEmpty(loginUser.getSupplierId())){
             add.setCreateById(loginUser.getSupplierId());
             add.setCreateByType(1);

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/service/impl/ProductBaseServiceImpl.java

@@ -39,6 +39,7 @@ import org.dromara.product.domain.ProductClassification;
 import org.dromara.product.domain.ProductCustomization;
 import org.dromara.product.service.IProductBaseService;
 
+import java.math.RoundingMode;
 import java.util.*;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -265,6 +266,7 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
             vo.setProductNature(extend.getPurchaseManagerNo());
             vo.setPurchasingPersonnel(extend.getPurchaseNo());
             vo.setSupplierNo(extend.getSupplierNo());
+            vo.setProductDescription(extend.getProductDescription());
         }
 
         // 3. 查询并填充价格库存信息（product_price_inventory表）
@@ -511,16 +513,16 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
             //价格区间 1:1-100 2:100-500 3:500-1000 4:1000以上
             switch (bo.getPriceRange()) {
                 case "1":
-                    wrapper.between(ProductBaseVo::getMemberPrice, 1, 100);
+                    wrapper.between(ProductBaseVo::getMemberPrice, "1", "100");
                     break;
                 case "2":
-                    wrapper.between(ProductBaseVo::getMemberPrice, 100, 500);
+                    wrapper.between(ProductBaseVo::getMemberPrice, "100", "500");
                     break;
                 case "3":
-                    wrapper.between(ProductBaseVo::getMemberPrice, 500, 1000);
+                    wrapper.between(ProductBaseVo::getMemberPrice, "500", "1000");
                     break;
                 case "4":
-                    wrapper.ge(ProductBaseVo::getMemberPrice, 1000);
+                    wrapper.ge(ProductBaseVo::getMemberPrice, "1000");
                     break;
             }
         }
@@ -647,7 +649,7 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
     private void saveProductDetail(ProductBaseBo bo, Long productId) {
         ProductPhotos productPhotos= new ProductPhotos();
         productPhotos.setProductId(productId);
-        productPhotos.setImageUrl(bo.getProductImage());
+        productPhotos.setImageUrl(bo.getImageUrl());
         productPhotos.setProductDetailsPc(bo.getPcDetail());
         productPhotos.setProductDetailsApp(bo.getMobileDetail());
         photosMapper.insert(productPhotos);
@@ -788,6 +790,7 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
         extend.setShelfComments(bo.getShelfComments());
         extend.setPurchaseManagerNo(bo.getProductNature());
         extend.setPurchaseNo(bo.getPurchasingPersonnel());
+        extend.setProductDescription(bo.getProductDescription());
         extendMapper.insert(extend);
     }
 
@@ -871,6 +874,7 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
             if (bo.getProductNature() != null) existing.setPurchaseManagerNo(bo.getProductNature());
             if (bo.getPurchasingPersonnel() != null) existing.setPurchaseNo(bo.getPurchasingPersonnel());
             if (bo.getSupplierNo() != null) existing.setSupplierNo(bo.getSupplierNo());
+            if (bo.getProductDescription() != null) existing.setProductDescription(bo.getProductDescription());
             extendMapper.updateById(existing);
         } else {
             // 不存在则新增
@@ -1519,13 +1523,13 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
             //价格区间 1:1-100 2:100-500 3:500-1000 4:1000以上
             switch (bo.getPriceRange()) {
                 case "1":
-                    lqw.between("b.market_price", 1, 100);
+                    lqw.between("p.market_price", 1, 100);
                 case "2":
-                    lqw.between("b.market_price", 100, 500);
+                    lqw.between("p.market_price", 100, 500);
                 case "3":
-                    lqw.between("b.market_price", 500, 1000);
+                    lqw.between("p.market_price", 500, 1000);
                 case "4":
-                    lqw.ge("b.market_price", 1000);
+                    lqw.ge("p.market_price", 1000);
             }
         }
         if(bo.getSortField() != null && bo.getSortOrder() != null){
@@ -1542,7 +1546,6 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
                 }
             }
         }
-        lqw.select("b.id","b.product_image","p.market_price","p.member_price","p.min_selling_price","p.min_order_quantity","b.item_name","u.unit_name");
 
         // 使用ES分页查询
         try {
@@ -1571,6 +1574,15 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
         return TableDataInfo.build();
     }
 
+    public static void main(String[] args) {
+        Date oldPlanStartAt = DateUtil.parse("2026-03-18 00:00:00");
+        Date oldPlanEndAt = DateUtil.parse("2026-04-18 00:00:00");
+        BigDecimal time = BigDecimal.valueOf(DateUtil.betweenDay(oldPlanStartAt, oldPlanEndAt, true) + 1);
+        BigDecimal priceAvgLease = BigDecimal.valueOf(549.90).divide(time, 2, RoundingMode.HALF_UP);
+
+        System.out.println(priceAvgLease);
+    }
+
     /**
      * PC端商品浏览记录
      *

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/service/impl/ProductPptTemplateServiceImpl.java

@@ -0,0 +1,147 @@
+package org.dromara.product.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.dromara.product.domain.bo.ProductPptTemplateBo;
+import org.dromara.product.domain.vo.ProductPptTemplateVo;
+import org.dromara.product.domain.ProductPptTemplate;
+import org.dromara.product.mapper.ProductPptTemplateMapper;
+import org.dromara.product.service.IProductPptTemplateService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * PPT 模板库（公共底版）Service业务层处理
+ *
+ * @author LionLi
+ * @date 2026-04-26
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class ProductPptTemplateServiceImpl  extends ServiceImpl<ProductPptTemplateMapper, ProductPptTemplate> implements IProductPptTemplateService {
+
+    private final ProductPptTemplateMapper baseMapper;
+
+    /**
+     * 查询PPT 模板库（公共底版）
+     *
+     * @param id 主键
+     * @return PPT 模板库（公共底版）
+     */
+    @Override
+    public ProductPptTemplateVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询PPT 模板库（公共底版）列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return PPT 模板库（公共底版）分页列表
+     */
+    @Override
+    public TableDataInfo<ProductPptTemplateVo> queryPageList(ProductPptTemplateBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ProductPptTemplate> lqw = buildQueryWrapper(bo);
+        Page<ProductPptTemplateVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的PPT 模板库（公共底版）列表
+     *
+     * @param bo 查询条件
+     * @return PPT 模板库（公共底版）列表
+     */
+    @Override
+    public List<ProductPptTemplateVo> queryList(ProductPptTemplateBo bo) {
+        LambdaQueryWrapper<ProductPptTemplate> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ProductPptTemplate> buildQueryWrapper(ProductPptTemplateBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<ProductPptTemplate> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(ProductPptTemplate::getId);
+        lqw.like(StringUtils.isNotBlank(bo.getName()), ProductPptTemplate::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getCover()), ProductPptTemplate::getCover, bo.getCover());
+        lqw.eq(StringUtils.isNotBlank(bo.getThemeColor()), ProductPptTemplate::getThemeColor, bo.getThemeColor());
+        lqw.eq(bo.getItemsPerPage() != null, ProductPptTemplate::getItemsPerPage, bo.getItemsPerPage());
+        lqw.like(StringUtils.isNotBlank(bo.getBrandName()), ProductPptTemplate::getBrandName, bo.getBrandName());
+        lqw.eq(StringUtils.isNotBlank(bo.getBrandSlogan()), ProductPptTemplate::getBrandSlogan, bo.getBrandSlogan());
+        lqw.eq(StringUtils.isNotBlank(bo.getWebsite()), ProductPptTemplate::getWebsite, bo.getWebsite());
+        lqw.eq(StringUtils.isNotBlank(bo.getPhone()), ProductPptTemplate::getPhone, bo.getPhone());
+        lqw.eq(StringUtils.isNotBlank(bo.getCoverLogo()), ProductPptTemplate::getCoverLogo, bo.getCoverLogo());
+        lqw.eq(StringUtils.isNotBlank(bo.getContentLogo()), ProductPptTemplate::getContentLogo, bo.getContentLogo());
+        lqw.eq(StringUtils.isNotBlank(bo.getCoverTitle()), ProductPptTemplate::getCoverTitle, bo.getCoverTitle());
+        lqw.eq(StringUtils.isNotBlank(bo.getCoverSubTitle()), ProductPptTemplate::getCoverSubTitle, bo.getCoverSubTitle());
+        lqw.eq(StringUtils.isNotBlank(bo.getContentTitle()), ProductPptTemplate::getContentTitle, bo.getContentTitle());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), ProductPptTemplate::getStatus, bo.getStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getPlatformCode()), ProductPptTemplate::getPlatformCode, bo.getPlatformCode());
+        return lqw;
+    }
+
+    /**
+     * 新增PPT 模板库（公共底版）
+     *
+     * @param bo PPT 模板库（公共底版）
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(ProductPptTemplateBo bo) {
+        ProductPptTemplate add = MapstructUtils.convert(bo, ProductPptTemplate.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改PPT 模板库（公共底版）
+     *
+     * @param bo PPT 模板库（公共底版）
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(ProductPptTemplateBo bo) {
+        ProductPptTemplate update = MapstructUtils.convert(bo, ProductPptTemplate.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ProductPptTemplate entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除PPT 模板库（公共底版）信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-product/src/main/java/org/dromara/product/service/impl/ProuctPptSchemeServiceImpl.java

@@ -0,0 +1,220 @@
+package org.dromara.product.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.product.domain.ProductBase;
+import org.dromara.product.domain.vo.ProductBaseVo;
+import org.dromara.product.mapper.ProductBaseMapper;
+import org.dromara.product.service.IProductBaseService;
+import org.dromara.system.api.RemoteUserService;
+import org.dromara.system.api.domain.vo.RemoteUserVo;
+import org.springframework.stereotype.Service;
+import org.dromara.product.domain.bo.ProuctPptSchemeBo;
+import org.dromara.product.domain.vo.ProuctPptSchemeVo;
+import org.dromara.product.domain.ProuctPptScheme;
+import org.dromara.product.mapper.ProuctPptSchemeMapper;
+import org.dromara.product.service.IProuctPptSchemeService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+/**
+ * PPT 方案主Service业务层处理
+ *
+ * @author LionLi
+ * @date 2026-04-26
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class ProuctPptSchemeServiceImpl  extends ServiceImpl<ProuctPptSchemeMapper, ProuctPptScheme> implements IProuctPptSchemeService {
+
+    private final ProuctPptSchemeMapper baseMapper;
+
+    private final IProductBaseService productBaseService;
+    @DubboReference
+    private RemoteUserService remoteUserService;
+
+
+    /**
+     * 查询PPT 方案主
+     *
+     * @param id 主键
+     * @return PPT 方案主
+     */
+    @Override
+    public ProuctPptSchemeVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询PPT 方案主列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return PPT 方案主分页列表
+     */
+    @Override
+    public TableDataInfo<ProuctPptSchemeVo> queryPageList(ProuctPptSchemeBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ProuctPptScheme> lqw = buildQueryWrapper(bo);
+        Page<ProuctPptSchemeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的PPT 方案主列表
+     *
+     * @param bo 查询条件
+     * @return PPT 方案主列表
+     */
+    @Override
+    public List<ProuctPptSchemeVo> queryList(ProuctPptSchemeBo bo) {
+        LambdaQueryWrapper<ProuctPptScheme> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ProuctPptScheme> buildQueryWrapper(ProuctPptSchemeBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<ProuctPptScheme> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ProuctPptScheme::getId);
+        lqw.like(StringUtils.isNotBlank(bo.getName()), ProuctPptScheme::getName, bo.getName());
+        lqw.eq(bo.getTemplateId() != null, ProuctPptScheme::getTemplateId, bo.getTemplateId());
+        lqw.like(StringUtils.isNotBlank(bo.getTplName()), ProuctPptScheme::getTplName, bo.getTplName());
+        lqw.eq(StringUtils.isNotBlank(bo.getTplCover()), ProuctPptScheme::getTplCover, bo.getTplCover());
+        lqw.eq(StringUtils.isNotBlank(bo.getTplCoverLogo()), ProuctPptScheme::getTplCoverLogo, bo.getTplCoverLogo());
+        lqw.eq(StringUtils.isNotBlank(bo.getTplContentLogo()), ProuctPptScheme::getTplContentLogo, bo.getTplContentLogo());
+        lqw.eq(StringUtils.isNotBlank(bo.getTplThemeColor()), ProuctPptScheme::getTplThemeColor, bo.getTplThemeColor());
+        lqw.eq(bo.getTplItemsPerPage() != null, ProuctPptScheme::getTplItemsPerPage, bo.getTplItemsPerPage());
+        lqw.eq(StringUtils.isNotBlank(bo.getTplCoverTitle()), ProuctPptScheme::getTplCoverTitle, bo.getTplCoverTitle());
+        lqw.eq(StringUtils.isNotBlank(bo.getTplCoverSubTitle()), ProuctPptScheme::getTplCoverSubTitle, bo.getTplCoverSubTitle());
+        lqw.eq(StringUtils.isNotBlank(bo.getTplValidity()), ProuctPptScheme::getTplValidity, bo.getTplValidity());
+        lqw.like(StringUtils.isNotBlank(bo.getTplBrandName()), ProuctPptScheme::getTplBrandName, bo.getTplBrandName());
+        lqw.eq(StringUtils.isNotBlank(bo.getTplBrandSlogan()), ProuctPptScheme::getTplBrandSlogan, bo.getTplBrandSlogan());
+        lqw.eq(StringUtils.isNotBlank(bo.getTplWebsite()), ProuctPptScheme::getTplWebsite, bo.getTplWebsite());
+        lqw.eq(StringUtils.isNotBlank(bo.getTplPhone()), ProuctPptScheme::getTplPhone, bo.getTplPhone());
+        lqw.eq(StringUtils.isNotBlank(bo.getTplContentTitle()), ProuctPptScheme::getTplContentTitle, bo.getTplContentTitle());
+        lqw.eq(bo.getOwnerId() != null, ProuctPptScheme::getOwnerId, bo.getOwnerId());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsPublic()), ProuctPptScheme::getIsPublic, bo.getIsPublic());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsShared()), ProuctPptScheme::getIsShared, bo.getIsShared());
+        lqw.eq(bo.getSourceSchemeId() != null, ProuctPptScheme::getSourceSchemeId, bo.getSourceSchemeId());
+        lqw.eq(bo.getSharerId() != null, ProuctPptScheme::getSharerId, bo.getSharerId());
+        lqw.like(StringUtils.isNotBlank(bo.getSharerName()), ProuctPptScheme::getSharerName, bo.getSharerName());
+        lqw.eq(bo.getShareTime() != null, ProuctPptScheme::getShareTime, bo.getShareTime());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), ProuctPptScheme::getStatus, bo.getStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getPlatformCode()), ProuctPptScheme::getPlatformCode, bo.getPlatformCode());
+        lqw.eq(ObjectUtil.isNotEmpty(bo.getCreateBy()), ProuctPptScheme::getCreateBy, bo.getCreateBy());
+        return lqw;
+    }
+
+    /**
+     * 新增PPT 方案主
+     *
+     * @param bo PPT 方案主
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(ProuctPptSchemeBo bo) {
+        ProuctPptScheme add = MapstructUtils.convert(bo, ProuctPptScheme.class);
+        if (ObjectUtil.isEmpty(bo.getProductIds())) {
+            throw new ServiceException("请选择产品");
+        }
+        List<ProductBaseVo> productBaseVos = bo.getProductIds().stream().map(productBaseService::queryById).collect(Collectors.toList());
+        add.setProductData(JSONUtil.toJsonStr(productBaseVos));
+        validEntityBeforeSave(add);
+        add.setOwnerId(LoginHelper.getUserId());
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改PPT 方案主
+     *
+     * @param bo PPT 方案主
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(ProuctPptSchemeBo bo) {
+        ProuctPptScheme update = MapstructUtils.convert(bo, ProuctPptScheme.class);
+        validEntityBeforeSave(update);
+        if (ObjectUtil.isEmpty(bo.getProductIds())) {
+            throw new ServiceException("请选择产品");
+        }
+        List<ProductBaseVo> productBaseVos = bo.getProductIds().stream().map(productBaseService::queryById).collect(Collectors.toList());
+        update.setProductData(JSONUtil.toJsonStr(productBaseVos));
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ProuctPptScheme entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除PPT 方案主信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    /**
+     * 分享方案
+     *
+
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void share(ProuctPptSchemeBo bo) {
+        if (ObjectUtil.isEmpty(bo.getUserIds())) {
+            throw new ServiceException("请选择用户");
+        }
+        //查询用户
+        List<RemoteUserVo> userVos = remoteUserService.selectListByIds(bo.getUserIds());
+        //获取方案信息
+        ProuctPptSchemeVo prouctPptSchemeVo = baseMapper.selectVoById(bo.getId());
+        if (ObjectUtil.isEmpty(prouctPptSchemeVo)) {
+            throw new ServiceException("方案不存在");
+        }
+        List<ProuctPptScheme> prouctPptSchemes = userVos.stream().map(userVo -> {
+            ProuctPptScheme prouctPptScheme = BeanUtil.toBean(prouctPptSchemeVo, ProuctPptScheme.class);
+            prouctPptScheme.setId(null);
+            prouctPptScheme.setSharerId(LoginHelper.getUserId());
+            prouctPptScheme.setSharerName(LoginHelper.getLoginUser().getNickname());
+            prouctPptScheme.setShareTime(DateUtil.date());
+            prouctPptScheme.setIsShared("1");
+            prouctPptScheme.setOwnerId(userVo.getUserId());
+            return prouctPptScheme;
+        }).collect(Collectors.toList());
+        baseMapper.insertBatch(prouctPptSchemes);
+    }
+}

ruoyi-modules/ruoyi-product/src/main/resources/mapper/product/ProductPptTemplateMapper.xml

@@ -0,0 +1,7 @@
+<?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.dromara.product.mapper.ProductPptTemplateMapper">
+
+</mapper>

ruoyi-modules/ruoyi-product/src/main/resources/mapper/product/ProuctPptSchemeMapper.xml

@@ -0,0 +1,7 @@
+<?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.dromara.product.mapper.ProuctPptSchemeMapper">
+
+</mapper>

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/pc/PcSysUserController.java

@@ -87,4 +87,27 @@ public class PcSysUserController extends BaseController {
         user.setPassword(BCrypt.hashpw(user.getPassword()));
         return toAjax(sysUserService.resetUserPwd(user.getUserId(), user.getPassword()));
     }
+
+
+    /**
+     * 重置密码
+     */
+    @PutMapping("/changePhonenumber")
+    public R<Void> changePhonenumber(@RequestBody ChangeUserPwdBo user) {
+        Long userId = LoginHelper.getLoginUser().getUserId();
+        user.setUserId(userId);
+        //先校验验证码是否正确
+        String code = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY + user.getPhonenumber());
+        if (code == null) {
+            throw new ServiceException("验证码已过期");
+        }
+
+        if (!code.equals(user.getCode())) {
+            throw new ServiceException("验证码错误");
+        }
+
+        sysUserService.checkUserAllowed(user.getUserId());
+        sysUserService.checkUserDataScope(user.getUserId());
+        return toAjax(sysUserService.resetUserPhonenumber(user.getUserId(), user.getNewPhonenumber()));
+    }
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ChangeUserPwdBo.java

@@ -15,6 +15,11 @@ public class ChangeUserPwdBo {
      */
     private String phonenumber;
 
+    /**
+     * 新手机号码
+     */
+    private String newPhonenumber;
+
     /**
      * 验证码
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java

@@ -203,6 +203,17 @@ public interface ISysUserService {
      */
     int resetUserPwd(Long userId, String password);
 
+
+    /**
+     * 重置用户手机号
+     *
+     * @param userId      用户ID
+     * @param phonenumber 手机号
+     * @return 结果
+     */
+    int resetUserPhonenumber(Long userId, String phonenumber);
+
+
     /**
      * 通过用户ID删除用户
      *

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java

@@ -97,6 +97,7 @@ public class SysUserServiceImpl implements ISysUserService {
             .like(StringUtils.isNotBlank(user.getNickName()), SysUser::getNickName, user.getNickName())
             .eq(StringUtils.isNotBlank(user.getStatus()), SysUser::getStatus, user.getStatus())
             .like(StringUtils.isNotBlank(user.getPhonenumber()), SysUser::getPhonenumber, user.getPhonenumber())
+            .eq(ObjectUtil.isNotEmpty(user.getUserSonType()), SysUser::getUserSonType, user.getUserSonType())
             .between(params.get("beginTime") != null && params.get("endTime") != null,
                 SysUser::getCreateTime, params.get("beginTime"), params.get("endTime"))
             .and(ObjectUtil.isNotNull(user.getDeptId()), w -> {
@@ -316,7 +317,7 @@ public class SysUserServiceImpl implements ISysUserService {
     @Transactional(rollbackFor = Exception.class)
     public int insertUser(SysUserBo user) {
         SysUser sysUser = MapstructUtils.convert(user, SysUser.class);
-       // 1. 校验当前是否为总控平台（main），否则不能指定 platformCode
+        // 1. 校验当前是否为总控平台（main），否则不能指定 platformCode
         String currentPlatform = PlatformContext.getPlatform();
         String targetPlatform = currentPlatform;
         // 如果传入了 platformCode，优先使用传入的值
@@ -336,8 +337,8 @@ public class SysUserServiceImpl implements ISysUserService {
         // 后续操作（岗位、角色）是否也需要在 "main" 平台下执行？
         // 如果这些表也受 platform_code 控制，则同样需要包裹！
 
-            insertUserPost(user, false);
-            insertUserRole(user, false,targetPlatform);
+        insertUserPost(user, false);
+        insertUserRole(user, false, targetPlatform);
 
         return rows;
     }
@@ -375,7 +376,7 @@ public class SysUserServiceImpl implements ISysUserService {
         }
 
         // 新增用户与角色管理
-        insertUserRole(user, true,targetPlatform);
+        insertUserRole(user, true, targetPlatform);
         // 新增用户与岗位管理
         insertUserPost(user, true);
         SysUser sysUser = MapstructUtils.convert(user, SysUser.class);
@@ -399,8 +400,8 @@ public class SysUserServiceImpl implements ISysUserService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertUserAuth(Long userId, Long[] roleIds,String platformCode) {
-        insertUserRole(userId, roleIds, true,platformCode);
+    public void insertUserAuth(Long userId, Long[] roleIds, String platformCode) {
+        insertUserRole(userId, roleIds, true, platformCode);
     }
 
     /**
@@ -466,14 +467,28 @@ public class SysUserServiceImpl implements ISysUserService {
                 .eq(SysUser::getUserId, userId));
     }
 
+    /**
+     * 更换用户手机号
+     *
+     * @param userId 用户ID
+     * @return 结果
+     */
+    @Override
+    public int resetUserPhonenumber(Long userId, String phonenumber) {
+        return baseMapper.update(null,
+            new LambdaUpdateWrapper<SysUser>()
+                .set(SysUser::getPhonenumber, phonenumber)
+                .eq(SysUser::getUserId, userId));
+    }
+
     /**
      * 新增用户角色信息
      *
      * @param user  用户对象
      * @param clear 清除已存在的关联数据
      */
-    private void insertUserRole(SysUserBo user, boolean clear,String platformCode) {
-        this.insertUserRole(user.getUserId(), user.getRoleIds(), clear,platformCode);
+    private void insertUserRole(SysUserBo user, boolean clear, String platformCode) {
+        this.insertUserRole(user.getUserId(), user.getRoleIds(), clear, platformCode);
     }
 
     /**
@@ -507,7 +522,7 @@ public class SysUserServiceImpl implements ISysUserService {
      * @param roleIds 角色组
      * @param clear   清除已存在的关联数据
      */
-    private void insertUserRole(Long userId, Long[] roleIds, boolean clear,String platformCode) {
+    private void insertUserRole(Long userId, Long[] roleIds, boolean clear, String platformCode) {
         if (ArrayUtil.isNotEmpty(roleIds)) {
             List<Long> roleList = new ArrayList<>(List.of(roleIds));
             if (!LoginHelper.isSuperAdmin(userId)) {