用户端代码提交

pz-admin/src/main/resources/application-prod.yml

---- # 临时文件存储位置 避免临时文件被系统清理报错
-spring.servlet.multipart.location: /ruoyi/server/temp
-
 --- # 监控中心配置
 spring.boot.admin.client:
   # 增加客户端开关
@@ -52,37 +49,37 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          url: jdbc:mysql://db1.prd.jianghuxx.com:3317/pz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
           username: root
-          password: root
+          password: 4f9fa23639242790
         # 从库数据源
-        slave:
-          lazy: true
-          type: ${spring.datasource.type}
-          driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
-          username:
-          password:
-#        oracle:
-#          type: ${spring.datasource.type}
-#          driverClassName: oracle.jdbc.OracleDriver
-#          url: jdbc:oracle:thin:@//localhost:1521/XE
-#          username: ROOT
-#          password: root
-#          hikari:
-#            connectionTestQuery: SELECT 1 FROM DUAL
-#        postgres:
-#          type: ${spring.datasource.type}
-#          driverClassName: org.postgresql.Driver
-#          url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
-#          username: root
-#          password: root
-#        sqlserver:
-#          type: ${spring.datasource.type}
-#          driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#          url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true
-#          username: SA
-#          password: root
+      #        slave:
+      #          lazy: true
+      #          type: ${spring.datasource.type}
+      #          driverClassName: com.mysql.cj.jdbc.Driver
+      #          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+      #          username:
+      #          password:
+      #        oracle:
+      #          type: ${spring.datasource.type}
+      #          driverClassName: oracle.jdbc.OracleDriver
+      #          url: jdbc:oracle:thin:@//localhost:1521/XE
+      #          username: ROOT
+      #          password: root
+      #          hikari:
+      #            connectionTestQuery: SELECT 1 FROM DUAL
+      #        postgres:
+      #          type: ${spring.datasource.type}
+      #          driverClassName: org.postgresql.Driver
+      #          url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
+      #          username: root
+      #          password: root
+      #        sqlserver:
+      #          type: ${spring.datasource.type}
+      #          driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+      #          url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true
+      #          username: SA
+      #          password: root
       hikari:
         # 最大连接池数量
         maxPoolSize: 20
@@ -105,13 +102,13 @@ spring:
 spring:
   redis:
     # 地址
-    host: localhost
+    host: cluster1.prd.nyinhong.com
     # 端口，默认为6379
-    port: 6379
+    port: 6319
     # 数据库索引
     database: 0
     # 密码(如没有密码请注释掉)
-    # password:
+    password: yongqi@2022
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl
@@ -121,17 +118,17 @@ redisson:
   # redis key前缀
   keyPrefix:
   # 线程池数量
-  threads: 16
+  threads: 4
   # Netty线程池数量
-  nettyThreads: 32
+  nettyThreads: 8
   # 单节点配置
   singleServerConfig:
     # 客户端名称
     clientName: ${ruoyi.name}
     # 最小空闲连接数
-    connectionMinimumIdleSize: 32
+    connectionMinimumIdleSize: 8
     # 连接池大小
-    connectionPoolSize: 64
+    connectionPoolSize: 32
     # 连接空闲超时，单位：毫秒
     idleConnectionTimeout: 10000
     # 命令等待超时，单位：毫秒

pz-applet/src/main/java/com/pz/applet/AppletSysUserController.java

@@ -102,15 +102,7 @@ public class AppletSysUserController extends BaseController {
      */
     @PutMapping
     public R<Void> edit(@Validated @RequestBody SysUser user) {
-        userService.checkUserAllowed(user);
-        userService.checkUserDataScope(user.getUserId());
-        if (!userService.checkUserNameUnique(user)) {
-            return R.fail("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
-        } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
-            return R.fail("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
-        } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
-            return R.fail("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
-        }
+        user.setUserId(LoginHelper.getLoginUser().getUserId());
         return toAjax(userService.updateUser(user));
     }
 

pz-applet/src/main/java/com/pz/applet/AppletTotalOrderController.java

@@ -191,10 +191,11 @@ public class AppletTotalOrderController extends BaseController {
      */
     @RepeatSubmit()
     @PostMapping("/refundOrder")
-    public R<Void> refundOrder(@Validated(AddGroup.class) @RequestBody TotalOrderBo recordBo) {
-        return toAjax(iTotalOrderService.refundOrder(recordBo));
+    public R<Boolean> refundOrder(@Validated(AddGroup.class) @RequestBody TotalOrderBo recordBo) {
+        return R.ok(iTotalOrderService.refundOrder(recordBo));
     }
 
+
     /**
      * 退款回调
      */

pz-system/src/main/java/com/pz/merchant/service/ISonOrderService.java

@@ -74,4 +74,10 @@ public interface ISonOrderService {
         throw new UnsupportedOperationException("不支持该操作");
     }
 
+    /**
+     * 查询服务开始时间
+     */
+    default String getFinishTime(Integer totalId){
+        throw new UnsupportedOperationException("不支持该操作");
+    }
 }

pz-system/src/main/java/com/pz/merchant/service/impl/SonOrderServiceBuilder.java

@@ -18,6 +18,7 @@ import java.util.HashMap;
  */
 @Component
 @ConditionalOnBean({
+    StoreOrderServiceImpl.class,
     DbwzOrderServiceImpl.class, YypzOrderServiceImpl.class, ZqghOrderServiceImpl.class,
     DbmyOrderServiceImpl.class, ZyphOrderServiceImpl.class, DbghOrderServiceImpl.class})
 public class SonOrderServiceBuilder {
@@ -32,7 +33,9 @@ public class SonOrderServiceBuilder {
         DbmyOrderServiceImpl dbmyOrderService = SpringUtils.getBean(DbmyOrderServiceImpl.class);
         ZyphOrderServiceImpl zyphOrderService = SpringUtils.getBean(ZyphOrderServiceImpl.class);
         DbghOrderServiceImpl dbghOrderService = SpringUtils.getBean(DbghOrderServiceImpl.class);
+        StoreOrderServiceImpl storeOrderService = SpringUtils.getBean(StoreOrderServiceImpl.class);
         sonOrderHashMap = new HashMap<>(8);
+        sonOrderHashMap.put(0, storeOrderService);
         sonOrderHashMap.put(1, yypzOrderService);
         sonOrderHashMap.put(2, dbghOrderService);
         sonOrderHashMap.put(3, dbwzOrderService);

pz-system/src/main/java/com/pz/system/domain/bo/TotalOrderBo.java

@@ -97,4 +97,14 @@ public class TotalOrderBo extends BaseEntity {
     private String logisticsCode;
 
     private String phone;
+
+    /**
+     * 区分退款和售后
+     */
+    private Integer isRefund;
+
+    /**
+     * 凭证
+     */
+    private String voucher;
 }

pz-system/src/main/java/com/pz/system/domain/vo/TotalOrderVo.java

@@ -128,6 +128,11 @@ public class TotalOrderVo {
     private Double salePrice;
 
     /**
+     * 医生
+     */
+    private String doctor;
+
+    /**
      * 服务状态
      */
     private Integer serviceStatus;

pz-system/src/main/java/com/pz/system/mapper/DbghOrderMapper.java

@@ -40,4 +40,9 @@ public interface DbghOrderMapper extends BaseMapperPlus<DbghOrderMapper, DbghOrd
      * @return 代办挂号订单
      */
     DbghOrderItemVo selectDbghOrderDetailDateByTotalId(Integer totalId);
+
+    /**
+     * 查询子订单完成时间
+     */
+    String selectFinishTime(Integer totalId);
 }

pz-system/src/main/java/com/pz/system/mapper/DbwzOrderMapper.java

@@ -40,4 +40,9 @@ public interface DbwzOrderMapper extends BaseMapperPlus<DbwzOrderMapper, DbwzOrd
      * @return 代办挂号
      */
     DbwzOrderItemVo selectDbwzOrderDetailDataByTotalId(Integer totalId);
+
+    /**
+     * 查询子订单完成时间
+     */
+    String selectFinishTime(Integer totalId);
 }

pz-system/src/main/java/com/pz/system/mapper/YypzOrderMapper.java

@@ -38,4 +38,8 @@ public interface YypzOrderMapper extends BaseMapperPlus<YypzOrderMapper, YypzOrd
      * @return 预约陪诊相关信息
      */
     YypzOrderItemVo selectYypzOrderDetailDataByTotalId(Integer totalId);
+    /**
+     * 查询子订单完成时间
+     */
+    String selectFinishTime(Integer totalId);
 }

pz-system/src/main/java/com/pz/system/mapper/ZqghOrderMapper.java

@@ -42,4 +42,9 @@ public interface ZqghOrderMapper extends BaseMapperPlus<ZqghOrderMapper, ZqghOrd
      */
     ZqghOrderItemVo selectZqghOrderDetailDateByTotalId(Integer totalId);
 
+    /**
+     * 查询服务时间
+     */
+    String selectFinishTime(Integer totalId);
+
 }

pz-system/src/main/java/com/pz/system/mapper/ZyphOrderMapper.java

@@ -40,4 +40,10 @@ public interface ZyphOrderMapper extends BaseMapperPlus<ZyphOrderMapper, ZyphOrd
      * @return 住院陪护订单
      */
     ZyphOrderItemVo selectZyphOrderDetailDataByTotalId(Integer totalId);
+
+    /**
+     * 查询子订单完成时间
+     */
+    String selectFinishTime(Integer totalId);
+
 }

pz-system/src/main/java/com/pz/system/service/ITotalOrderService.java

@@ -100,6 +100,7 @@ public interface ITotalOrderService {
      */
     Boolean refundOrder(TotalOrderBo bo);
 
+
     boolean orderRefundCallBack(WxPayRefundNotifyResult wxPayRefundNotifyResult);
 
     /**

pz-system/src/main/java/com/pz/system/service/impl/ArticleServiceImpl.java

@@ -207,8 +207,13 @@ public class ArticleServiceImpl implements IArticleService {
                     for (String num : numberArray) {
                         integerList.add(num.trim());
                     }*/
-                    List<String> ids = JsonUtils.parseArray(articleVo.getCover(), String.class);
+                    //List<String> ids = JsonUtils.parseArray(articleVo.getCover(), String.class);
+                    List<String> ids = new ArrayList<>();
+                    // 使用逗号分割字符串，并逐个转换为 Integer 添加到 List 中
+                    if(null != articleVo.getCover()){
+                        Collections.addAll(ids, articleVo.getCover().split(","));
                         articleVo.setCoverList(ids);
+                    }
                     // 设置点赞数
                     articleVo.setAppreciateNum(appreciateNumMap.getOrDefault(articleVo.getId(), 0));
 

pz-system/src/main/java/com/pz/system/service/impl/DbghOrderServiceImpl.java

@@ -319,4 +319,9 @@ public class DbghOrderServiceImpl implements IDbghOrderService, ISonOrderService
         delayQueue.addOrder(task);
         return true;
     }
+
+    @Override
+    public String getFinishTime(Integer totalId) {
+        return baseMapper.selectFinishTime(totalId);
+    }
 }

pz-system/src/main/java/com/pz/system/service/impl/DbmyOrderServiceImpl.java

@@ -298,4 +298,5 @@ public class DbmyOrderServiceImpl implements IDbmyOrderService, ISonOrderService
         delayQueue.addOrder(task);
         return true;
     }
+
 }

pz-system/src/main/java/com/pz/system/service/impl/DbwzOrderServiceImpl.java

@@ -320,4 +320,9 @@ public class DbwzOrderServiceImpl implements IDbwzOrderService, ISonOrderService
         delayQueue.addOrder(task);
         return true;
     }
+
+    @Override
+    public String getFinishTime(Integer totalId) {
+        return baseMapper.selectFinishTime(totalId);
+    }
 }

pz-system/src/main/java/com/pz/system/service/impl/StoreOrderServiceImpl.java

@@ -7,6 +7,9 @@ import com.pz.common.core.domain.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 com.pz.merchant.domain.vo.SonOrderVo;
+import com.pz.merchant.service.ISonOrderService;
+import com.pz.system.domain.bo.OrderFinishedBo;
 import com.pz.system.domain.vo.StoreAdminOrderVo;
 import com.pz.system.mapper.CityMapper;
 import com.pz.system.mapper.TotalOrderMapper;
@@ -32,7 +35,7 @@ import java.util.Optional;
  */
 @RequiredArgsConstructor
 @Service
-public class StoreOrderServiceImpl implements IStoreOrderService {
+public class StoreOrderServiceImpl implements IStoreOrderService, ISonOrderService {
 
     private final StoreOrderMapper baseMapper;
 
@@ -132,4 +135,15 @@ public class StoreOrderServiceImpl implements IStoreOrderService {
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    @Override
+    public SonOrderVo getSonOrderSimpleDataByTotalId(Integer totalId) {
+        return null;
+    }
+
+    @Override
+    public boolean switchSonOrderStatus(Long totalId, Integer target) {
+        return false;
+    }
+
 }

pz-system/src/main/java/com/pz/system/service/impl/SysUserServiceImpl.java

@@ -311,14 +311,14 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
     @Transactional(rollbackFor = Exception.class)
     public int updateUser(SysUser user) {
         Long userId = user.getUserId();
-        // 删除用户与角色关联
+        /*// 删除用户与角色关联
         userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, userId));
         // 新增用户与角色管理
         insertUserRole(user);
         // 删除用户与岗位关联
         userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId, userId));
         // 新增用户与岗位管理
-        insertUserPost(user);
+        insertUserPost(user);*/
         return baseMapper.updateById(user);
     }
 

pz-system/src/main/java/com/pz/system/service/impl/YypzOrderServiceImpl.java

@@ -320,4 +320,9 @@ public class YypzOrderServiceImpl implements IYypzOrderService, ISonOrderService
         delayQueue.addOrder(task);
         return true;
     }
+
+    @Override
+    public String getFinishTime(Integer totalId) {
+        return baseMapper.selectFinishTime(totalId);
+    }
 }

pz-system/src/main/java/com/pz/system/service/impl/ZqghOrderServiceImpl.java

@@ -177,4 +177,8 @@ public class ZqghOrderServiceImpl implements IZqghOrderService, ISonOrderService
         return baseMapper.updateById(sonOrder) > 0;
     }
 
+    @Override
+    public String getFinishTime(Integer totalId) {
+        return baseMapper.selectFinishTime(totalId);
+    }
 }

pz-system/src/main/java/com/pz/system/service/impl/ZyphOrderServiceImpl.java

@@ -331,4 +331,9 @@ public class ZyphOrderServiceImpl implements IZyphOrderService, ISonOrderService
         delayQueue.addOrder(task);
         return true;
     }
+
+    @Override
+    public String getFinishTime(Integer totalId) {
+        return baseMapper.selectFinishTime(totalId);
+    }
 }

pz-system/src/main/resources/mapper/system/DbghOrderMapper.xml

@@ -91,6 +91,11 @@
                  left join department on department.id = dbgh_order.did
         where total_order.id = #{id}
     </select>
+    <select id="selectFinishTime" resultType="java.lang.String">
+        select visit_time
+            from total_order t left join dbgh_order d on d.order_id = t.id
+        where  t.id = #{id}
+    </select>
 
 
 </mapper>

pz-system/src/main/resources/mapper/system/DbmyOrderMapper.xml

@@ -95,6 +95,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  left join services on total_order.service_id = services.id
         where total_order.id = #{id}
     </select>
+    <select id="selectFinishTime" resultType="java.lang.String">
+        select over_time
+                   from total_order t left join dbmy_order d on d.order_id = t.id
+        where d.status = 2 and t.id = #{id}
+    </select>
 
 
 </mapper>

pz-system/src/main/resources/mapper/system/DbwzOrderMapper.xml

@@ -101,6 +101,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  left join department on department.id = dbwz_order.did
         where total_order.id = #{id}
     </select>
+    <select id="selectFinishTime" resultType="java.lang.String">
+        select visit_time
+                   from total_order t left join dbwz_order d on d.order_id = t.id
+        where  t.id = #{id}
+    </select>
 
 
 </mapper>

pz-system/src/main/resources/mapper/system/TotalOrderMapper.xml

@@ -60,6 +60,7 @@
         t.update_by,
         t.update_time,
         t.remark,
+        e.name as emName,
         b.name as business,
         s.name as service
         from total_order t

pz-system/src/main/resources/mapper/system/YypzOrderMapper.xml

@@ -95,4 +95,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  left join department on department.id = yypz_order.did
         where total_order.id = #{id}
     </select>
+    <select id="selectFinishTime" resultType="java.lang.String">
+        select visit_time
+                   from total_order t left join yypz_order d on d.order_id = t.id
+        where  t.id = #{id}
+    </select>
 </mapper>

pz-system/src/main/resources/mapper/system/ZqghOrderMapper.xml

@@ -80,5 +80,10 @@
                  left join doctor on zqgh_order.doctor_id = doctor.id
         where total_order.id = #{id}
     </select>
+    <select id="selectFinishTime" resultType="java.lang.String">
+        select  DATE_FORMAT(time_of_appointment, '%Y-%m-%d')
+        FROM total_order t left join zqgh_order d on d.order_id = t.id
+        where t.id = #{id}
+    </select>
 
 </mapper>

pz-system/src/main/resources/mapper/system/ZyphOrderMapper.xml

@@ -99,5 +99,11 @@
         where total_order.id = #{id}
     </select>
 
+    <select id="selectFinishTime" resultType="java.lang.String">
+        select start_day
+                   from total_order t left join zyph_order d on d.order_id = t.id
+        where  t.id = #{id}
+    </select>
+
 
 </mapper>