From 42dc86ecc710b474911bf19bad28499ee6224d98 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Tue, 24 Jun 2025 23:58:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8B=E5=8D=95=E7=AB=AF?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=B4=BE=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/application-druid-root.yml          | 7 ++++---
 ruoyi-admin/src/main/resources/application.yml                     | 3 ++-
 .../model/service/impl/AppletOrderDateFrequencyServiceImpl.java    | 1 -
 ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderItem.java | 3 +++
 .../main/java/com/cyl/manager/oms/service/OrderItemService.java    | 1 +
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-druid-root.yml b/ruoyi-admin/src/main/resources/application-druid-root.yml
index b8a5d9f..128d57b 100644
--- a/ruoyi-admin/src/main/resources/application-druid-root.yml
+++ b/ruoyi-admin/src/main/resources/application-druid-root.yml
@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源 jdbc:mysql://localhost:3306/catmdogf?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
             master:
-                url: jdbc:mysql://47.97.158.59:3306/catmdogf_prod20225?useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
+                url: jdbc:mysql://47.97.158.59:3306/catmdogf_prod20250624?useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
                 username: root
                 password: Qweruiop@123
             # 从库数据源
@@ -55,8 +55,9 @@ wechat:
     appId: wxd1a6ba7b5e17a5b6
     secret: 你的微信服务号密钥
     merchantId: 1665639691
-    privateKeyPath: /data/software/app/key/apiclient_key.pem
-#    privateKeyPath:  /root/pem/apiclient_key.pem
+#    privateKeyPath: /data/software/app/key/apiclient_key.pem
+#    privateKeyPath: E:\\file\\2025\\1\pet-admin\\ruoyi-admin\\src\\main\\resources\\apiclient_key.pem
+    privateKeyPath:  /root/pem/apiclient_key.pem
 #    privateKeyPath: F:\\java_work\\team_work_java\\pet-admin-25-01-25\\pet-admin\\ruoyi-admin\\src\\main\\resources\\apiclient_key.pem
     #privateKeyPath: /Users/daixiande/Work/杂七杂八/1665639691_20240111_cert/apiclient_key.pem
     merchantSerialNumber: 6050244FC18200362585F1F9FD6557A1B291E8C0
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index fab82c0..e914046 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -45,7 +45,8 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles: 
-    active: dev
+    active: druid-root
+#    active: dev
   # 文件上传
   servlet:
      multipart:
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderDateFrequencyServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderDateFrequencyServiceImpl.java
index 0a16fc8..f0c40af 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderDateFrequencyServiceImpl.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderDateFrequencyServiceImpl.java
@@ -256,7 +256,6 @@ public class AppletOrderDateFrequencyServiceImpl extends ServiceImpl<AppletOrder
                 for (OrderItem n : h5OrderVO.getOrderItemList()) {
                     if(n.getOrderServiceId().equals(omsOrderService.getId())){
                         omsOrderService.getOrderItems().add(n);
-                        break;
                     }
                 }
                 if (ObjectUtils.isNotEmpty(omsOrderService.getServiceFrequency())){
diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderItem.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderItem.java
index 4920b97..cee8fb5 100644
--- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderItem.java
+++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderItem.java
@@ -87,5 +87,8 @@ public class OrderItem extends BaseAudit {
     @Excel(name = "商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}]")
     private String spData;
 
+    @ApiModelProperty("是否主商品1是0否")
+    @Excel(name = "是否主商品1是，0否")
+    private Integer isMainProduct;
 }
 
diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderItemService.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderItemService.java
index e8ddf1b..04d2687 100644
--- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderItemService.java
+++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderItemService.java
@@ -182,6 +182,7 @@ public class OrderItemService extends ServiceImpl<OrderItemMapper, OrderItem> {
             orderItem.setSpData(sku.getSpData());
             orderItem.setCreateBy(member.getId());
             orderItem.setCreateTime(optTime);
+            orderItem.setIsMainProduct(item.getIsMainProduct() ? 1 : 0);
             addOrderItemList.add(orderItem);
         });
         boolean flag = saveBatch(addOrderItemList);