1、更换支付接口

2、公司只看本公司的
3、移除部门打卡查看权限
4、修改app_id和secret
5、查询加入user_type

ruoyi-admin/src/main/java/com/ruoyi/web/controller/care/CareApplicationsController.java

@@ -7,8 +7,13 @@ import com.ruoyi.care.domain.CareApplications;
 import com.ruoyi.care.domain.CarePersonDie;
 import com.ruoyi.care.service.ICareApplicationsService;
 import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.bean.InstanceUtil;
+import com.ruoyi.system.service.ISysUserService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,7 +43,8 @@ public class CareApplicationsController extends BaseController
 {
     @Autowired
     private ICareApplicationsService careApplicationsService;
-
+    @Autowired
+    private ISysUserService userService;
     /**
      * 查询护理申请列表
      */
@@ -48,6 +54,11 @@ public class CareApplicationsController extends BaseController
     public TableDataInfo list(CareApplications careApplications)
     {
         startPage();
+        //判断当前是否是公司，如果是公司的话，只看指派给自己公司的
+        SysUser user = userService.selectUserById(getUserId());
+        if(user.getUserType().equals("01")){
+            careApplications.setCompanyUserId(user.getUserId());
+        }
         List<CareApplications> list = careApplicationsService.selectCareApplicationsList(careApplications);
         return getDataTable(list);
     }
@@ -233,4 +244,22 @@ public class CareApplicationsController extends BaseController
         List<CareApplications> list = careApplicationsService.selectCareApplicationsList(careApplications);
         return getDataTable(list);
     }
+
+
+    /**
+     * 修改支付状态
+     */
+    @Log(title = "护理申请", businessType = BusinessType.UPDATE)
+    @PostMapping("/pay")
+    public AjaxResult pay(@RequestBody CareApplications careApplications)
+    {
+        //查询数据库的护理申请
+        if(StringUtils.isBlank(careApplications.getApplyId().toString())){
+            return AjaxResult.error("修改的数据未提交标识");
+        }
+
+        careApplications.setUpdateBy(getUserId().toString());
+        return toAjax(careApplicationsService.updateCareApplications(careApplications));
+    }
+
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/care/CareNurseClocksController.java

@@ -46,7 +46,7 @@ public class CareNurseClocksController extends BaseController
     /**
      * 查询护理任务打卡列表
      */
-    @PreAuthorize("@ss.hasPermi('care:clocks:list')")
+//    @PreAuthorize("@ss.hasPermi('care:clocks:list')")
     @GetMapping("/list")
     public TableDataInfo list(CareNurseClocks careNurseClocks)
     {
@@ -71,7 +71,7 @@ public class CareNurseClocksController extends BaseController
     /**
      * 获取护理任务打卡详细信息
      */
-    @PreAuthorize("@ss.hasPermi('care:clocks:query')")
+//    @PreAuthorize("@ss.hasPermi('care:clocks:query')")
     @GetMapping(value = "/{clockId}")
     public AjaxResult getInfo(@PathVariable("clockId") Long clockId)
     {

ruoyi-common/src/main/java/com/ruoyi/common/utils/WeChat.java

@@ -13,8 +13,8 @@ import java.util.Map;
 
 public class WeChat {
 
-    private static final String APP_ID = "wxa5c97dfa28e626a9";
-    private static final String APP_SECRET = "aec1f83119a370f49d1b430dcd90f3a5";
+    private static final String APP_ID = "wxdea502a9303e2770";
+    private static final String APP_SECRET = "966f8825d9515325f9868800233e12c2";
     private static final String CODE_TO_SESSION_URL = "https://api.weixin.qq.com/sns/jscode2session";
 
     /**

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 	
 	<sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
+        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar,u.user_type, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         from sys_user u
@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
-	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+	    select distinct u.user_id, u.dept_id, u.user_name,u.user_type, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
 			 left join sys_user_role ur on u.user_id = ur.user_id
@@ -110,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
-	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name,u.user_type, u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
 			 left join sys_user_role ur on u.user_id = ur.user_id

ruoyi-vue/src/api/care/applications.js

@@ -36,6 +36,14 @@ export function updateApplications(data) {
   })
 }
 
+// 支付
+export function pay(data) {
+  return request({
+    url: '/care/applications/pay',
+    method: 'post',
+    data: data
+  })
+}
 // 删除护理申请
 export function delApplications(applyId) {
   return request({

ruoyi-vue/src/views/care/applications/index_money.vue

@@ -194,7 +194,7 @@
 </template>
 
 <script setup name="payApplications">
-import { listApplications, updateApplications } from "@/api/care/applications";
+import { listApplications, updateApplications,pay } from "@/api/care/applications";
 import { listAllHospital } from "@/api/care/hospital";
 import {listAllPersons} from "@/api/care/persons";
 import {listAllCompany} from "@/api/care/nurses";
@@ -246,6 +246,7 @@ const {queryParams, form, rules} = toRefs(data);
 function getList() {
   loading.value = true;
   queryParams.value.payStatus = 'dis_pay';
+  queryParams.value.dealStatus = 'complete';
   listApplications(queryParams.value).then(response => {
     applicationsPayList.value = response.rows;
     total.value = response.total;
@@ -256,6 +257,7 @@ function getList() {
 function getIsPayList() {
   loading.value = true;
   queryParams.value.payStatus = 'is_pay';
+  queryParams.value.dealStatus = 'complete';
   listApplications(queryParams.value).then(response => {
     applicationsIsPayList.value = response.rows;
     assignTotal.value = response.total;
@@ -326,7 +328,7 @@ function handleSelectionChange(selection) {
 function handleUpdate(row) {
   proxy.$modal.confirm('是否支付"' + row.personName + '"的护理？').then(function() {
     row.payStatus = 'is_pay';
-    updateApplications(row).then(response => {
+    pay(row).then(response => {
       proxy.$modal.msgSuccess("支付成功");
       getList();
       getIsPayList();
@@ -338,7 +340,7 @@ function handleUpdate(row) {
 function handleCancel(row) {
   proxy.$modal.confirm('是否取消支付"' + row.personName + '"的护理？').then(function() {
     row.payStatus = 'dis_pay';
-    updateApplications(row).then(response => {
+    pay(row).then(response => {
       proxy.$modal.msgSuccess("取消支付成功");
       open.value = false;
       getList();