补全

pom.xml

@@ -69,14 +69,14 @@
             <properties>
                 <!-- 环境标识，需要与配置文件的名称相对应 -->
                 <profiles.active>dev</profiles.active>
-                <nacos.server>192.168.0.102:8848</nacos.server>
+                <nacos.server>192.168.0.104:8848</nacos.server>
                 <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
                 <nacos.config.group>DEFAULT_GROUP</nacos.config.group>
                 <nacos.username>nacos</nacos.username>
                 <nacos.password>nacos</nacos.password>
                 <logstash.address>127.0.0.1:4560</logstash.address>
-                <discovery.ip>192.168.0.102</discovery.ip>
-                <nacos.ip>192.168.0.102</nacos.ip>
+                <discovery.ip>192.168.0.104</discovery.ip>
+                <nacos.ip>192.168.0.104</nacos.ip>
             </properties>
         </profile>
         <profile>

ruoyi-common/ruoyi-common-dubbo/src/main/java/org/dromara/common/dubbo/config/CustomBeanFactoryPostProcessor.java

@@ -64,9 +64,9 @@ public class CustomBeanFactoryPostProcessor implements BeanFactoryPostProcessor,
 
         // 创建临时的 InetUtils 实例
         try (InetUtils inetUtils = new InetUtils(properties)) {
-//          String ip = "127.0.0.1";
-//          String ip = "192.168.0.102";
-           String ip = "192.168.1.118";
+//            String ip = "127.0.0.1";
+//            String ip = "192.168.0.104";
+            String ip = "192.168.1.118";
             // 获取第一个非回环地址
             InetAddress address = inetUtils.findFirstNonLoopbackAddress();
             if (address != null) {

ruoyi-modules/yingpaipay-order/src/main/java/org/dromara/order/domain/vo/SysSubOrderLogVo.java

@@ -84,4 +84,6 @@ public class SysSubOrderLogVo implements Serializable {
 
     private List<String> photoUrls;
 
+    private Date createTime;
+
 }

ruoyi-modules/yingpaipay-order/src/main/java/org/dromara/order/domain/vo/SysSubOrderVo.java

@@ -138,4 +138,6 @@ public class SysSubOrderVo implements Serializable {
 
     private String groupPurchasePackageName;
 
+    private Long pet;
+
 }

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

@@ -29,6 +29,7 @@ public class SysSubOrderLogServiceImpl implements ISysSubOrderLogService {
         List<SysSubOrderLogVo> vos = baseMapper.selectVoList(
             Wrappers.lambdaQuery(SysSubOrderLog.class)
                 .eq(SysSubOrderLog::getSubOrderId, orderId)
+                .orderByDesc(SysSubOrderLog::getId)
         );
 
         List<Long> ossIds = new ArrayList<>();

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

@@ -344,7 +344,7 @@ public class SysSubOrderServiceImpl implements ISysSubOrderService {
     public boolean accept(SysSubOrderAcceptBo bo) {
 
         SysSubOrder subOrder = baseMapper.selectById(bo.getOrderId());
-        subOrder.setStatus(OrderStatusEnum.IN_SERVICE.getValue());
+        subOrder.setStatus(OrderStatusEnum.PENDING_SERVICE.getValue());
         boolean subOrderFlag = baseMapper.updateById(subOrder) == 0;
         if (subOrderFlag) {
             throw new RuntimeException("修改订单状态失败");