Merge remote-tracking branch 'origin/master'

ruoyi-api/ruoyi-api-order/src/main/java/org/dromara/product/api/RemoteOrderInfoService.java

@@ -0,0 +1,15 @@
+package org.dromara.product.api;
+
+import org.dromara.product.api.domain.dto.OrderStatusCountDto;
+
+/**
+ * @author
+ * @date 2026/3/17 下午5:25
+ */
+public interface RemoteOrderInfoService {
+    /**
+    * 获取订单各个状态的数量
+     * @param itemKey 项目key
+    * */
+    OrderStatusCountDto getOrderStatusCount(String itemKey);
+}

ruoyi-api/ruoyi-api-order/src/main/java/org/dromara/product/api/domain/dto/OrderStatusCountDto.java

@@ -0,0 +1,53 @@
+package org.dromara.product.api.domain.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author
+ * @date 2026/3/17 下午5:28
+ */
+@Data
+public class OrderStatusCountDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 订单总数
+     */
+    private Long orderCount;
+
+    /**
+     * 已完成的数量
+     */
+    private Long completedCount;
+
+    /**
+     * 待付款的数量
+     * */
+    private Long waitPayCount;
+
+    /**
+     * 待发货的数量
+     * */
+    private Long waitDeliverCount;
+
+    /**
+     * 售后订单数量
+     * */
+    private Long refundCount;
+
+    /**
+     * 订单总金额
+     * */
+    private BigDecimal orderAmount;
+
+    /**
+     * 售后订单数金额
+     * */
+    private BigDecimal refundAmount;
+
+}

ruoyi-auth/Dockerfile

@@ -11,7 +11,7 @@ RUN mkdir -p /ruoyi/auth/logs  \
 
 WORKDIR /ruoyi/auth
 
-ENV SERVER_PORT=9210 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV SERVER_PORT=9210 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE ${SERVER_PORT}
 

ruoyi-auth/auth-Dockerfile

@@ -11,7 +11,7 @@ RUN mkdir -p /ruoyi/auth/logs  \
 
 WORKDIR /ruoyi/auth
 
-ENV SERVER_PORT=9210 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV SERVER_PORT=9210 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE ${SERVER_PORT}
 

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java

@@ -65,7 +65,7 @@ public interface Constants {
     /**
      * 验证码有效期（分钟）
      */
-    Integer CAPTCHA_EXPIRATION = 5;
+    Integer CAPTCHA_EXPIRATION = 10;
 
     /**
      * 顶级部门id

ruoyi-gateway/Dockerfile

@@ -11,7 +11,7 @@ RUN mkdir -p /ruoyi/gateway/logs  \
 
 WORKDIR /ruoyi/gateway
 
-ENV SERVER_PORT=8080 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV SERVER_PORT=8080 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE ${SERVER_PORT}
 

ruoyi-gateway/gateway-Dockerfile

@@ -11,7 +11,7 @@ RUN mkdir -p /ruoyi/gateway/logs  \
 
 WORKDIR /ruoyi/gateway
 
-ENV SERVER_PORT=8080 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV SERVER_PORT=8080 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE ${SERVER_PORT}
 

ruoyi-modules/ruoyi-bill/Dockerfile

@@ -11,7 +11,7 @@ RUN mkdir -p /ruoyi/bill/logs \
 
 WORKDIR /ruoyi/bill
 
-ENV SERVER_PORT=9318 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV SERVER_PORT=9318 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE ${SERVER_PORT}
 

ruoyi-modules/ruoyi-bill/bill-Dockerfile

@@ -11,7 +11,7 @@ RUN mkdir -p /ruoyi/bill/logs \
 
 WORKDIR /ruoyi/bill
 
-ENV SERVER_PORT=9318 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV SERVER_PORT=9318 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE ${SERVER_PORT}
 

ruoyi-modules/ruoyi-customer/Dockerfile

@@ -11,7 +11,7 @@ RUN mkdir -p /ruoyi/customer/logs \
 
 WORKDIR /ruoyi/customer
 
-ENV SERVER_PORT=9212 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV SERVER_PORT=9212 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE ${SERVER_PORT}
 

ruoyi-modules/ruoyi-customer/customer-Dockerfile

@@ -11,7 +11,7 @@ RUN mkdir -p /ruoyi/customer/logs \
 
 WORKDIR /ruoyi/customer
 
-ENV SERVER_PORT=9212 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV SERVER_PORT=9212 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE ${SERVER_PORT}
 

ruoyi-modules/ruoyi-external/Dockerfile

@@ -11,7 +11,7 @@ RUN mkdir -p /ruoyi/external/logs \
 
 WORKDIR /ruoyi/external
 
-ENV SERVER_PORT=9618 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV SERVER_PORT=9618 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE ${SERVER_PORT}
 

ruoyi-modules/ruoyi-external/external-Dockerfile

@@ -11,7 +11,7 @@ RUN mkdir -p /ruoyi/external/logs \
 
 WORKDIR /ruoyi/external
 
-ENV SERVER_PORT=9618 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV SERVER_PORT=9618 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE ${SERVER_PORT}
 

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/domain/ExternalItem.java

@@ -27,6 +27,10 @@ public class ExternalItem extends TenantEntity {
     @TableId(value = "id")
     private Long id;
 
+    /**
+     * 项目logo
+     */
+    private String logo;
     /**
      * 项目名
      */

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/domain/bo/ExternalItemBo.java

@@ -25,6 +25,11 @@ public class ExternalItemBo extends BaseEntity {
      */
     private Long id;
 
+    /**
+     * 项目logo
+     */
+    private String logo;
+
     /**
      * 项目名
      */

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/domain/vo/ExternalItemVo.java

@@ -10,6 +10,7 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 
@@ -34,6 +35,11 @@ public class ExternalItemVo implements Serializable {
     @ExcelProperty(value = "项目id")
     private Long id;
 
+    /**
+     * 项目logo
+     */
+    private String logo;
+
     /**
      * 项目名
      */
@@ -77,5 +83,45 @@ public class ExternalItemVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 商品数量
+     */
+    private Long productCount;
+
+    /**
+     * 订单总数
+     */
+    private Long orderCount;
+
+    /**
+     * 已完成的数量
+     */
+    private Long completedCount;
+
+    /**
+     * 待付款的数量
+     * */
+    private Long waitPayCount;
+
+    /**
+     * 待发货的数量
+     * */
+    private Long waitDeliverCount;
+
+    /**
+     * 售后订单数量
+     * */
+    private Long refundCount;
+
+    /**
+     * 订单总金额
+     * */
+    private BigDecimal orderAmount;
+
+    /**
+     * 售后订单金额
+     * */
+    private BigDecimal refundAmount;
+
 
 }

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/service/impl/ExternalItemServiceImpl.java

@@ -1,6 +1,7 @@
 package org.dromara.external.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -10,6 +11,11 @@ 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.external.domain.ExternalProduct;
+import org.dromara.external.mapper.ExternalProductMapper;
+import org.dromara.external.service.IExternalProductService;
+import org.dromara.product.api.RemoteOrderInfoService;
+import org.dromara.product.api.domain.dto.OrderStatusCountDto;
 import org.springframework.stereotype.Service;
 import org.dromara.external.domain.bo.ExternalItemBo;
 import org.dromara.external.domain.vo.ExternalItemVo;
@@ -34,6 +40,11 @@ public class ExternalItemServiceImpl  extends ServiceImpl<ExternalItemMapper, Ex
 
     private final ExternalItemMapper baseMapper;
 
+    private final ExternalProductMapper externalProductMapper;
+
+    @DubboReference
+    private RemoteOrderInfoService remoteOrderInfoService;
+
     /**
      * 查询第三方对接项目管理
      *
@@ -56,6 +67,17 @@ public class ExternalItemServiceImpl  extends ServiceImpl<ExternalItemMapper, Ex
     public TableDataInfo<ExternalItemVo> queryPageList(ExternalItemBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<ExternalItem> lqw = buildQueryWrapper(bo);
         Page<ExternalItemVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        result.getRecords().forEach(item -> {
+            OrderStatusCountDto orderStatusCount = remoteOrderInfoService.getOrderStatusCount(item.getItemKey());
+            item.setProductCount(externalProductMapper.selectCount(Wrappers.lambdaQuery(ExternalProduct.class).eq(ExternalProduct::getItemId, item.getId())));
+            item.setOrderCount(orderStatusCount.getOrderCount());
+            item.setCompletedCount(orderStatusCount.getCompletedCount());
+            item.setWaitPayCount(orderStatusCount.getWaitPayCount());
+            item.setWaitDeliverCount(orderStatusCount.getWaitDeliverCount());
+            item.setRefundCount(orderStatusCount.getRefundCount());
+            item.setOrderAmount(orderStatusCount.getOrderAmount());
+            item.setRefundAmount(orderStatusCount.getRefundAmount());
+        });
         return TableDataInfo.build(result);
     }
 

ruoyi-modules/ruoyi-gen/Dockerfile

@@ -9,7 +9,7 @@ RUN mkdir -p /ruoyi/gen/logs
 
 WORKDIR /ruoyi/gen
 
-ENV SERVER_PORT=9202 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV SERVER_PORT=9202 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE ${SERVER_PORT}
 

ruoyi-modules/ruoyi-gen/gen-Dockerfile

@@ -9,7 +9,7 @@ RUN mkdir -p /ruoyi/gen/logs
 
 WORKDIR /ruoyi/gen
 
-ENV SERVER_PORT=9202 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV SERVER_PORT=9202 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE ${SERVER_PORT}
 

ruoyi-modules/ruoyi-job/Dockerfile

@@ -11,7 +11,7 @@ RUN mkdir -p /ruoyi/job/logs \
 
 WORKDIR /ruoyi/job
 
-ENV SERVER_PORT=9203 SNAIL_PORT=29203 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV SERVER_PORT=9203 SNAIL_PORT=29203 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE ${SERVER_PORT}
 # 暴露 snail job 客户端端口 用于定时任务调度中心通信

ruoyi-modules/ruoyi-job/job-Dockerfile

@@ -11,7 +11,7 @@ RUN mkdir -p /ruoyi/job/logs \
 
 WORKDIR /ruoyi/job
 
-ENV SERVER_PORT=9203 SNAIL_PORT=29203 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV SERVER_PORT=9203 SNAIL_PORT=29203 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE ${SERVER_PORT}
 # 暴露 snail job 客户端端口 用于定时任务调度中心通信

ruoyi-modules/ruoyi-mall/Dockerfile

@@ -10,7 +10,7 @@ RUN mkdir -p /ruoyi/mall/logs \
     /ruoyi/skywalking/agent
 WORKDIR /ruoyi/mall
 
-ENV SERVER_PORT=9216 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV SERVER_PORT=9216 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE ${SERVER_PORT}
 

ruoyi-modules/ruoyi-mall/mall-Dockerfile

@@ -10,7 +10,7 @@ RUN mkdir -p /ruoyi/mall/logs \
     /ruoyi/skywalking/agent
 WORKDIR /ruoyi/mall
 
-ENV SERVER_PORT=9216 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV SERVER_PORT=9216 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE ${SERVER_PORT}
 

ruoyi-modules/ruoyi-order/Dockerfile

@@ -11,7 +11,7 @@ RUN mkdir -p /ruoyi/order/logs \
 
 WORKDIR /ruoyi/order
 
-ENV SERVER_PORT=9213 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV SERVER_PORT=9213 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE ${SERVER_PORT}
 

ruoyi-modules/ruoyi-order/order-Dockerfile

@@ -11,7 +11,7 @@ RUN mkdir -p /ruoyi/order/logs \
 
 WORKDIR /ruoyi/order
 
-ENV SERVER_PORT=9213 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV SERVER_PORT=9213 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE ${SERVER_PORT}
 

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

@@ -161,7 +161,7 @@ public class OrderMain extends TenantEntity {
     private String orderSource;
 
     /**
-     * 订单状态
+     * 订单状态   OrderStatus
      */
     private String orderStatus;
 

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/dubbo/RemoteOrderInfoServiceImpl.java

@@ -0,0 +1,90 @@
+package org.dromara.order.dubbo;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.config.annotation.DubboService;
+import org.dromara.common.core.enums.OrderStatus;
+import org.dromara.order.domain.OrderMain;
+import org.dromara.order.domain.OrderReturn;
+import org.dromara.order.service.IOrderMainService;
+import org.dromara.order.service.IOrderReturnService;
+import org.dromara.product.api.RemoteOrderInfoService;
+import org.dromara.product.api.domain.dto.OrderStatusCountDto;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author
+ * @date 2026/3/17 下午5:34
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+@DubboService
+public class RemoteOrderInfoServiceImpl implements RemoteOrderInfoService {
+
+    private final IOrderMainService orderMainService;
+
+    private final IOrderReturnService orderReturnService;
+
+    /**
+     * 获取订单各个状态的数量
+     */
+    @Override
+    public OrderStatusCountDto getOrderStatusCount(String itemKey) {
+        OrderStatusCountDto orderStatusCount = new OrderStatusCountDto();
+        // 订单数量
+        orderStatusCount.setOrderCount(
+            orderMainService.count(Wrappers.<OrderMain>lambdaQuery()
+                .eq(OrderMain::getDataSource, itemKey)
+        ));
+        // 已完成订单数量
+        orderStatusCount.setCompletedCount(
+            orderMainService.count(Wrappers.<OrderMain>lambdaQuery()
+                .eq(OrderMain::getDataSource, itemKey)
+                .eq(OrderMain::getOrderStatus, OrderStatus.COMPLETED)
+        ));
+        // 待付款订单数量
+        orderStatusCount.setWaitPayCount(
+            orderMainService.count(Wrappers.<OrderMain>lambdaQuery()
+                .eq(OrderMain::getDataSource, itemKey)
+                .eq(OrderMain::getOrderStatus, OrderStatus.PENDING_PAYMENT)
+        ));
+        // 待发货订单数量
+        orderStatusCount.setWaitDeliverCount(
+            orderMainService.count(Wrappers.<OrderMain>lambdaQuery()
+                .eq(OrderMain::getDataSource, itemKey)
+                .eq(OrderMain::getOrderStatus, OrderStatus.PENDING_SHIPMENT)
+        ));
+        // 售后订单数量
+        orderStatusCount.setWaitDeliverCount(
+            orderReturnService.count(Wrappers.<OrderReturn>lambdaQuery()
+                .eq(OrderReturn::getDataSource, itemKey)
+        ));
+        // 订单总金额
+        List<OrderMain> orderMains = orderMainService.list(Wrappers.<OrderMain>lambdaQuery()
+            .eq(OrderMain::getDataSource, itemKey)
+            .select(OrderMain::getTotalAmount)
+        );
+        if(ObjectUtil.isNotEmpty(orderMains)){
+            orderStatusCount.setOrderAmount(orderMains.stream().map(OrderMain::getTotalAmount).filter(Objects::nonNull).reduce(BigDecimal::add).orElse(BigDecimal.ZERO));
+        }
+        // 售后订单金额 如果为null 则为0
+        List<OrderReturn> orderReturns = orderReturnService.list(Wrappers.<OrderReturn>lambdaQuery()
+            .eq(OrderReturn::getDataSource, itemKey)
+            .select(OrderReturn::getAfterSaleAmount)
+        );
+        if(ObjectUtil.isNotEmpty(orderReturns)){
+            orderStatusCount.setRefundAmount(
+            orderReturns.stream().map(OrderReturn::getAfterSaleAmount).filter(Objects::nonNull).reduce(BigDecimal::add).orElse(BigDecimal.ZERO)
+            );
+        }
+
+        return orderStatusCount;
+    }
+}

ruoyi-modules/ruoyi-product/Dockerfile

@@ -11,7 +11,7 @@ RUN mkdir -p /ruoyi/prouct/logs \
 
 WORKDIR /ruoyi/prouct
 
-ENV SERVER_PORT=9608 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV SERVER_PORT=9608 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE ${SERVER_PORT}
 

ruoyi-modules/ruoyi-product/product-Dockerfile

@@ -11,7 +11,7 @@ RUN mkdir -p /ruoyi/prouct/logs \
 
 WORKDIR /ruoyi/prouct
 
-ENV SERVER_PORT=9608 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV SERVER_PORT=9608 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE ${SERVER_PORT}
 

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

@@ -32,6 +32,7 @@ import java.util.Objects;
 
 /**
  * 我的商品相关接口
+ *
  * @author
  * @date 2026/1/26 下午6:41
  */
@@ -58,8 +59,8 @@ public class MyProductController {
 
 
     /**
-    * 新增商品浏览记录
-    * */
+     * 新增商品浏览记录
+     */
     @PostMapping("/addProductBrowsingHistory/{productId}")
     public R addProductBrowsingHistory(@PathVariable Long productId) {
         ProductBrowsingHistoryBo productBrowsingHistoryBo = new ProductBrowsingHistoryBo();
@@ -71,8 +72,8 @@ public class MyProductController {
     }
 
     /**
-    * 删除浏览记录
-    * */
+     * 删除浏览记录
+     */
     @DeleteMapping("/deleteProductBrowsingHistory/{ids}")
     public R deleteProductBrowsingHistory(@PathVariable Long[] ids) {
         productBrowsingHistoryService.remove(Wrappers.lambdaQuery(ProductBrowsingHistory.class)
@@ -83,16 +84,16 @@ public class MyProductController {
     }
 
     /**
-    * 浏览记录的商品
-    * */
+     * 浏览记录的商品
+     */
     @GetMapping("/getProductBrowsingHistory")
-    public R<Map<String,List<PcProductVo>>> getProductBrowsingHistory() {
+    public R<Map<String, List<PcProductVo>>> getProductBrowsingHistory() {
         return R.ok(productBaseService.getProductBrowsingHistory(LoginHelper.getUserId()));
     }
 
     /**
-    * 新增商品收藏夹
-    * */
+     * 新增商品收藏夹
+     */
     @PostMapping("/addProductFavorites")
     public R addProductFavorites(@RequestBody ProductFavoritesBo bo) {
         bo.setUserId(LoginHelper.getUserId());
@@ -109,31 +110,33 @@ public class MyProductController {
         bo.setUserId(LoginHelper.getUserId());
         return productFavoritesService.queryPageList(bo, pageQuery);
     }
+
     /**
-    * 删除收藏夹
-    * */
+     * 删除收藏夹
+     */
     @DeleteMapping("/deleteProductFavorites/{favoritesId}")
     public R deleteProductFavorites(@PathVariable Long favoritesId) {
         //做校验是否存在收藏商品
-        if(productCollectService.exists(Wrappers.lambdaQuery(ProductCollect.class)
-            .eq(ProductCollect::getFavoritesId, favoritesId))){
+        if (productCollectService.exists(Wrappers.lambdaQuery(ProductCollect.class)
+            .eq(ProductCollect::getFavoritesId, favoritesId))) {
             return R.fail("收藏夹下有收藏商品，请先取消收藏商品");
         }
         productFavoritesService.deleteWithValidByIds(List.of(favoritesId), false);
         return R.ok();
     }
+
     /**
-    * 收藏商品
-    * */
+     * 收藏商品
+     */
     @PostMapping("/addProductCollect")
     public R addProductCollect(@RequestBody ProductCollectBo bo) {
         //如果未传收藏夹id，则查询有没有默认收藏夹，如果没有就新增收藏夹
-        if(bo.getFavoritesId() == null){
+        if (bo.getFavoritesId() == null) {
             ProductFavorites one = productFavoritesService.getOne(Wrappers.lambdaQuery(ProductFavorites.class)
                 .eq(ProductFavorites::getUserId, LoginHelper.getUserId())
                 .eq(ProductFavorites::getIsDefault, "0")
             );
-            if(one == null){
+            if (one == null) {
                 one = new ProductFavorites();
                 one.setUserId(LoginHelper.getUserId());
                 one.setCustomerId(LoginHelper.getLoginUser().getCustomerId());
@@ -150,8 +153,8 @@ public class MyProductController {
     }
 
     /**
-    * 取消收藏
-    * */
+     * 取消收藏
+     */
     @DeleteMapping("/cancelProductCollect")
     public R cancelProductCollect(ProductCollectBo bo) {
         productCollectService.remove(Wrappers.lambdaQuery(ProductCollect.class)
@@ -163,16 +166,16 @@ public class MyProductController {
     }
 
     /**
-    * 收藏夹商品列表
-    * */
+     * 收藏夹商品列表
+     */
     @GetMapping("/getFavoritesProductPage")
-    public TableDataInfo<PcProductVo> getFavoritesProductPage(Long favoritesId,PageQuery pageQuery) {
-        return productBaseService.getFavoritesProductPage(favoritesId, LoginHelper.getUserId(),pageQuery);
+    public TableDataInfo<PcProductVo> getFavoritesProductPage(Long favoritesId, PageQuery pageQuery) {
+        return productBaseService.getFavoritesProductPage(favoritesId, LoginHelper.getUserId(), pageQuery);
     }
 
     /**
-    * 查询商品是否在默认收藏夹收藏
-    * */
+     * 查询商品是否在默认收藏夹收藏
+     */
     @GetMapping("/isProductInDefaultCollect/{productIds}")
     public R isProductInDefaultCollect(@PathVariable Long[] productIds) {
         //查询商品是否在默认收藏夹收藏
@@ -180,7 +183,7 @@ public class MyProductController {
             .eq(ProductFavorites::getUserId, LoginHelper.getUserId())
             .eq(ProductFavorites::getIsDefault, "0")
         );
-        if(one == null){
+        if (one == null) {
             one = new ProductFavorites();
             one.setUserId(LoginHelper.getUserId());
             one.setTitle("默认收藏夹");
@@ -195,8 +198,8 @@ public class MyProductController {
 
 
     /**
-    * 将商品添加到购物车
-    * */
+     * 将商品添加到购物车
+     */
     @PostMapping("/addProductShoppingCart")
     public R addProductShoppingCart(@RequestBody ProductShoppingCartBo bo) {
         Long userId = LoginHelper.getUserId();
@@ -205,11 +208,11 @@ public class MyProductController {
             .eq(ProductShoppingCart::getUserId, userId)
             .eq(ProductShoppingCart::getProductId, bo.getProductId())
         );
-        if(one != null){
+        if (one != null) {
             one.setProductNum(one.getProductNum() + bo.getProductNum());
             productShoppingCartService.updateById(one);
             return R.ok();
-        }else {
+        } else {
             bo.setUserId(userId);
             productShoppingCartService.insertByBo(bo);
         }
@@ -217,8 +220,24 @@ public class MyProductController {
     }
 
     /**
-    * 删除购物车商品
+    * 更新购物车商品数量
     * */
+    @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();
+    }
+
+
+
+
+    /**
+     * 删除购物车商品
+     */
     @DeleteMapping("/deleteProductShoppingCart/{ids}")
     public R deleteProductShoppingCart(@PathVariable Long[] ids) {
         productShoppingCartService.removeByIds(Arrays.asList(ids));
@@ -226,16 +245,16 @@ public class MyProductController {
     }
 
     /**
-    * 查询购物车的商品
-    * */
+     * 查询购物车的商品
+     */
     @GetMapping("/getProductShoppingCartPage")
     public TableDataInfo<PcProductVo> getProductShoppingCartPage(String id, PageQuery pageQuery) {
-        return productBaseService.getProductShoppingCartPage(id,LoginHelper.getUserId(),pageQuery);
+        return productBaseService.getProductShoppingCartPage(id, LoginHelper.getUserId(), pageQuery);
     }
 
     /**
-    * 获取购物车商品未失效的商品数量
-    * */
+     * 获取购物车商品未失效的商品数量
+     */
     @GetMapping("/getProductShoppingCartCount")
     public R getProductShoppingCartCount() {
         return R.ok(productBaseService.getProductShoppingCartCount(LoginHelper.getUserId(), 0));
@@ -243,30 +262,31 @@ public class MyProductController {
 
 
     /**
-    * 协议供货商品列表
-    * */
+     * 协议供货商品列表
+     */
     @GetMapping("/getAgreementSupplyProductPage")
     public TableDataInfo<PcProductVo> getProtocolProductsPage(PcProductBo bo, PageQuery pageQuery) {
         bo.setCustomerId(LoginHelper.getLoginUser().getCustomerId());
-        return productBaseService.getProtocolProductsPage(bo,pageQuery);
+        return productBaseService.getProtocolProductsPage(bo, pageQuery);
     }
 
     /**
-    * 获取采购方案
-    * */
+     * 获取采购方案
+     */
     @GetMapping("/getProcurementProgramProductPage")
     public TableDataInfo<ProcurementProgramVo> getProcurementProgramProductPage(ProcurementProgramBo bo, PageQuery pageQuery) {
-        if(Objects.equals(bo.getType(), "1")){
-            return procurementProgramService.queryPageList(bo,pageQuery);
-        }else if(Objects.equals(bo.getType(), "2")){
+        if (Objects.equals(bo.getType(), "1")) {
+            return procurementProgramService.queryPageList(bo, pageQuery);
+        } else if (Objects.equals(bo.getType(), "2")) {
             return TableDataInfo.build();
-        }else {
+        } else {
             return TableDataInfo.build();
         }
     }
+
     /**
-    * 收藏采购方案
-    * */
+     * 收藏采购方案
+     */
     @PostMapping("/addProcurementProgramCollect")
     public R addProcurementProgramCollect(@RequestBody ProcurementProgramCollectBo bo) {
         bo.setUserId(LoginHelper.getUserId());
@@ -276,14 +296,14 @@ public class MyProductController {
     }
 
     /**
-    * 导出购物车的商品
-    * */
+     * 导出购物车的商品
+     */
     @PostMapping("/exportProductShoppingCart")
-    public void exportProductShoppingCart( HttpServletResponse response) {
+    public void exportProductShoppingCart(HttpServletResponse response) {
         PageQuery pageQuery = new PageQuery();
         pageQuery.setPageNum(1);
         pageQuery.setPageSize(Integer.MAX_VALUE);
-        TableDataInfo<PcProductVo> tableDataInfo = productBaseService.getProductShoppingCartPage(null, LoginHelper.getUserId(),pageQuery);
+        TableDataInfo<PcProductVo> tableDataInfo = productBaseService.getProductShoppingCartPage(null, LoginHelper.getUserId(), pageQuery);
         // 转换为导出对象
         List<ProductShoppingCartExportVo> exportList = new ArrayList<>();
         BigDecimal totalAmount = BigDecimal.ZERO;

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

@@ -99,6 +99,11 @@ public class ProductBaseVo implements Serializable {
      */
     private String bottomCategoryName;
 
+    /**
+     * 规格代码
+     */
+    private String specificationsCode;
+
     /**
      * 单位id
      */
@@ -488,4 +493,8 @@ public class ProductBaseVo implements Serializable {
     * 更新时间
     * */
     private Date updateTime;
+    /**
+    * 供货时间
+    * */
+    private String deliveryTime;
 }

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

@@ -276,6 +276,9 @@ public class ProductBaseServiceImpl extends ServiceImpl<ProductBaseMapper, Produ
             vo.setSalesVolume(extend.getSalesVolume());
             vo.setCustomizable("1".equals(extend.getIsCustomize()));
             vo.setCustomDescription(extend.getCustomDescription());
+            vo.setSpecificationsCode(extend.getSpecificationsCode());
+            vo.setIsCustomize(Long.valueOf(ObjectUtil.isNotEmpty(extend.getIsCustomize())?extend.getIsCustomize():"0"));
+            vo.setDeliveryTime(extend.getDeliveryTime());
         }
 
         // 3. 查询并填充价格库存信息（product_price_inventory表）

ruoyi-modules/ruoyi-resource/Dockerfile

@@ -11,7 +11,7 @@ RUN mkdir -p /ruoyi/resource/logs \
 
 WORKDIR /ruoyi/resource
 
-ENV SERVER_PORT=9204 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV SERVER_PORT=9204 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE ${SERVER_PORT}
 

ruoyi-modules/ruoyi-resource/resource-Dockerfile

@@ -11,7 +11,7 @@ RUN mkdir -p /ruoyi/resource/logs \
 
 WORKDIR /ruoyi/resource
 
-ENV SERVER_PORT=9204 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV SERVER_PORT=9204 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE ${SERVER_PORT}
 

ruoyi-modules/ruoyi-system/Dockerfile

@@ -11,7 +11,7 @@ RUN mkdir -p /ruoyi/system/logs \
 
 WORKDIR /ruoyi/system
 
-ENV SERVER_PORT=9214 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV SERVER_PORT=9214 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE ${SERVER_PORT}
 

ruoyi-modules/ruoyi-system/system-Dockerfile

@@ -11,7 +11,7 @@ RUN mkdir -p /ruoyi/system/logs \
 
 WORKDIR /ruoyi/system
 
-ENV SERVER_PORT=9214 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV SERVER_PORT=9214 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE ${SERVER_PORT}
 

ruoyi-modules/ruoyi-workflow/Dockerfile

@@ -11,7 +11,7 @@ RUN mkdir -p /ruoyi/workflow/logs \
 
 WORKDIR /ruoyi/workflow
 
-ENV SERVER_PORT=9205 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV SERVER_PORT=9205 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE ${SERVER_PORT}
 

ruoyi-modules/ruoyi-workflow/Dockerfile.server

@@ -11,7 +11,7 @@ RUN mkdir -p /ruoyi/workflow/logs \
 
 WORKDIR /ruoyi/workflow
 
-ENV SERVER_PORT=9205 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV SERVER_PORT=9205 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE ${SERVER_PORT}
 

ruoyi-visual/ruoyi-monitor/Dockerfile

@@ -9,7 +9,7 @@ RUN mkdir -p /ruoyi/monitor/logs
 
 WORKDIR /ruoyi/monitor
 
-ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE 9100
 

ruoyi-visual/ruoyi-monitor/monitor-Dockerfile

@@ -9,7 +9,7 @@ RUN mkdir -p /ruoyi/monitor/logs
 
 WORKDIR /ruoyi/monitor
 
-ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE 9100
 

ruoyi-visual/ruoyi-nacos/Dockerfile

@@ -13,7 +13,7 @@ EXPOSE 8848
 
 # 👇 修改这里：将默认内存提升至 2G，并增加 OOM 导出参数
 ENV TZ=Asia/Shanghai LANG=C.UTF-8 LC_ALL=C.UTF-8 \
-    JAVA_OPTS="-Xms2g -Xmx2g -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/ruoyi/nacos/logs/heapdump.hprof"
+    JAVA_OPTS="-Xms512m -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/ruoyi/nacos/logs/heapdump.hprof"
 
 ADD ./target/ruoyi-nacos.jar ./app.jar
 

ruoyi-visual/ruoyi-nacos/nacos-Dockerfile

@@ -11,7 +11,7 @@ EXPOSE 8848
 
 # 👇 修改这里：将默认内存提升至 2G，并增加 OOM 导出参数
 ENV TZ=Asia/Shanghai LANG=C.UTF-8 LC_ALL=C.UTF-8 \
-    JAVA_OPTS="-Xms2g -Xmx2g -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/ruoyi/nacos/logs/heapdump.hprof"
+    JAVA_OPTS="-Xms512m -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/ruoyi/nacos/logs/heapdump.hprof"
 
 ADD ./target/ruoyi-nacos.jar ./app.jar
 

ruoyi-visual/ruoyi-seata-server/Dockerfile

@@ -10,7 +10,7 @@ RUN mkdir -p /ruoyi/seata-server/logs \
 
 WORKDIR /ruoyi/seata-server
 
-ENV TZ=PRC LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g" SEATA_IP="" SEATA_PORT=""
+ENV TZ=PRC LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m" SEATA_IP="" SEATA_PORT=""
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 EXPOSE 7091

ruoyi-visual/ruoyi-sentinel-dashboard/Dockerfile

@@ -10,7 +10,7 @@ RUN mkdir -p /ruoyi/sentinel-dashboard/logs \
 
 WORKDIR /ruoyi/sentinel-dashboard
 
-ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE 8718
 

ruoyi-visual/ruoyi-snailjob-server/Dockerfile

@@ -9,7 +9,7 @@ RUN mkdir -p /ruoyi/snailjob/logs
 
 WORKDIR /ruoyi/snailjob
 
-ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE 8800
 EXPOSE 17888

ruoyi-visual/ruoyi-snailjob-server/snailjob-Dockerfile

@@ -9,7 +9,7 @@ RUN mkdir -p /ruoyi/snailjob/logs
 
 WORKDIR /ruoyi/snailjob
 
-ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms1g -Xmx2g"
+ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE 8800
 EXPOSE 17888