From 8d2f7a09bb2ca54aa57d2157c54c448ec3dc3315 Mon Sep 17 00:00:00 2001
From: = <=>
Date: Wed, 5 Mar 2025 18:39:33 +0800
Subject: [PATCH 01/17] =?UTF-8?q?=E7=BC=B4=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MemberPaymentConfigController.java        |  24 +++
 ...va => MemberPaymentProjectController.java} |  35 +--
 .../MemberPaymentSummaryController.java       |  21 +-
 .../memberCost/model/MemberPaymentConfig.java |  12 +-
 .../model/MemberPaymentProject.java           |  24 ++-
 .../platform/healthCheckup/listMange.html     |   6 +-
 .../platform/memberCost/payment/config.html   | 200 ++++++++++++++----
 .../payment/{manage.html => project.html}     |  90 ++++----
 .../platform/memberCost/payment/summary.html  |  31 ++-
 .../views/platform/zgfw/condolence/fr.html    |   4 +-
 .../views/platform/zgfw/condolence/index.html |   6 +-
 11 files changed, 326 insertions(+), 127 deletions(-)
 rename src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/{MemberPaymentManageController.java => MemberPaymentProjectController.java} (87%)
 rename src/main/resources/views/platform/memberCost/payment/{manage.html => project.html} (86%)

diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentConfigController.java b/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentConfigController.java
index 7e4d016..46a2552 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentConfigController.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentConfigController.java
@@ -1,14 +1,21 @@
 package io.v.nutz.zhgh.memberCost.controller.payment;
 
 import io.v.nutz.base.annontation.ViReturn;
+import io.v.nutz.base.dao.CndPlus;
+import io.v.nutz.base.query.PageForm;
 import io.v.nutz.zhgh.memberCost.model.MemberPaymentConfig;
 import io.v.nutz.zhgh.memberCost.service.MemberPaymentService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.Strings;
 import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
 
 
 @IocBean
@@ -26,6 +33,23 @@ public class MemberPaymentConfigController {
     public void index() {}
 
 
+    @At
+    @ViReturn
+    @RequiresPermissions("member.payment.config")
+    public Object pageData(PageForm pageForm,
+                           @Param(value = "name", required = false) String name) {
+        Sql sql = Sqls.create("select * from member_payment_config $condition");
+        CndPlus cnd = CndPlus.create();
+
+        if (Strings.isNotBlank(name)) {
+            cnd.and(Cnd.likeEX("name", name));
+        }
+//        cnd.desc("project.`year`");
+        cnd.desc("createdAt");
+        sql.setCondition(cnd);
+        return memberPaymentService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+    }
+
     @At
     @ViReturn
     public Object getPaymentConfig(){
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentManageController.java b/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentProjectController.java
similarity index 87%
rename from src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentManageController.java
rename to src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentProjectController.java
index 4ad2167..6d4fb96 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentManageController.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentProjectController.java
@@ -23,9 +23,7 @@ import org.nutz.dao.sql.Sql;
 import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
-import org.nutz.json.Json;
 import org.nutz.lang.Strings;
-import org.nutz.lang.util.NutMap;
 import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
 import org.nutz.mvc.annotation.Param;
@@ -43,22 +41,22 @@ import java.util.stream.Collectors;
 @IocBean
 @Slf4j
 @Ok("json:full")
-@At("/platform/member/payment/manage")
-public class MemberPaymentManageController {
+@At("/platform/member/payment/project")
+public class MemberPaymentProjectController {
 
     @Inject
     private MemberPaymentService memberPaymentService;
 
     @At("")
-    @Ok("beetl:/platform/memberCost/payment/manage.html")
-    @RequiresPermissions("member.payment.manage")
+    @Ok("beetl:/platform/memberCost/payment/project.html")
+    @RequiresPermissions("member.payment.project")
     public void index() {
     }
 
 
     @At
     @ViReturn
-    @RequiresPermissions("member.payment.manage")
+    @RequiresPermissions("member.payment.project")
     public Object pageData(PageForm pageForm,
                            @Param(value = "year", required = false) String year,
                            @Param(value = "projectName", required = false) String projectName) {
@@ -83,7 +81,7 @@ public class MemberPaymentManageController {
      */
     @At
     @ViReturn
-    @RequiresPermissions("member.payment.manage")
+    @RequiresPermissions("member.payment.project")
     public Object openClosedProject(String id) {
         //位运算 取反
         memberPaymentService.dao().update(MemberPaymentProject.class,
@@ -101,7 +99,7 @@ public class MemberPaymentManageController {
      */
     @At
     @ViReturn
-    @RequiresPermissions("member.payment.manage")
+    @RequiresPermissions("member.payment.project")
     public Object doSave(MemberPaymentProject paymentProject) {
         memberPaymentService.insertOrUpdate(paymentProject);
         return null;
@@ -117,7 +115,7 @@ public class MemberPaymentManageController {
      */
     @At
     @ViReturn
-    @RequiresPermissions("member.payment.manage")
+    @RequiresPermissions("member.payment.project")
     public Object doSetPayment(String id, Boolean isRenew) {
         //如果不是更新缴费人员，就删除该项目下的所有待缴费信息，再重新设置
         if (!isRenew) {
@@ -143,7 +141,7 @@ public class MemberPaymentManageController {
         //获取缴费项目
         MemberPaymentProject project = memberPaymentService.dao().fetch(MemberPaymentProject.class, id);
         //该项目的缴费月份是几月到几月，转为数组，判断新入职教工应缴费几个月
-        String[] strings = project.getPaymentMonth().substring(0, project.getPaymentMonth().length() - 1).split("-");
+        String[] strings = project.getPaymentStartMonth().substring(0, project.getPaymentStartMonth().length() - 1).split("-");
         DateTime beginDate = DateUtil.parse(project.getYear() + "-" + strings[0] + "-01");
         //获取月份的最后一天
         DateTime endDate = DateUtil.endOfMonth(DateUtil.parse(project.getYear() + "-" + strings[1] + "-01"));
@@ -205,7 +203,7 @@ public class MemberPaymentManageController {
      * @return
      */
     @At
-    @RequiresPermissions("member.payment.manage")
+    @RequiresPermissions("member.payment.project")
     @Aop(TransAop.READ_COMMITTED)
     public Object doRemove(String id) {
         int paymentCount = memberPaymentService.count(Cnd.where("paymentProjectId", "=", id).and("isPayment", "=", 1));
@@ -226,7 +224,7 @@ public class MemberPaymentManageController {
      */
     @At
     @ViReturn
-    @RequiresPermissions("member.payment.manage")
+    @RequiresPermissions("member.payment.project")
     public Object getAllProject(String year) {
         CndPlus cnd = CndPlus.create();
         cnd.and("isDisabled", "=", 0);
@@ -246,16 +244,5 @@ public class MemberPaymentManageController {
     }
 
 
-    @At
-    @ViReturn
-    @RequiresPermissions("member.payment.manage")
-    public Object isMonthCreatedByYear(@Param("year") String year, @Param("monthSelect") String monthSelect, @Param("id") String projectId) {
-        List<NutMap> nutMapList = Json.fromJsonAsList(NutMap.class, monthSelect);
-        for (NutMap nutMap : nutMapList) {
-            int count = memberPaymentService.dao().count(MemberPaymentProject.class, Cnd.where("`year`", "=", year).and("paymentMonth", "=", nutMap.getString("label")));
-            nutMap.setv("code", count > 0 ? 1 : 0);
-        }
-        return nutMapList;
-    }
 
 }
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentSummaryController.java b/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentSummaryController.java
index 0b60e6a..0d6c90a 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentSummaryController.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentSummaryController.java
@@ -75,7 +75,7 @@ public class MemberPaymentSummaryController {
     public Sql dataSql(String pageOrderName, String pageOrderBy, String searchName, String searchKeyword,
                        String unionId, String unitId, String threeUnitId, String unionGroupId,
                        String personType, String userState, String paymentProjectId, String year,
-                       String isPay) {
+                       String isPay,String schoolTime,String retireDate) {
         Sql sql = Sqls.create("""
                 SELECT
                 	mpi.*,
@@ -95,7 +95,12 @@ public class MemberPaymentSummaryController {
                 	u.threeUnitCode,
                 	u.unionGroupName,
                 	u.mobile,
-                	u.birthday
+                	u.birthday,
+                	u.schoolTime,
+                 	u.retireDate,
+                 	u.workDate,
+                 	startSalaryDate,
+                 	renewTime
                 FROM
                 	`member_payment_info` mpi
                 	LEFT JOIN `user` u ON u.id = mpi.userId
@@ -124,6 +129,8 @@ public class MemberPaymentSummaryController {
         cnd.andEX("u.unionGroupId", "=", unionGroupId);
         cnd.andEX("u.personType", "=", personType);
         cnd.andEX("u.userState", "=", userState);
+        cnd.andEX("u.schoolTime", "=", schoolTime);
+        cnd.andEX("u.retireDate", "=", retireDate);
         cnd.groupBy("u.id");
 
         if (StrUtil.isNotBlank(pageOrderName) && StrUtil.isNotBlank(pageOrderBy)) {
@@ -150,10 +157,12 @@ public class MemberPaymentSummaryController {
                            @Param(value = "userState", required = false) String userState,
                            @Param(value = "paymentProjectId", required = false) String paymentProjectId,
                            @Param(value = "year", required = false) String year,
-                           @Param(value = "isPay", required = false) String isPay) {
+                           @Param(value = "isPay", required = false) String isPay,
+                           @Param(value = "schoolTime", required = false) String schoolTime,
+                           @Param(value = "retireDate", required = false) String retireDate) {
         Sql sql = this.dataSql(pageForm.getPageOrderName(), pageForm.getPageOrderBy(), pageForm.getSearchName(),
                 pageForm.getSearchKeyword(), unionId, unitId, threeUnitId, unionGroupId,
-                personType, userState, paymentProjectId, year, isPay);
+                personType, userState, paymentProjectId, year, isPay,schoolTime,retireDate);
         return memberPaymentService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
     }
 
@@ -285,9 +294,11 @@ public class MemberPaymentSummaryController {
                          @Param(value = "paymentProjectId", required = false) String paymentProjectId,
                          @Param(value = "year", required = false) String year,
                          @Param(value = "isPay", required = false) String isPay,
+                         @Param(value = "isPay", required = false) String schoolTime,
+                         @Param(value = "isPay", required = false) String retireDate,
                          boolean isZip, HttpServletResponse response) {
         Sql sql = this.dataSql(null, null, searchName, searchKeyword, unionId, unitId, threeUnitId,
-                unionGroupId, personType, userState, paymentProjectId, year, isPay);
+                unionGroupId, personType, userState, paymentProjectId, year, isPay,schoolTime,retireDate);
 
         List<NutMap> list = memberPaymentService.listMap(sql);
         NutMap nutMap = list.stream().findFirst().orElse(null);
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/model/MemberPaymentConfig.java b/src/main/java/io/v/nutz/zhgh/memberCost/model/MemberPaymentConfig.java
index 6f7b9de..793707d 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/model/MemberPaymentConfig.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/model/MemberPaymentConfig.java
@@ -1,5 +1,6 @@
 package io.v.nutz.zhgh.memberCost.model;
 
+import io.v.nutz.base.model.BaseModel;
 import lombok.Data;
 import org.nutz.dao.entity.annotation.*;
 import org.nutz.dao.interceptor.annotation.PrevInsert;
@@ -10,7 +11,7 @@ import java.util.List;
 
 @Data
 @Table
-public class MemberPaymentConfig {
+public class MemberPaymentConfig extends BaseModel {
 
     @Column
     @Name
@@ -19,6 +20,11 @@ public class MemberPaymentConfig {
     @PrevInsert(uu32 = true)
     private String id;
 
+    @Column
+    @Comment("缴费配置名称")
+    @ColDefine(type = ColType.VARCHAR,width = 50)
+    private String name;
+
     @Column
     @Comment("缴费标准")
     @ColDefine(type = ColType.MYSQL_JSON)
@@ -39,6 +45,10 @@ public class MemberPaymentConfig {
     @ColDefine(type = ColType.VARCHAR,width = 10)
     private String paidDuration;
 
+    @Column
+    @Comment("是否开启")
+    @ColDefine(type = ColType.BOOLEAN)
+    private boolean isDisabled;
 
     @Data
     public static class PayStandards implements Serializable {
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/model/MemberPaymentProject.java b/src/main/java/io/v/nutz/zhgh/memberCost/model/MemberPaymentProject.java
index a3ea16c..92b8cef 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/model/MemberPaymentProject.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/model/MemberPaymentProject.java
@@ -1,5 +1,6 @@
 package io.v.nutz.zhgh.memberCost.model;
 
+import io.v.nutz.base.model.BaseModel;
 import lombok.Data;
 import org.nutz.dao.entity.annotation.*;
 import org.nutz.dao.interceptor.annotation.PrevInsert;
@@ -8,7 +9,7 @@ import java.util.Date;
 
 @Data
 @Table
-public class MemberPaymentProject {
+public class MemberPaymentProject extends BaseModel {
 
     @Column
     @Name
@@ -39,7 +40,22 @@ public class MemberPaymentProject {
 
 
     @Column
-    @Comment("缴费月份")
-    @ColDefine(type = ColType.VARCHAR, width = 10)
-    private String paymentMonth;
+    @Comment("开始缴费月份")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String paymentStartMonth;
+
+    @Column
+    @Comment("结束缴费月份")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String paymentEndMonth;
+
+    @Column
+    @Comment("开始缴费时间")
+    @ColDefine(type = ColType.VARCHAR,width = 32)
+    private String startTime;
+
+    @Column
+    @Comment("结束缴费时间")
+    @ColDefine(type = ColType.VARCHAR,width = 32)
+    private String endTime;
 }
diff --git a/src/main/resources/views/platform/healthCheckup/listMange.html b/src/main/resources/views/platform/healthCheckup/listMange.html
index 9fd2ba7..e12c610 100644
--- a/src/main/resources/views/platform/healthCheckup/listMange.html
+++ b/src/main/resources/views/platform/healthCheckup/listMange.html
@@ -44,8 +44,8 @@ layout("/layouts/platform.html"){
                                       style="width: 100%" v-model="pageForm.searchKeyword">
                                 <el-select slot="prepend" style="width: 80px;"
                                            v-model="pageForm.searchName">
-                                    <el-option label="姓名" value="u.username"></el-option>
-                                    <el-option label="工号" value="u.loginname"></el-option>
+                                    <el-option label="姓名" value="hcu.username"></el-option>
+                                    <el-option label="工号" value="hcu.loginname"></el-option>
                                 </el-select>
                             </el-input>
                         </div>
@@ -217,7 +217,7 @@ layout("/layouts/platform.html"){
             return {
                 pageForm: {
                     year: moment().format('YYYY'),
-                    searchName: "u.username",
+                    searchName: "hcu.username",
                 },
                 threeUnits: [],
                 unionGroups: [],
diff --git a/src/main/resources/views/platform/memberCost/payment/config.html b/src/main/resources/views/platform/memberCost/payment/config.html
index f7b97b8..2b67e2a 100644
--- a/src/main/resources/views/platform/memberCost/payment/config.html
+++ b/src/main/resources/views/platform/memberCost/payment/config.html
@@ -10,14 +10,103 @@ layout("/layouts/platform.html"){
 </style>
 <div id="app" v-cloak>
     <guava ref="guava">
-        <el-card shadow="never">
-            <div slot="header" class="clearfix">
-                <h3 style="color: rgb(24, 103, 176);font-family: Microsoft YaHei;">缴费配置</h3>
-            </div>
+        <template>
+            <el-card shadow="never">
+                <div class="search">
+                    <div class="search-item">
+                        <div class="search-item-label">缴费配置：</div>
+                        <div class="search-item-option">
+                            <el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
+                                      style="width: 100%"
+                                      v-model="pageForm.projectName">
+                            </el-input>
+                        </div>
+                    </div>
+                    <div class="search-query">
+                        <el-button type="primary" icon="el-icon-search" @click="doSearch">搜索
+                        </el-button>
+                    </div>
+                </div>
+            </el-card>
+
+            <el-card class="mt10" shadow="never">
+                <table-tool :app="this" label="缴费配置列表">
+                    <template #func>
+                        <el-button @click="openAdd" size="small" type="primary">
+                            新增缴费配置
+                        </el-button>
+                    </template>
+                </table-tool>
+
+                <el-table :data="tableData" :size="tableSize"
+                          @sort-change="pageOrder"
+                          class="vi-table"
+                          ref="table" row-key="id" style="width: 100%"
+                          v-loading="tableLoading">
+                    <el-table-column :index="indexMethod" align="center" header-align="center"
+                                     label="序号" type="index"
+                                     width="80px"></el-table-column>
+
+                    <el-table-column
+                        :label="column.label"
+                        :prop="column.prop"
+                        :sortable="column.sortable"
+                        align="center"
+                        header-align="center"
+                        show-overflow-tooltip
+                        v-for="column in tableColumns"
+                    >
+                        <template scope="{row}" v-if="column.prop==='isDisabled'">
+                            <el-switch
+                                :active-value="false"
+                                :inactive-value="true"
+                                @change="(val)=>{projectStatusChange(row.id)}"
+                                active-color="#13ce66"
+                                inactive-color="#ff4949"
+                                v-model="row.isDisabled">
+                            </el-switch>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column prop="userOnline" align="center" header-align="center"
+                                     label="操作"
+                                     width="100px">
+                        <template scope="scope">
+                            <el-dropdown @command="dropdownCommand">
+                                <el-button :loading="submitLoading" plain size="mini">
+                                    <i class="ti-settings"></i>
+                                    <span class="ti-angle-down"></span>
+                                </el-button>
+                                <el-dropdown-menu slot="dropdown">
+                                    <el-dropdown-item :command="{type:'edit',data:scope.row}">
+                                        编辑
+                                    </el-dropdown-item>
+                                    <el-dropdown-item :command="{type:'remove',data:scope.row}">
+                                        删除
+                                    </el-dropdown-item>
+                                </el-dropdown-menu>
+                            </el-dropdown>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <!--#include("/layouts/pagination.html"){}#-->
+            </el-card>
+        </template>
+        <template #view>
+
 
             <el-form :model="formData" ref="addForm" :rules="rules"
                      label-width="120px"
                      style="margin: 10px 0 0 0">
+                <vi-title title="缴费配置"></vi-title>
+                <el-row :gutter="20">
+                    <el-col :span="8">
+                        <el-form-item label="配置名称" prop="paidDuration">
+                            <el-input v-model="formData.paidDuration"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
                 <vi-title title="缴纳标准"></vi-title>
                 <el-row :gutter="20">
                     <el-col :span="24">
@@ -39,43 +128,62 @@ layout("/layouts/platform.html"){
                                         <el-form-item :prop="'payStandards.'+$index+'.payPersonnel'"
                                                       :rules="[{required:true,message:'必填',trigger:['change','blur']}]"
                                                       label-width="0">
-                                            <el-input clearable maxlength="100" placeholder="请输入缴费人员"
-                                                      v-model="row.payPersonnel"></el-input>
-                                        </el-form-item>
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="缴费模式" prop="payMode" width="200">
-                                    <template scope="{row,$index}">
-                                        <el-form-item :prop="'payStandards.'+$index+'.payMode'"
-                                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]"
-                                                      label-width="0">
-                                            <el-select placeholder="请选择缴费模式" v-model="row.payMode"
-                                                       style="width: 100%">
-                                                <el-option v-for="item in payModeList" :label="item.value" :value="item.code"></el-option>
+   <!--                                         <el-input clearable maxlength="100" placeholder="请输入缴费人员"
+                                                      v-model="row.payPersonnel"></el-input>-->
+                                            <el-select  placeholder="请选择人员类型" v-model="row.payPersonnel"
+                                                       style="width: 100%" clearable>
+                                                <el-option v-for="item in memberTypeList" :label="item.name" :value="item.code"></el-option>
                                             </el-select>
                                         </el-form-item>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="人员类型" prop="personTypes" width="300">
+                                <el-table-column label="人员类型" prop="personType" >
                                     <template slot-scope="{row,$index}">
-                                        <el-select multiple placeholder="请选择人员类型" v-model="row.personTypes"
-                                                   style="width: 100%" clearable>
+                                        <el-select @change="row.payMode=null" placeholder="请选择人员类型" v-model="row.personType"
+                                                    style="width: 100%" clearable>
                                             <el-option v-for="item in personTypeList" :label="item.name" :value="item.code"></el-option>
                                         </el-select>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="缴费标准" prop="payModeValue">
+                                <el-table-column label="缴费模式" prop="payMode" >
+                                    <template scope="{row,$index}">
+                                        <el-form-item :prop="'payStandards.'+$index+'.payMode'"
+                                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]"
+                                                      label-width="0">
+                                            <el-select  placeholder="请选择缴费模式" v-model="row.payMode"
+                                                       style="width: 100%">
+                                                <el-option :disabled="row.personType!='非编'" label="固定金额缴纳" value="1"></el-option>
+                                                <el-option :disabled="row.personType!='在编'" label="按比例缴纳" value="2"></el-option>
+                                                <el-option  label="导入" value="3"></el-option>
+                                            </el-select>
+                                        </el-form-item>
+                                    </template>
+                                </el-table-column>
+
+<!--                                <el-table-column label="在职状态" prop="userState" >
+                                    <template slot-scope="{row,$index}">
+                                        <el-select  placeholder="请选择在职状态" v-model="row.userState"
+                                                   style="width: 100%" clearable>
+                                            <el-option v-for="item in userStateList" :label="item.name" :value="item.code"></el-option>
+                                        </el-select>
+                                    </template>
+                                </el-table-column>-->
+                                <el-table-column label="缴费标准" prop="payModeValue" width="650">
                                     <template scope="{row,$index}">
 
                                         <div v-if="row.payMode=='2'">
                                             <el-form-item :prop="'payStandards.'+$index+'.payModeValueList'"
                                                           :rules="[{required:true,message:'必填',trigger:['change','blur']}]"
                                                           label-width="0">
-                                                <div style="display:flex;justify-content: space-between;margin-left: 30px">
+                                                <div  style="display:flex;justify-content: space-between;margin-left: 30px">
                                                     (
-                                                    <template v-for="(o,i) in row.payModeValueList">
-                                                        <el-input placeholder="请输入" style="width: 120px;"
-                                                                  v-model="o.name">
+                                                    <template v-for="(o,i) in row.payModeValueList" >
+                                                        <el-input maxlength="5"  placeholder="" style="width: 200px;"
+                                                                  v-model="o.value">
+                                                            <el-select style="width: 105px;" v-model="o.name" slot="prepend" placeholder="请选择">
+                                                                <el-option label="岗位工资" value="1"></el-option>
+                                                                <el-option label="薪级工资" value="2"></el-option>
+                                                            </el-select>
                                                             <el-button @click="row.payModeValueList.splice(i, 1)" slot="append" style="padding: 0 7px;"
                                                                        icon="el-icon-circle-close"></el-button>
                                                         </el-input>
@@ -96,7 +204,7 @@ layout("/layouts/platform.html"){
                                                           label-width="0">
 
                                                 <div v-if="row.payMode == '1'">
-                                                    <el-input clearable maxlength="100" type="number" placeholder="请输入缴费金额"
+                                                    <el-input clearable maxlength="5" type="number" placeholder="请输入缴费金额"
                                                               v-model="row.payModeValue"></el-input>
                                                 </div>
                                                 <div v-if="row.payMode == '3'" style="text-align: center">
@@ -125,7 +233,7 @@ layout("/layouts/platform.html"){
                     </el-col>
                 </el-row>
 
-                <vi-title title="退会标准"></vi-title>
+<!--                <vi-title title="退会标准"></vi-title>
                 <el-row :gutter="20">
                     <el-col :span="8">
                         <el-form-item label="未缴费退会时间" prop="unPaidExitDuration">
@@ -161,17 +269,17 @@ layout("/layouts/platform.html"){
                     <div style="margin-top: 10px">
                         <span style="color: red">说明：多长时间缴费一次。</span>
                     </div>
-                </el-row>
+                </el-row>-->
             </el-form>
 
-            <el-row class="mt10" justify="center" type="flex">
-                <el-button @click="doSubmit" style="width: 300px" type="primary">保存
+            <div>
+                <el-button @click="doSubmit" v-if="isSubmit" v-loading="submitLoading" style="float: right"
+                           type="primary">
+                    提交
                 </el-button>
-                <el-button @click="doSubmit" style="width: 300px" type="primary">提交
-                </el-button>
-            </el-row>
+            </div>
 
-        </el-card>
+        </template>
     </guava>
 </div>
 
@@ -183,15 +291,30 @@ layout("/layouts/platform.html"){
             return {
                 payModeList:[{code:'1',value:'固定金额缴纳'},{code:'2',value:'按比例缴纳'},{code:'3',value:'导入'}],
                 formData: {
-                    payStandards: [{payPersonnel: null, payMode: '1', personTypes: null, payModeValue: null,payModeValueList:[{name:'',value:''}]}]
+                    payStandards: [{payPersonnel: null, payMode: null, personTypes: null, payModeValue: null,payModeValueList:[{name:'',value:''}]}]
                 },
                 rules: {
                     exit: [{required: true, message: '必填', trigger: ['blur', 'change']}],
                 },
                 personTypeList:[],
+                userStateList:[],
+                memberTypeList:[],
+                pageForm:{},
+                tableData:[],
+                tableColumns:[
+                    {prop: 'name', label: '配置名称'},
+                    {prop: 'unPaidExitDuration', label: '未缴费退会时长'},
+                    {prop: 'exitMode', label: '退会模式'},
+                    {prop: 'paidDuration', label: '缴费时长'},
+                    {prop: 'isDisabled', label: '开启状态'},
+                ],
+                isSubmit: true,
             }
         },
         methods: {
+            openAdd(){
+                this.$refs.guava.view()
+            },
             async doSubmit(){
                 const formData = clone(this.formData)
                 formData.payStandards = JSON.stringify(this.formData.payStandards)
@@ -216,8 +339,13 @@ layout("/layouts/platform.html"){
             }
         },
         async created() {
+            this.pageData()
             this.personTypeList = await getDictOptions('UserType')
-            await this.getPaymentConfig()
+            //在职状态
+            this.userStateList = await getDictOptions('UserState')
+            //会员类型
+            this.memberTypeList = await getDictOptions('memberType')
+
         }
     })
 </script>
diff --git a/src/main/resources/views/platform/memberCost/payment/manage.html b/src/main/resources/views/platform/memberCost/payment/project.html
similarity index 86%
rename from src/main/resources/views/platform/memberCost/payment/manage.html
rename to src/main/resources/views/platform/memberCost/payment/project.html
index 264a496..8a87e94 100644
--- a/src/main/resources/views/platform/memberCost/payment/manage.html
+++ b/src/main/resources/views/platform/memberCost/payment/project.html
@@ -83,6 +83,9 @@ layout("/layouts/platform.html"){
                                     v-model="row.isDisabled">
                             </el-switch>
                         </template>
+                        <template scope="{row}" v-if="column.prop==='paymentMonth'">
+                            <span>{{row.paymentStartMonth}} 至 {{row.paymentEndMonth}}</span>
+                        </template>
                     </el-table-column>
 
                     <el-table-column prop="userOnline" align="center" header-align="center"
@@ -132,20 +135,19 @@ layout("/layouts/platform.html"){
                     <el-input maxlength="100" placeholder="项目名称" v-model="formData.projectName"></el-input>
                 </el-form-item>
                 <el-row :gutter="20">
-                    <el-col span="12">
+                    <el-col :span="12">
                         <el-form-item label="缴费年度" prop="year">
                             <el-date-picker
                                     :clearable="false"
                                     placeholder="选择年度"
                                     type="year" style="width: 100%"
                                     v-model="formData.year"
-                                    @change="isMonthCreatedByYear"
                                     value-format="yyyy">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
 
-                    <el-col span="12">
+                    <el-col :span="12">
                         <el-form-item label="创建日期" prop="createTime">
                             <el-date-picker
                                     placeholder="创建日期"
@@ -160,12 +162,34 @@ layout("/layouts/platform.html"){
                 </el-row>
 
                 <el-row :gutter="20">
-                    <el-col :span="24">
+                    <el-col :span="12">
                         <el-form-item label="缴费月份" prop="paymentMonth" size="medium">
-                            <el-radio-group v-model="formData.paymentMonth">
+                            <!--<el-radio-group v-model="formData.paymentMonth">
                                 <el-radio-button v-for="item in monthSelect" :label="item.label"
                                                  :disabled="item.code===1"></el-radio-button>
-                            </el-radio-group>
+                            </el-radio-group>-->
+                            <el-date-picker
+                                v-model="formData.paymentMonth"
+                                type="monthrange"
+                                range-separator="至"
+                                style="width: 100%"
+                                value-format="yyyy-MM"
+                                start-placeholder="开始月份"
+                                end-placeholder="结束月份">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="缴费时间" prop="paymentTime" size="medium">
+                            <el-date-picker
+                                v-model="formData.paymentTime"
+                                type="daterange"
+                                value-format="yyyy-MM-dd"
+                                range-separator="至"
+                                style="width: 100%"
+                                start-placeholder="开始日期"
+                                end-placeholder="结束日期">
+                            </el-date-picker>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -196,6 +220,9 @@ layout("/layouts/platform.html"){
                 tableColumns: [
                     {prop: 'year', label: '年度', sortable: true},
                     {prop: 'projectName', label: '项目名称', sortable: true},
+                    {prop: 'paymentMonth', label: '缴费月份', sortable: true},
+                    {prop: 'startTime', label: '缴费开始时间', sortable: true},
+                    {prop: 'endTime', label: '缴费截止时间', sortable: true},
                     {prop: 'createTime', label: '创建时间', sortable: true},
                     {prop: 'isDisabled', label: '开启状态'},
                 ],
@@ -206,6 +233,7 @@ layout("/layouts/platform.html"){
                     projectName: [{required: true, message: '必填', trigger: ['blur', 'change']}],
                     year: [{required: true, message: '必填', trigger: ['blur', 'change']}],
                     paymentMonth: [{required: true, message: '必填', trigger: ['blur', 'change']}],
+                    paymentTime: [{required: true, message: '必填', trigger: ['blur', 'change']}],
                 },
                 paymentConfig: {},
                 monthSelect: []
@@ -243,7 +271,11 @@ layout("/layouts/platform.html"){
             },
             openEdit(data) {
                 this.formData = {}
-                this.formData = {...data}
+                this.formData = {
+                    ...data,
+                    paymentMonth:[data.paymentStartMonth, data.paymentEndMonth],
+                    paymentTime:[data.startTime, data.endTime],
+                }
                 this.isSubmit = true
                 this.$refs.guava.view()
             },
@@ -324,7 +356,6 @@ layout("/layouts/platform.html"){
                     year: moment().format('YYYY'),
                 }
                 this.$refs.guava.view()
-                this.isMonthCreatedByYear()
             },
             async doSave() {
                 const formValid = await this.$refs["form"].validate()
@@ -336,15 +367,11 @@ layout("/layouts/platform.html"){
                         spinner: 'el-icon-loading',
                         background: 'rgba(0, 0, 0, 0.7)'
                     });
-
+                    this.formData.startTime=this.formData.paymentTime[0]
+                    this.formData.endTime=this.formData.paymentTime[1]
+                    this.formData.paymentStartMonth=this.formData.paymentMonth[0]
+                    this.formData.paymentEndMonth=this.formData.paymentMonth[1]
                     const formData = clone(this.formData)
-                    const o = this.monthSelect.find(v => v.label === formData.paymentMonth)
-                    if (o.code === 1) {
-                        this.notifyWarning("该年份下的此月份已创建了项目，请选择其他月份！")
-                        loading.close()
-                        this.submitLoading = false
-                        return
-                    }
                     const resp = await $.post(loc() + '/doSave', formData)
                     loading.close()
                     this.submitLoading = false
@@ -366,40 +393,9 @@ layout("/layouts/platform.html"){
                     this.notifyWarning(resp.msg)
                 }
             },
-            async getPaymentConfig() {
-                const resp = await $.get('/platform/member/payment/config/getPaymentConfig')
-                if (resp.code === 0) {
-                    this.paymentConfig = resp.data
-                    const arr = []
-                    let monthHalve = this.paymentConfig.paidDuration
-                    let halve = 12 / monthHalve
-
-                    for (let i = 1; i <= halve; i++) {
-                        let value = (Number(i) - 1) * monthHalve + 1;
-                        let followValue = i * monthHalve
-                        if (i === 1) {
-                            arr.push({label: i + '-' + monthHalve + '月', code: 0})
-                        } else {
-                            arr.push({label: value + '-' + followValue + '月', code: 0})
-                        }
-                    }
-                    this.monthSelect = arr
-                }
-            },
-            async isMonthCreatedByYear() {
-                console.log(this.formData.year)
-                const resp = await $.post(loc() + '/isMonthCreatedByYear', {
-                    year: this.formData.year,
-                    monthSelect: JSON.stringify(this.monthSelect)
-                })
-                if (resp.code === 0) {
-                    this.monthSelect = resp.data
-                }
-            }
         },
         async created() {
             this.pageData()
-            await this.getPaymentConfig();
         }
     })
 </script>
diff --git a/src/main/resources/views/platform/memberCost/payment/summary.html b/src/main/resources/views/platform/memberCost/payment/summary.html
index e5c50f0..46ce62d 100644
--- a/src/main/resources/views/platform/memberCost/payment/summary.html
+++ b/src/main/resources/views/platform/memberCost/payment/summary.html
@@ -143,6 +143,32 @@ layout("/layouts/platform.html"){
                                 ></dict-select>
                             </div>
                         </div>
+
+                        <div class="search-item">
+                            <div class="search-item-label">入职时间：</div>
+                            <div class="search-item-option">
+                                <el-date-picker
+                                    value-format="yyyy-MM-dd"
+                                    v-model="pageForm.schoolTime"
+                                    type="date"
+                                    style="width: 100%"
+                                    placeholder="选择日期">
+                                </el-date-picker>
+                            </div>
+                        </div>
+
+                        <div class="search-item">
+                            <div class="search-item-label">退休时间：</div>
+                            <div class="search-item-option">
+                                <el-date-picker
+                                    value-format="yyyy-MM-dd"
+                                    v-model="pageForm.retireDate"
+                                    type="date"
+                                    style="width: 100%"
+                                    placeholder="选择日期">
+                                </el-date-picker>
+                            </div>
+                        </div>
                     </template>
                     <div class="search-query">
                         <el-button type="primary" icon="el-icon-search" @click="doSearch">搜索</el-button>
@@ -267,8 +293,9 @@ layout("/layouts/platform.html"){
                 tableColumns: [
                     { prop: "loginname", label: "工号", sortable: true },
                     { prop: "username", label: "姓名" },
-                    { prop: "sex", label: "性别" },
                     { prop: "mobile", label: "联系电话" },
+                    { prop: "schoolTime", label: "入职时间" },
+                    { prop: "retireDate", label: "退休时间" },
                     { prop: "personType", label: "人员类型", sortable: true },
                     { prop: "userState", label: "在职状态", sortable: true },
                     { prop: "unionname", label: "所属工会", sortable: true },
@@ -491,7 +518,7 @@ layout("/layouts/platform.html"){
                 this.checkUsers = val
             },
             async getProjectList() {
-                const resp = await $.get("/platform/member/payment/manage/getAllProject", { year: this.pageForm.year })
+                const resp = await $.get("/platform/member/payment/project/getAllProject", { year: this.pageForm.year })
                 if (resp.code === 0) {
                     this.paymentProjectList = resp.data
                     this.$set(this.pageForm, "paymentProjectId", this.paymentProjectList ? this.paymentProjectList[0].id : null)
diff --git a/src/main/resources/views/platform/zgfw/condolence/fr.html b/src/main/resources/views/platform/zgfw/condolence/fr.html
index d67b914..198a3c9 100644
--- a/src/main/resources/views/platform/zgfw/condolence/fr.html
+++ b/src/main/resources/views/platform/zgfw/condolence/fr.html
@@ -93,8 +93,8 @@ layout("/layouts/platform.html"){
                     <el-table-column show-overflow-tooltip label="所在单位" prop="be_unitname" header-align="center"
                                      sortable
                                      align="center"></el-table-column>
-                    <el-table-column show-overflow-tooltip label="联系方式" prop="mobile" header-align="center"
-                                     align="center"></el-table-column>
+<!--                    <el-table-column show-overflow-tooltip label="联系方式" prop="mobile" header-align="center"-->
+<!--                                     align="center"></el-table-column>-->
                     <el-table-column label="慰问类型" prop="type_name" header-align="center" sortable
                                      align="center"></el-table-column>
                     <el-table-column label="慰问方式" prop="way" header-align="center"
diff --git a/src/main/resources/views/platform/zgfw/condolence/index.html b/src/main/resources/views/platform/zgfw/condolence/index.html
index c1db320..fc9390e 100644
--- a/src/main/resources/views/platform/zgfw/condolence/index.html
+++ b/src/main/resources/views/platform/zgfw/condolence/index.html
@@ -101,9 +101,9 @@ layout("/layouts/platform.html"){
                                      header-align="center"
                                      sortable
                                      align="center"></el-table-column>
-                    <el-table-column show-overflow-tooltip label="联系方式" prop="mobile"
-                                     header-align="center"
-                                     align="center"></el-table-column>
+<!--                    <el-table-column show-overflow-tooltip label="联系方式" prop="mobile"-->
+<!--                                     header-align="center"-->
+<!--                                     align="center"></el-table-column>-->
                     <el-table-column label="慰问类型" prop="type_name" header-align="center" sortable
                                      align="center"></el-table-column>
                     <!-- <el-table-column label="慰问方式" prop="way" header-align="center"

From 61357693b8098a982a092006ba6260bf61d8a9d1 Mon Sep 17 00:00:00 2001
From: = <=>
Date: Thu, 6 Mar 2025 20:41:51 +0800
Subject: [PATCH 02/17] =?UTF-8?q?=E7=BC=B4=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MobileMemberCostListController.java       |   5 +
 .../MemberPaymentConfigController.java        |  25 ++
 .../MemberPaymentProjectController.java       |  58 ++-
 .../MemberPaymentSummaryController.java       |   5 +-
 .../payment/MemberPaymentUserController.java  |  89 +++++
 .../memberCost/model/MemberPaymentConfig.java |  12 +-
 .../memberCost/model/MemberPaymentInfo.java   |  11 +
 .../model/MemberPaymentProject.java           |   5 +
 .../service/MemberPaymentService.java         |   4 +
 .../impl/MemberPaymentServiceImpl.java        |  11 +
 .../mobile/memberCost/memberCostList.html     |   2 +-
 .../views/mobile/memberCost/summary.html      | 101 +++++
 .../platform/memberCost/payment/config.html   |  86 ++++-
 .../platform/memberCost/payment/project.html  |  47 +--
 .../platform/memberCost/payment/user.html     | 352 ++++++++++++++++++
 15 files changed, 760 insertions(+), 53 deletions(-)
 create mode 100644 src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentUserController.java
 create mode 100644 src/main/resources/views/mobile/memberCost/summary.html
 create mode 100644 src/main/resources/views/platform/memberCost/payment/user.html

diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/mobile/MobileMemberCostListController.java b/src/main/java/io/v/nutz/zhgh/memberCost/controller/mobile/MobileMemberCostListController.java
index 8e3f55d..6907302 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/controller/mobile/MobileMemberCostListController.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/controller/mobile/MobileMemberCostListController.java
@@ -36,6 +36,11 @@ public class MobileMemberCostListController {
     public void paySuccess() {
     }
 
+    @At("/summary")
+    @Ok("beetl:/mobile/memberCost/summary.html")
+    public void summary() {
+    }
+
 
     @At
     @ViReturn
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentConfigController.java b/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentConfigController.java
index 46a2552..1059c3d 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentConfigController.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentConfigController.java
@@ -4,9 +4,11 @@ import io.v.nutz.base.annontation.ViReturn;
 import io.v.nutz.base.dao.CndPlus;
 import io.v.nutz.base.query.PageForm;
 import io.v.nutz.zhgh.memberCost.model.MemberPaymentConfig;
+import io.v.nutz.zhgh.memberCost.model.MemberPaymentProject;
 import io.v.nutz.zhgh.memberCost.service.MemberPaymentService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.nutz.dao.Chain;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
@@ -56,6 +58,29 @@ public class MemberPaymentConfigController {
         return memberPaymentService.getConfig();
     }
 
+    @At
+    @ViReturn
+    public Object getPaymentConfigList(){
+        return memberPaymentService.getPaymentConfigList();
+    }
+
+    @At
+    @ViReturn
+    public Object doRemove(String id){
+        memberPaymentService.dao().clear(MemberPaymentConfig.class, Cnd.where("id", "=", id));
+        return null;
+    }
+
+    @At
+    @ViReturn
+    public Object openClosedConfig(String id){
+        //位运算 取反
+        memberPaymentService.dao().update(MemberPaymentConfig.class,
+                Chain.makeSpecial("isDisabled", "isDisabled ^ 1"),
+                Cnd.where("id", "=", id));
+        return null;
+    }
+
 
     @At
     @ViReturn
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentProjectController.java b/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentProjectController.java
index 6d4fb96..5d23841 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentProjectController.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentProjectController.java
@@ -30,11 +30,13 @@ import org.nutz.mvc.annotation.Param;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 
@@ -122,13 +124,15 @@ public class MemberPaymentProjectController {
             memberPaymentService.clear(Cnd.where("paymentProjectId", "=", id));
         }
 
+        //获取缴费项目
+        MemberPaymentProject project = memberPaymentService.dao().fetch(MemberPaymentProject.class, id);
         //获取缴费配置
-        MemberPaymentConfig config = memberPaymentService.getConfig();
+        MemberPaymentConfig config = memberPaymentService.getConfigById(project.getConfigId());
         List<MemberPaymentConfig.PayStandards> payStandards = config.getPayStandards();
         //缴费人员类型
         List<String> personTypeList = new ArrayList<>();
         payStandards.forEach(v->{
-            personTypeList.addAll(v.getPersonTypes());
+            personTypeList.add(v.getPersonType());
         });
 
         //获取所有有入会时间的会员
@@ -138,23 +142,37 @@ public class MemberPaymentProjectController {
         //过滤出需要新增到记录表中的人员
         List<Sys_user> needInsertUserIds = memberList.stream().filter(v -> !paymentUserIdList.contains(v.getId())).collect(Collectors.toList());
 
-        //获取缴费项目
-        MemberPaymentProject project = memberPaymentService.dao().fetch(MemberPaymentProject.class, id);
-        //该项目的缴费月份是几月到几月，转为数组，判断新入职教工应缴费几个月
-        String[] strings = project.getPaymentStartMonth().substring(0, project.getPaymentStartMonth().length() - 1).split("-");
-        DateTime beginDate = DateUtil.parse(project.getYear() + "-" + strings[0] + "-01");
+
+        //该缴费配置的缴费月份是几月到几月，转为数组
+        String[] strings = {config.getPaymentStartMonth(),config.getPaymentEndMonth()};
+        DateTime beginDate = DateUtil.parse(strings[0] + "-01");
         //获取月份的最后一天
-        DateTime endDate = DateUtil.endOfMonth(DateUtil.parse(project.getYear() + "-" + strings[1] + "-01"));
+        DateTime endDate = DateUtil.endOfMonth(DateUtil.parse(strings[1] + "-01"));
 
         List<MemberPaymentInfo> memberPaymentInfos = new ArrayList<>();
         needInsertUserIds.forEach(v -> {
             MemberPaymentInfo paymentInfo = new MemberPaymentInfo();
+            paymentInfo.setPersonType(v.getPersonType());
+            long differMonth = 0;
             //如果是新入职教工，计算需要缴纳的月数
             if (v.getMemberJoinTime().after(beginDate) && v.getMemberJoinTime().before(endDate)){
-                long differMonth = DateUtil.betweenMonth(v.getMemberJoinTime(), endDate, false);
+                differMonth = DateUtil.betweenMonth(v.getMemberJoinTime(), endDate, false)+1;
                 paymentInfo.setPaymentMonth(String.valueOf(differMonth));
-            } else {
-                paymentInfo.setPaymentMonth(config.getPaidDuration());
+                paymentInfo.setPayPersonnel("新进会员");
+                //getPayment(v, payStandards, paymentInfo, differMonth,"新进会员");
+
+            }else if(v.getRetireDate()!=null&&v.getRetireDate().after(beginDate)&&v.getRetireDate().before(endDate)){
+                //如果是退休会员
+                differMonth = DateUtil.betweenMonth(beginDate, v.getRetireDate(), false)+1;
+                paymentInfo.setPaymentMonth(String.valueOf(differMonth));
+                paymentInfo.setPayPersonnel("退休会员");
+                //getPayment(v, payStandards, paymentInfo, differMonth,"退休会员");
+            }else {
+                //如果是普通会员
+                differMonth = DateUtil.betweenMonth(beginDate, endDate, false)+1;
+                paymentInfo.setPaymentMonth(String.valueOf(differMonth));
+                paymentInfo.setPayPersonnel("普通会员");
+                //getPayment(v, payStandards, paymentInfo, differMonth,"普通会员");
             }
             paymentInfo.setUserId(v.getId());
             paymentInfo.setLoginname(v.getLoginname());
@@ -195,6 +213,24 @@ public class MemberPaymentProjectController {
         return null;
     }
 
+    private static void getPayment(Sys_user v, List<MemberPaymentConfig.PayStandards> payStandards, MemberPaymentInfo paymentInfo, long differMonth,String payPersonnel) {
+        List<MemberPaymentConfig.PayStandards> list = payStandards.stream().filter(v1 -> v1.getPersonType().equals(v.getPersonType()) && payPersonnel.equals(v1.getPayPersonnel())).collect(Collectors.toList());
+        MemberPaymentConfig.PayStandards standards = null;
+        if (list!=null&&list.size()>0){
+            standards = list.get(0);
+        }
+        if ("在编".equals(v.getPersonType())&&standards!=null){
+            AtomicReference<Integer> value= new AtomicReference<>(0);
+            standards.getPayModeValueList().forEach(v1->{
+                value.set(value.get()+v1.getInt("value"));
+            });
+            paymentInfo.setPaymentMoney(String.valueOf(value.get()*0.05* differMonth));
+        }
+        if ("非编".equals(v.getPersonType())&&standards!=null){
+            paymentInfo.setPaymentMoney(String.valueOf(Integer.valueOf(standards.getPayModeValue())* differMonth));
+        }
+    }
+
 
     /**
      * 删除
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentSummaryController.java b/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentSummaryController.java
index 0d6c90a..8968e0f 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentSummaryController.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentSummaryController.java
@@ -85,7 +85,6 @@ public class MemberPaymentSummaryController {
                 	u.sex,
                 	u.member,
                 	u.welfareMember,
-                	u.personType,
                 	u.userState,
                 	u.unionname,
                 	u.unionid,
@@ -111,7 +110,7 @@ public class MemberPaymentSummaryController {
         if (StrUtil.isNotBlank(searchName) && StrUtil.isNotBlank(searchKeyword)) {
             cnd.and(Cnd.likeEX(searchName, searchKeyword));
         }
-        if (!ShiroUtil.hasAnyRoles("sysadmin,A06,H03")) {
+        if (!ShiroUtil.hasAnyRoles("sysadmin,A06,H04")) {
             if (ShiroUtil.hasRole("H04")) {
                 cnd.and("u.unionid", "=", Vi.getUnionId());
             } else {
@@ -173,7 +172,7 @@ public class MemberPaymentSummaryController {
     public Object modify(@Param("ids") String[] ids, String paymentMoney, boolean isPay, String remark) {
         List<String> idList = Arrays.asList(ids);
         if (Lang.isNotEmpty(idList)) {
-            if (isPay) {
+            if (!isPay) {
                 //未缴费设为已缴费
                 memberPaymentService.update(Chain.make("paymentMoney", paymentMoney)
                                 .add("remark", remark).add("isPayment", 1)
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentUserController.java b/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentUserController.java
new file mode 100644
index 0000000..1cbec5d
--- /dev/null
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentUserController.java
@@ -0,0 +1,89 @@
+package io.v.nutz.zhgh.memberCost.controller.payment;
+
+
+import io.v.nutz.base.annontation.ViReturn;
+import io.v.nutz.base.dao.CndPlus;
+import io.v.nutz.base.query.PageForm;
+import io.v.nutz.web.commons.utils.ShiroUtil;
+import io.v.nutz.zhgh.memberCost.model.MemberPaymentInfo;
+import io.v.nutz.zhgh.memberCost.model.MemberPaymentProject;
+import io.v.nutz.zhgh.memberCost.service.MemberPaymentService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.nutz.dao.Chain;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.Static;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.Lang;
+import org.nutz.lang.Strings;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 个人缴费管理
+ * @author hpf
+ */
+@IocBean
+@Slf4j
+@Ok("json:full")
+@At("/platform/member/payment/user")
+public class MemberPaymentUserController {
+
+    @Inject
+    private MemberPaymentService memberPaymentService;
+
+    @At("")
+    @Ok("beetl:/platform/memberCost/payment/user.html")
+    @RequiresPermissions("member.payment.user")
+    public void index() {
+    }
+
+    @At
+    @ViReturn
+    @RequiresPermissions("member.payment.user")
+    public Object pageData(PageForm pageForm,@Param(value = "year", required = false) String year,@Param(value = "projectName", required = false) String projectName){
+        Sql sql = Sqls.create("SELECT" +
+                " mpi.*," +
+                " mpp.`year`," +
+                " mpp.projectName," +
+                " mpp.startTime," +
+                " mpp.endTime," +
+                " mpp.configId," +
+                " mpc.payStandards," +
+                " mpc.paymentStartMonth," +
+                " mpc.paymentEndMonth" +
+                " FROM" +
+                " member_payment_info mpi" +
+                " LEFT JOIN member_payment_project mpp ON mpi.paymentProjectId = mpp.id " +
+                " LEFT JOIN member_payment_config mpc ON mpc.id = mpp.configId $condition");
+        CndPlus cnd = CndPlus.create();
+
+        cnd.andEX("mpp.isDisabled", "=", '0');
+        cnd.andEX("mpp.year", "=", year);
+        cnd.and("mpi.userId", "=", ShiroUtil.getUserId());
+        if (Strings.isNotBlank(projectName)) {
+            cnd.and(Cnd.likeEX("mpp.projectName", projectName));
+        }
+        cnd.desc("mpp.createTime");
+        sql.setCondition(cnd);
+        return memberPaymentService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+    }
+
+    @At
+    @ViReturn
+    @RequiresPermissions("member.payment.user")
+    public Object doSave(MemberPaymentInfo memberPaymentInfo) {
+        memberPaymentService.insertOrUpdate(memberPaymentInfo);
+        return null;
+    }
+
+}
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/model/MemberPaymentConfig.java b/src/main/java/io/v/nutz/zhgh/memberCost/model/MemberPaymentConfig.java
index 793707d..2bf4785 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/model/MemberPaymentConfig.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/model/MemberPaymentConfig.java
@@ -50,11 +50,21 @@ public class MemberPaymentConfig extends BaseModel {
     @ColDefine(type = ColType.BOOLEAN)
     private boolean isDisabled;
 
+    @Column
+    @Comment("开始缴费月份")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String paymentStartMonth;
+
+    @Column
+    @Comment("结束缴费月份")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    private String paymentEndMonth;
+
     @Data
     public static class PayStandards implements Serializable {
         private String payPersonnel;
         private String payMode;
-        private List<String> personTypes;
+        private String personType;
         private String payModeValue;
         private List<NutMap> payModeValueList;
     }
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/model/MemberPaymentInfo.java b/src/main/java/io/v/nutz/zhgh/memberCost/model/MemberPaymentInfo.java
index a798ec0..b0b2c46 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/model/MemberPaymentInfo.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/model/MemberPaymentInfo.java
@@ -87,4 +87,15 @@ public class MemberPaymentInfo {
     @Comment("缴费月份")
     @ColDefine(type = ColType.VARCHAR, width = 10)
     private String paymentMonth;
+
+    @Column
+    @Comment("人员类型")
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    private String personType;
+
+
+    @Column
+    @Comment("会员类型")
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    private String payPersonnel;
 }
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/model/MemberPaymentProject.java b/src/main/java/io/v/nutz/zhgh/memberCost/model/MemberPaymentProject.java
index 92b8cef..a8d890b 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/model/MemberPaymentProject.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/model/MemberPaymentProject.java
@@ -58,4 +58,9 @@ public class MemberPaymentProject extends BaseModel {
     @Comment("结束缴费时间")
     @ColDefine(type = ColType.VARCHAR,width = 32)
     private String endTime;
+
+    @Column
+    @Comment("缴费配置id")
+    @ColDefine(type = ColType.VARCHAR,width = 32)
+    private String configId;
 }
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/service/MemberPaymentService.java b/src/main/java/io/v/nutz/zhgh/memberCost/service/MemberPaymentService.java
index 7308adf..bd06971 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/service/MemberPaymentService.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/service/MemberPaymentService.java
@@ -17,4 +17,8 @@ public interface MemberPaymentService extends ViService<MemberPaymentInfo> {
     Workbook exportOrZip(List<NutMap> list, OutputStream outputStream)throws Exception;
 
     MemberPaymentConfig getConfig();
+
+    List<MemberPaymentConfig> getPaymentConfigList();
+
+    MemberPaymentConfig getConfigById(String configId);
 }
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/service/impl/MemberPaymentServiceImpl.java b/src/main/java/io/v/nutz/zhgh/memberCost/service/impl/MemberPaymentServiceImpl.java
index 74683db..f87114a 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/service/impl/MemberPaymentServiceImpl.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/service/impl/MemberPaymentServiceImpl.java
@@ -11,6 +11,7 @@ import io.v.nutz.zhgh.memberCost.model.MemberPaymentProject;
 import io.v.nutz.zhgh.memberCost.service.MemberPaymentService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.Workbook;
+import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.util.NutMap;
@@ -61,4 +62,14 @@ public class MemberPaymentServiceImpl extends ViServiceImpl<MemberPaymentInfo> i
     public MemberPaymentConfig getConfig() {
         return dao().fetch(MemberPaymentConfig.class);
     }
+
+    @Override
+    public List<MemberPaymentConfig> getPaymentConfigList() {
+        return dao().query(MemberPaymentConfig.class, Cnd.NEW().and("isDisabled","=","0"));
+    }
+
+    @Override
+    public MemberPaymentConfig getConfigById(String configId) {
+        return dao().fetch(MemberPaymentConfig.class,configId);
+    }
 }
diff --git a/src/main/resources/views/mobile/memberCost/memberCostList.html b/src/main/resources/views/mobile/memberCost/memberCostList.html
index c5823d0..67937f0 100644
--- a/src/main/resources/views/mobile/memberCost/memberCostList.html
+++ b/src/main/resources/views/mobile/memberCost/memberCostList.html
@@ -267,7 +267,7 @@ layout("/mobile/platform.html"){
                     const payStandards = this.configData.payStandards
                     resp.data.forEach((r) => {
                         payStandards.map((p) => {
-                            if (p.personTypes.includes(personType)) {
+                            if (p.personType===personType) {
                                 r.selectMode = p.payMode
                                 if (p.c === "1") {
                                     r.modeValue = p.payModeValue
diff --git a/src/main/resources/views/mobile/memberCost/summary.html b/src/main/resources/views/mobile/memberCost/summary.html
new file mode 100644
index 0000000..80bd932
--- /dev/null
+++ b/src/main/resources/views/mobile/memberCost/summary.html
@@ -0,0 +1,101 @@
+<!--#
+layout("/mobile/platform.html"){
+#-->
+<div id="app" v-cloak>
+    <van-sticky>
+        <van-nav-bar @click-left="pjaxReplace('/mobile/index')" left-arrow title="缴费汇总"></van-nav-bar>
+    </van-sticky>
+
+    <div>
+        <van-search v-model="pageForm.searchKeyword" placeholder="请输入搜索关键词" @search="doSearch">
+        </van-search>
+    </div>
+    <div>
+        <van-tabs @change="doSearch" v-model="pageForm.isPay">
+            <van-tab title="未缴费" :name="false"></van-tab>
+            <van-tab title="已缴费" :name="true"></van-tab>
+        </van-tabs>
+
+        <van-list
+            v-model="loading"
+            :finished="finished"
+            finished-text="没有更多了"
+            @load="pageData"
+        >
+            <van-cell-group inset>
+                <van-cell v-for="item in tableData"  :value="item.isPayment?'已缴':'未缴'">
+                    <template #title>
+                        <span class="custom-title">{{item.username}}</span>
+                        <van-tag type="danger">{{item.isPayment?'已缴':'未缴'}}</van-tag>
+                    </template>
+                    <template #label>
+                        <div class="custom-title">工会：{{item.unionname}}</div>
+                        <div class="custom-title">单位：{{item.unitname}}</div>
+                    </template>
+                </van-cell>
+            </van-cell-group>
+        </van-list>
+
+        <van-empty
+            class="custom-image"
+            description="暂无缴费记录"
+            image="https://img01.yzcdn.cn/vant/custom-empty-image.png"
+            v-if="tableData&&tableData.length===0"
+        ></van-empty>
+    </div>
+</div>
+
+<script>
+    const vue = new Vue({
+        el: "#app",
+        data() {
+            return {
+                tableData: [],
+                memberActive: 0,
+                loading: false,
+                finished: false,
+                pageForm: {
+                    pageNumber: 1,
+                    pageSize: 10,
+                    totalCount: 0,
+                    username: "",
+                    isPay:false,
+                    searchName:'u.username',
+                    searchKeyword:''
+                },
+                option1: [
+                    { text: '姓名', value: 'u.username' },
+                    { text: '工号', value: 'u.loginname' },
+                ]
+            }
+        },
+        methods: {
+            async pageData() {
+                const resp = await $.post("/platform/member/payment/summary/pageData", this.pageForm)
+                if (resp.code === 0) {
+                    this.tableData = this.tableData.concat(resp.data.list)
+                    this.pageForm.totalCount = resp.data.totalCount
+                    console.log(this.tableData.length >= this.pageForm.totalCount)
+                    if (this.tableData.length >= this.pageForm.totalCount) {
+                        this.finished = true
+                    } else {
+                        this.pageForm.pageNumber++
+                    }
+                    this.loading = false
+                }
+            },
+            doSearch(){
+                this.pageForm.pageNumber = 1
+                this.tableData = []
+                this.finished = false
+                this.pageData()
+            }
+        },
+        async created() {
+            await this.pageData()
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/memberCost/payment/config.html b/src/main/resources/views/platform/memberCost/payment/config.html
index 2b67e2a..23eacff 100644
--- a/src/main/resources/views/platform/memberCost/payment/config.html
+++ b/src/main/resources/views/platform/memberCost/payment/config.html
@@ -18,7 +18,7 @@ layout("/layouts/platform.html"){
                         <div class="search-item-option">
                             <el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
                                       style="width: 100%"
-                                      v-model="pageForm.projectName">
+                                      v-model="pageForm.name">
                             </el-input>
                         </div>
                     </div>
@@ -60,7 +60,7 @@ layout("/layouts/platform.html"){
                             <el-switch
                                 :active-value="false"
                                 :inactive-value="true"
-                                @change="(val)=>{projectStatusChange(row.id)}"
+                                @change="(val)=>{configStatusChange(row.id)}"
                                 active-color="#13ce66"
                                 inactive-color="#ff4949"
                                 v-model="row.isDisabled">
@@ -100,9 +100,22 @@ layout("/layouts/platform.html"){
                      style="margin: 10px 0 0 0">
                 <vi-title title="缴费配置"></vi-title>
                 <el-row :gutter="20">
-                    <el-col :span="8">
-                        <el-form-item label="配置名称" prop="paidDuration">
-                            <el-input v-model="formData.paidDuration"></el-input>
+                    <el-col :span="12">
+                        <el-form-item label="配置名称" prop="name">
+                            <el-input v-model="formData.name"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="缴费月份" prop="paymentMonth" size="medium">
+                            <el-date-picker
+                                v-model="formData.paymentMonth"
+                                type="monthrange"
+                                range-separator="至"
+                                style="width: 100%"
+                                value-format="yyyy-MM"
+                                start-placeholder="开始月份"
+                                end-placeholder="结束月份">
+                            </el-date-picker>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -178,12 +191,8 @@ layout("/layouts/platform.html"){
                                                 <div  style="display:flex;justify-content: space-between;margin-left: 30px">
                                                     (
                                                     <template v-for="(o,i) in row.payModeValueList" >
-                                                        <el-input maxlength="5"  placeholder="" style="width: 200px;"
-                                                                  v-model="o.value">
-                                                            <el-select style="width: 105px;" v-model="o.name" slot="prepend" placeholder="请选择">
-                                                                <el-option label="岗位工资" value="1"></el-option>
-                                                                <el-option label="薪级工资" value="2"></el-option>
-                                                            </el-select>
+                                                        <el-input   placeholder=""  style="width: 100px;"
+                                                                  v-model="o.name">
                                                             <el-button @click="row.payModeValueList.splice(i, 1)" slot="append" style="padding: 0 7px;"
                                                                        icon="el-icon-circle-close"></el-button>
                                                         </el-input>
@@ -294,6 +303,8 @@ layout("/layouts/platform.html"){
                     payStandards: [{payPersonnel: null, payMode: null, personTypes: null, payModeValue: null,payModeValueList:[{name:'',value:''}]}]
                 },
                 rules: {
+                    name: [{required: true, message: '必填', trigger: ['blur', 'change']}],
+                    paymentMonth: [{required: true, message: '必填', trigger: ['blur', 'change']}],
                     exit: [{required: true, message: '必填', trigger: ['blur', 'change']}],
                 },
                 personTypeList:[],
@@ -303,23 +314,70 @@ layout("/layouts/platform.html"){
                 tableData:[],
                 tableColumns:[
                     {prop: 'name', label: '配置名称'},
-                    {prop: 'unPaidExitDuration', label: '未缴费退会时长'},
-                    {prop: 'exitMode', label: '退会模式'},
-                    {prop: 'paidDuration', label: '缴费时长'},
+                    {prop: 'paymentStartMonth', label: '缴费起始月份'},
+                    {prop: 'paymentEndMonth', label: '缴费截止月份'},
                     {prop: 'isDisabled', label: '开启状态'},
                 ],
                 isSubmit: true,
             }
         },
         methods: {
+            dropdownCommand(command) {
+                const {type, data} = command
+                if (type === 'view') {
+                    this.openView(data)
+                } else if (type === 'edit') {
+                    this.openEdit(data)
+                } else if (type === 'remove') {
+                    this.doRemove(data.id)
+                }
+            },
             openAdd(){
                 this.$refs.guava.view()
             },
+            async doRemove(id) {
+                const confirm = await this.$confirm('您确定要删除吗?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                })
+                if (confirm === 'confirm') {
+                    const resp = await $.get(loc() + '/doRemove', {id: id})
+                    if (resp.code === 0) {
+                        this.notifySuccess(resp.msg)
+                        this.pageData()
+                    } else {
+                        this.notifyWarning(resp.msg)
+                    }
+                }
+            },
+            async configStatusChange(id) {
+                const resp = await $.post(loc() + '/openClosedConfig', { id: id })
+                if (resp.code === 0) {
+                    this.notifySuccess(resp.msg)
+                    this.pageData()
+                } else {
+                    this.notifyWarning(resp.msg)
+                }
+            },
+            openEdit(data) {
+                this.formData = {}
+                this.formData = {
+                    ...data,
+                    paymentMonth:[data.paymentStartMonth, data.paymentEndMonth],
+                }
+                this.formData.payStandards= JSON.parse(this.formData.payStandards)
+                this.isSubmit = true
+                this.$refs.guava.view()
+            },
             async doSubmit(){
+                this.formData.paymentStartMonth = this.formData.paymentMonth[0]
+                this.formData.paymentEndMonth = this.formData.paymentMonth[1]
                 const formData = clone(this.formData)
                 formData.payStandards = JSON.stringify(this.formData.payStandards)
                 const resp = await $.post(loc() + '/doAddOrModify',formData)
                 if (resp.code === 0){
+                    this.$refs.guava.index()
                     await this.getPaymentConfig()
                     this.notifySuccess(resp.msg)
                 } else {
diff --git a/src/main/resources/views/platform/memberCost/payment/project.html b/src/main/resources/views/platform/memberCost/payment/project.html
index 8a87e94..5629280 100644
--- a/src/main/resources/views/platform/memberCost/payment/project.html
+++ b/src/main/resources/views/platform/memberCost/payment/project.html
@@ -83,9 +83,6 @@ layout("/layouts/platform.html"){
                                     v-model="row.isDisabled">
                             </el-switch>
                         </template>
-                        <template scope="{row}" v-if="column.prop==='paymentMonth'">
-                            <span>{{row.paymentStartMonth}} 至 {{row.paymentEndMonth}}</span>
-                        </template>
                     </el-table-column>
 
                     <el-table-column prop="userOnline" align="center" header-align="center"
@@ -163,20 +160,16 @@ layout("/layouts/platform.html"){
 
                 <el-row :gutter="20">
                     <el-col :span="12">
-                        <el-form-item label="缴费月份" prop="paymentMonth" size="medium">
-                            <!--<el-radio-group v-model="formData.paymentMonth">
-                                <el-radio-button v-for="item in monthSelect" :label="item.label"
-                                                 :disabled="item.code===1"></el-radio-button>
-                            </el-radio-group>-->
-                            <el-date-picker
-                                v-model="formData.paymentMonth"
-                                type="monthrange"
-                                range-separator="至"
-                                style="width: 100%"
-                                value-format="yyyy-MM"
-                                start-placeholder="开始月份"
-                                end-placeholder="结束月份">
-                            </el-date-picker>
+                        <el-form-item label="缴费配置" prop="configId" size="medium">
+                                <el-select  placeholder="请选择缴费配置" v-model="formData.configId"
+                                            style="width: 100%" clearable>
+                                    <el-option
+                                        v-for="item in configList"
+                                        :key="item.id"
+                                        :label="item.name"
+                                        :value="item.id">
+                                    </el-option>
+                                </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
@@ -220,7 +213,6 @@ layout("/layouts/platform.html"){
                 tableColumns: [
                     {prop: 'year', label: '年度', sortable: true},
                     {prop: 'projectName', label: '项目名称', sortable: true},
-                    {prop: 'paymentMonth', label: '缴费月份', sortable: true},
                     {prop: 'startTime', label: '缴费开始时间', sortable: true},
                     {prop: 'endTime', label: '缴费截止时间', sortable: true},
                     {prop: 'createTime', label: '创建时间', sortable: true},
@@ -234,9 +226,11 @@ layout("/layouts/platform.html"){
                     year: [{required: true, message: '必填', trigger: ['blur', 'change']}],
                     paymentMonth: [{required: true, message: '必填', trigger: ['blur', 'change']}],
                     paymentTime: [{required: true, message: '必填', trigger: ['blur', 'change']}],
+                    configId: [{required: true, message: '必填', trigger: ['blur', 'change']}],
                 },
                 paymentConfig: {},
-                monthSelect: []
+                monthSelect: [],
+                configList:[]
             }
         },
         components: {
@@ -265,7 +259,10 @@ layout("/layouts/platform.html"){
             },
             openView(data) {
                 this.formData = {}
-                this.formData = {...data}
+                this.formData = {
+                    ...data,
+                    paymentTime:[data.startTime, data.endTime],
+                }
                 this.isSubmit = false
                 this.$refs.guava.view()
             },
@@ -273,7 +270,6 @@ layout("/layouts/platform.html"){
                 this.formData = {}
                 this.formData = {
                     ...data,
-                    paymentMonth:[data.paymentStartMonth, data.paymentEndMonth],
                     paymentTime:[data.startTime, data.endTime],
                 }
                 this.isSubmit = true
@@ -369,8 +365,6 @@ layout("/layouts/platform.html"){
                     });
                     this.formData.startTime=this.formData.paymentTime[0]
                     this.formData.endTime=this.formData.paymentTime[1]
-                    this.formData.paymentStartMonth=this.formData.paymentMonth[0]
-                    this.formData.paymentEndMonth=this.formData.paymentMonth[1]
                     const formData = clone(this.formData)
                     const resp = await $.post(loc() + '/doSave', formData)
                     loading.close()
@@ -393,8 +387,15 @@ layout("/layouts/platform.html"){
                     this.notifyWarning(resp.msg)
                 }
             },
+            async getPaymentConfigList(id) {
+                const resp = await $.post('/platform/member/payment/config/getPaymentConfigList')
+                if (resp.code === 0) {
+                    this.configList = resp.data
+                }
+            },
         },
         async created() {
+            this.getPaymentConfigList()
             this.pageData()
         }
     })
diff --git a/src/main/resources/views/platform/memberCost/payment/user.html b/src/main/resources/views/platform/memberCost/payment/user.html
new file mode 100644
index 0000000..2f06427
--- /dev/null
+++ b/src/main/resources/views/platform/memberCost/payment/user.html
@@ -0,0 +1,352 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <template>
+            <el-card shadow="never">
+                <div class="search">
+                    <div class="search-item">
+                        <div class="search-item-label">年度：</div>
+                        <div class="search-item-option">
+                            <el-date-picker
+                                :clearable="false"
+                                clearable
+                                @change="doSearch"
+                                placeholder="选择年度"
+                                type="year" style="width: 100%"
+                                v-model="pageForm.year"
+                                value-format="yyyy">
+                            </el-date-picker>
+                        </div>
+                    </div>
+
+                    <div class="search-item">
+                        <div class="search-item-label">缴费项目：</div>
+                        <div class="search-item-option">
+                            <el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
+                                      style="width: 100%"
+                                      v-model="pageForm.projectName">
+                            </el-input>
+                        </div>
+                    </div>
+
+                    <div class="search-query">
+                        <el-button type="primary" icon="el-icon-search" @click="doSearch">搜索
+                        </el-button>
+                    </div>
+                </div>
+            </el-card>
+
+            <el-card class="mt10" shadow="never">
+                <table-tool :app="this" label="个人缴费列表">
+                </table-tool>
+
+                <el-table :data="tableData" :size="tableSize"
+                          @sort-change="pageOrder"
+                          class="vi-table"
+                          ref="table" row-key="id" style="width: 100%"
+                          v-loading="tableLoading">
+                    <el-table-column :index="indexMethod" align="center" header-align="center"
+                                     label="序号" type="index"
+                                     width="80px"></el-table-column>
+
+                    <el-table-column
+                        :label="column.label"
+                        :prop="column.prop"
+                        :sortable="column.sortable"
+                        align="center"
+                        header-align="center"
+                        show-overflow-tooltip
+                        v-for="column in tableColumns"
+                    >
+                        <template scope="{row}" v-if="column.prop==='isPayment'">
+                            <span style="color: #00aa3a" v-if="row.isPayment">已缴</span>
+                            <span style="color: red" v-else>未缴</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column align="center" header-align="center" label="是否确认金额">
+                        <template scope="{row}">
+                            <span style="color: #00aa3a" v-if="row.paymentMoney!=null">已确定</span>
+                            <span style="color: red" v-else>未确定</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="userOnline" align="center" header-align="center"
+                                     label="操作"
+                                     width="100px">
+                        <template scope="scope">
+                            <el-dropdown @command="dropdownCommand">
+                                <el-button :loading="submitLoading" plain size="mini">
+                                    <i class="ti-settings"></i>
+                                    <span class="ti-angle-down"></span>
+                                </el-button>
+                                <el-dropdown-menu slot="dropdown">
+                                    <el-dropdown-item :command="{type:'view',data:scope.row}">
+                                        查看
+                                    </el-dropdown-item>
+                                    <el-dropdown-item v-if="!scope.row.isPayment" :command="{type:'edit',data:scope.row}">
+                                        设为已缴
+                                    </el-dropdown-item>
+                                    <el-dropdown-item v-if="scope.row.paymentMoney==null" :command="{type:'pay',data:scope.row}">
+                                        确定缴费金额
+                                    </el-dropdown-item>
+                                </el-dropdown-menu>
+                            </el-dropdown>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <!--#include("/layouts/pagination.html"){}#-->
+            </el-card>
+        </template>
+
+        <template #pay>
+            <el-form :model="formData" :rules="formRules" label-width="100px" ref="form">
+                <vi-title title="缴费信息"></vi-title>
+                <el-form-item label="缴费项目" prop="projectName">
+                    <span>{{formData.projectName}}</span>
+                </el-form-item>
+
+                <el-row :gutter="24">
+                    <el-col :span="12">
+                        <el-form-item label="人员类型"  size="medium">
+                            <span>{{formData.personType}}</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="会员类型" size="medium">
+                            <span>{{formData.payPersonnel}}</span>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row :gutter="24">
+                    <el-col :span="12">
+                        <el-form-item label="需缴费用"  size="medium">
+                            <div  v-for="item in payStandard" style="display:flex;justify-content: space-between;margin-left: 30px">
+                                <template v-if="item.payModeValueList.length>0" >
+                                    (
+                                    <template v-for="(o,i) in item.payModeValueList">
+                                        <el-input @change="getMoney(item)" placeholder=""  style="width: 200px;" v-model="o.value">
+                                            <template slot="prepend">{{o.name}}</template>
+                                        </el-input>
+                                        <span v-if="(i+1)!=item.payModeValueList.length">+</span>
+                                    </template>
+                                    ) * 0.5% *{{formData.paymentMonth}}个月
+                                </template>
+                                <template v-else>
+                                    <span>{{item.payModeValue}}</span>*{{formData.paymentMonth}}个月
+                                </template>
+                            </div>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="24">
+                    <el-col :span="12">
+                        <el-form-item label="缴费金额" prop="paymentMoney" size="medium">
+                            <el-input disabled="true" placeholder=""  style="width: 200px;" v-model="formData.paymentMoney">
+
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+            </el-form>
+            <div>
+                <el-button @click="doSave" v-loading="submitLoading" style="float: right"
+                           type="primary">
+                    提交
+                </el-button>
+            </div>
+        </template>
+
+
+        <template #view>
+            <el-form :model="formData" label-width="100px" ref="form">
+                <vi-title title="缴费信息"></vi-title>
+                <el-form-item label="缴费项目" prop="projectName">
+                    <span>{{formData.projectName}}</span>
+                </el-form-item>
+
+                <el-row :gutter="24">
+                    <el-col :span="12">
+                        <el-form-item label="人员类型"  size="medium">
+                            <span>{{formData.personType}}</span>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="会员类型" size="medium">
+                            <span>{{formData.payPersonnel}}</span>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="24">
+                    <el-col :span="12">
+                        <el-form-item label="缴纳标准"  size="medium">
+                            <div  v-for="item in payStandard" style="display:flex;justify-content: space-between;margin-left: 30px">
+                                <span v-if="item.payModeValueList.length>0" >
+                                    (
+                                    <span v-for="(o,i) in item.payModeValueList">
+                                        <span>{{o.name}}</span>
+                                        <span v-if="(i+1)!=item.payModeValueList.length">+</span>
+                                    </span>
+                                    ) * 0.5% *{{formData.paymentMonth}}个月
+                                </span>
+                                <template v-else>
+                                    <span>{{item.payModeValue}}</span>*{{formData.paymentMonth}}个月
+                                </template>
+                            </div>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+                <el-row :gutter="24">
+                    <el-col :span="12">
+                        <el-form-item label="缴费金额"  size="medium">
+                            <span>{{formData.paymentMoney}}</span>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row :gutter="24">
+                    <el-col :span="12">
+                        <el-form-item label="缴费月份"  size="medium">
+                            <span>{{formData.paymentStartMonth}} - {{formData.paymentEndMonth}}</span>
+                        </el-form-item>
+                    </el-col>
+
+                </el-row>
+                <el-row :gutter="24">
+                    <el-col :span="12">
+                        <el-form-item label="缴费开始时间"  size="medium">
+                            <span>{{formData.startTime}} - {{formData.endTime}}</span>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+            </el-form>
+        </template>
+    </guava>
+</div>
+<script>
+    const vue = new Vue({
+        el: '#app',
+        mixins: [initTableMixins],
+        data() {
+            return {
+                pageForm: {
+                    year: moment().format('YYYY'),
+                },
+                tableColumns: [
+                    {prop: 'year', label: '年度'},
+                    {prop: 'projectName', label: '缴费项目名称'},
+                    {prop: 'paymentStartMonth', label: '缴费开始月份'},
+                    {prop: 'paymentEndMonth', label: '缴费截止月份'},
+                    {prop: 'paymentMonth', label: '需要缴费月数'},
+                    {prop: 'startTime', label: '缴费开始时间'},
+                    {prop: 'endTime', label: '缴费截止时间'},
+                    {prop: 'paymentMoney', label: '缴费金额'},
+                    {prop: "isPayment", label: "是否缴费", sortable: true},
+                ],
+                payStandard:{},
+                formRules: {
+                    paymentMoney: [{required: true, message: '必填', trigger: ['blur', 'change']}],
+                },
+            }
+        },
+        components: {
+            'guava': httpVueLoader('/components/plugins/Guava.vue'),
+        },
+        methods: {
+            dropdownCommand(command) {
+                const {type, data} = command
+                if (type === 'edit') {
+                    this.doPay(data)
+                }
+                if (type === 'pay'){
+                    this.openPay(data)
+                }
+                if (type === 'view'){
+                    this.openView(data)
+                }
+            },
+            openPay(data){
+                const payStandards=JSON.parse(data.payStandards)
+
+                this.payStandard=payStandards.filter(item => item.personType===data.personType&&item.payPersonnel===data.payPersonnel)
+                if (this.payStandard.length>0&&this.payStandard[0].payModeValueList===null){
+                    this.formData.paymentMoney=+this.payStandard[0].payModeValue*+this.formData.paymentMonth
+                }
+                this.formData=data
+                this.$refs.guava.pay()
+            },
+            async doPay(data) {
+                const confirm = await this.$confirm("您确定要更改缴费信息吗?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                })
+                if (confirm === "confirm") {
+                    const formData={
+                        ids:JSON.stringify([data.id]),
+                        paymentMoney:data.paymentMoney,
+                        isPay:data.isPay,
+                        remark:"缴费"
+                    }
+                    const resp = await $.post("/platform/member/payment/summary/modify", formData)
+                    if (resp.code === 0) {
+                        this.notifySuccess(resp.msg)
+                        this.pageData()
+                    } else {
+                        this.notifyWarning(resp.msg)
+                    }
+                }
+            },
+            openView(data) {
+                const payStandards=JSON.parse(data.payStandards)
+
+                this.payStandard=payStandards.filter(item => item.personType===data.personType&&item.payPersonnel===data.payPersonnel)
+                if (this.payStandard.length>0&&this.payStandard[0].payModeValueList===null){
+                    this.formData.paymentMoney=+this.payStandard[0].payModeValue*+this.formData.paymentMonth
+                }
+                this.formData=data
+                this.$refs.guava.view()
+            },
+            async doSave() {
+                const formValid = await this.$refs["form"].validate()
+                if (formValid) {
+                    this.submitLoading = true
+                    const loading = this.$loading({
+                        lock: true,
+                        text: '数据保存中请稍后',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(0, 0, 0, 0.7)'
+                    });
+                    const formData = clone(this.formData)
+                    const resp = await $.post(loc() + '/doSave', formData)
+                    loading.close()
+                    this.submitLoading = false
+                    if (resp.code === 0) {
+                        this.notifySuccess(resp.msg)
+                        this.$refs.guava.index()
+                        this.pageData()
+                    } else {
+                        this.notifyWarning(resp.msg)
+                    }
+                }
+            },
+            getMoney(item){
+                this.formData.paymentMoney=0
+                let money=0
+                item.payModeValueList.forEach(o=>{
+                    money=+o.value+money
+                })
+                this.formData.paymentMoney=money*0.005*+this.formData.paymentMonth
+            }
+        },
+        async created() {
+            this.pageData()
+        }
+    })
+</script>
+<!--#
+}
+#-->

From 55e9010fb5560f681c9fdb5f35aea29c836dcbe9 Mon Sep 17 00:00:00 2001
From: = <=>
Date: Fri, 7 Mar 2025 11:17:13 +0800
Subject: [PATCH 03/17] =?UTF-8?q?=E7=BC=B4=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/mobile/memberCost/summary.html      | 92 +++++++++++++++++--
 1 file changed, 82 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/views/mobile/memberCost/summary.html b/src/main/resources/views/mobile/memberCost/summary.html
index 80bd932..d080ad5 100644
--- a/src/main/resources/views/mobile/memberCost/summary.html
+++ b/src/main/resources/views/mobile/memberCost/summary.html
@@ -22,17 +22,31 @@ layout("/mobile/platform.html"){
             finished-text="没有更多了"
             @load="pageData"
         >
-            <van-cell-group inset>
-                <van-cell v-for="item in tableData"  :value="item.isPayment?'已缴':'未缴'">
+            <van-cell-group>
+                <van-swipe-cell v-for="item in tableData">
+                    <template #left>
+                        <van-button  @click="sendPaymentMsg(item)" style="height: 100%" square type="info" text="催缴" />
+                    </template>
+                <van-cell >
                     <template #title>
-                        <span class="custom-title">{{item.username}}</span>
-                        <van-tag type="danger">{{item.isPayment?'已缴':'未缴'}}</van-tag>
+                        <span class="custom-title">{{item.username}}</span>({{item.loginname}})
+                        <van-tag :type="item.isPayment?'primary':'danger'">{{item.isPayment?'已缴':'未缴'}}</van-tag>
                     </template>
                     <template #label>
-                        <div class="custom-title">工会：{{item.unionname}}</div>
-                        <div class="custom-title">单位：{{item.unitname}}</div>
+                        <div class="custom-title">人员类型：{{item.personType}}</div>
+                        <div class="custom-title">在职状态：{{item.userState}}</div>
+                        <div class="custom-title">所属工会：{{item.unionname}}</div>
+                        <div class="custom-title">所属单位：{{item.unitname}}</div>
+                        <div class="custom-title">缴费金额：{{item.paymentMoney}}</div>
+                    </template>
+                    <template #right-icon>
+                        <van-button @click="show=true" v-if="!item.isPayment" size="mini" plain type="info">设为已缴</van-button>
                     </template>
                 </van-cell>
+                    <template #right>
+                        <van-button style="height: 100%" @click="doDelete(item.id)" square type="danger" text="删除" />
+                    </template>
+                </van-swipe-cell>
             </van-cell-group>
         </van-list>
 
@@ -42,6 +56,29 @@ layout("/mobile/platform.html"){
             image="https://img01.yzcdn.cn/vant/custom-empty-image.png"
             v-if="tableData&&tableData.length===0"
         ></van-empty>
+
+        <van-action-sheet v-model="show" title="标题">
+            <div class="content">
+                <van-form @submit="onSubmit">
+                    <van-field
+                        v-model="formData.paymentMoney"
+                        name="缴费金额"
+                        label="缴费金额"
+                        placeholder="缴费金额"
+                        :rules="[{ required: true, message: '请填写缴费金额' }]"
+                    ></van-field>
+                    <van-field
+                        v-model="formData.remark"
+                        name="备注"
+                        label="备注"
+                        placeholder="备注"
+                    ></van-field>
+                    <div style="margin: 16px;">
+                        <van-button round block type="info" native-type="submit">提交</van-button>
+                    </div>
+                </van-form>
+            </div>
+        </van-action-sheet>
     </div>
 </div>
 
@@ -66,7 +103,9 @@ layout("/mobile/platform.html"){
                 option1: [
                     { text: '姓名', value: 'u.username' },
                     { text: '工号', value: 'u.loginname' },
-                ]
+                ],
+                show:false,
+                formData: {}
             }
         },
         methods: {
@@ -75,7 +114,6 @@ layout("/mobile/platform.html"){
                 if (resp.code === 0) {
                     this.tableData = this.tableData.concat(resp.data.list)
                     this.pageForm.totalCount = resp.data.totalCount
-                    console.log(this.tableData.length >= this.pageForm.totalCount)
                     if (this.tableData.length >= this.pageForm.totalCount) {
                         this.finished = true
                     } else {
@@ -86,10 +124,44 @@ layout("/mobile/platform.html"){
             },
             doSearch(){
                 this.pageForm.pageNumber = 1
+                if(this.tableData.length==this.pageForm.totalCount){
+                    this.finished = true
+                }else{
+                    this.finished = false
+                }
                 this.tableData = []
-                this.finished = false
                 this.pageData()
-            }
+            },
+            async doDelete(id) {
+                const loading = this.$toast.loading({
+                    message: "加载中...",
+                    forbidClick: true,
+                    overlay: true,
+                    duration: 0
+                })
+                const resp = await $.get("/platform/member/payment/summary/doRemoveById", { id: id })
+                if (resp.code === 0) {
+                    this.$toast.success(resp.msg)
+                    await this.doSearch()
+                    loading.close()
+                } else {
+                    this.$toast.fail(resp.msg)
+                }
+            },
+            async sendPaymentMsg(row) {
+                this.$dialog.confirm({
+                    title: '提示',
+                    message: "您确定对【" + row.username + "】会员进行催缴吗?",
+                }).then(async () => {
+                        const resp = await $.get("/platform/member/payment/summary/sendPaymentMsg", { id: row.id })
+                        if (resp.code === 0) {
+                            this.$toast.success(resp.msg)
+                            await this.doSearch()
+                        } else {
+                            this.$toast.fail(resp.msg)
+                        }
+                })
+            },
         },
         async created() {
             await this.pageData()

From d5a8dd7534f8f7880de1eb76db4a879bdda37f83 Mon Sep 17 00:00:00 2001
From: = <=>
Date: Fri, 7 Mar 2025 14:11:11 +0800
Subject: [PATCH 04/17] =?UTF-8?q?=E7=BC=B4=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MemberPaymentSummaryController.java       | 12 ++++---
 .../views/mobile/memberCost/summary.html      | 33 ++++++++++++++++---
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentSummaryController.java b/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentSummaryController.java
index 8968e0f..4fdd028 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentSummaryController.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentSummaryController.java
@@ -75,7 +75,7 @@ public class MemberPaymentSummaryController {
     public Sql dataSql(String pageOrderName, String pageOrderBy, String searchName, String searchKeyword,
                        String unionId, String unitId, String threeUnitId, String unionGroupId,
                        String personType, String userState, String paymentProjectId, String year,
-                       String isPay,String schoolTime,String retireDate) {
+                       String isPay,String schoolTime,String retireDate,String search) {
         Sql sql = Sqls.create("""
                 SELECT
                 	mpi.*,
@@ -117,6 +117,9 @@ public class MemberPaymentSummaryController {
                 cnd.and("u.unionGroupId", "in", io.v.nutz.web.commons.utils.ShiroUtil.getUnionGroupIds());
             }
         }
+        if (Strings.isNotBlank(search)){
+            cnd.orEX("u.username", "like","%" + search + "%");
+        }
         cnd.andEX("mpp.`year`", "=", year);
         cnd.andEX("mpi.paymentProjectId", "=", paymentProjectId);
         if (Strings.isNotBlank(isPay) && !"null".equals(isPay)) {
@@ -158,10 +161,11 @@ public class MemberPaymentSummaryController {
                            @Param(value = "year", required = false) String year,
                            @Param(value = "isPay", required = false) String isPay,
                            @Param(value = "schoolTime", required = false) String schoolTime,
-                           @Param(value = "retireDate", required = false) String retireDate) {
+                           @Param(value = "retireDate", required = false) String retireDate,
+                           @Param(value = "search", required = false) String search) {
         Sql sql = this.dataSql(pageForm.getPageOrderName(), pageForm.getPageOrderBy(), pageForm.getSearchName(),
                 pageForm.getSearchKeyword(), unionId, unitId, threeUnitId, unionGroupId,
-                personType, userState, paymentProjectId, year, isPay,schoolTime,retireDate);
+                personType, userState, paymentProjectId, year, isPay,schoolTime,retireDate,search);
         return memberPaymentService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
     }
 
@@ -297,7 +301,7 @@ public class MemberPaymentSummaryController {
                          @Param(value = "isPay", required = false) String retireDate,
                          boolean isZip, HttpServletResponse response) {
         Sql sql = this.dataSql(null, null, searchName, searchKeyword, unionId, unitId, threeUnitId,
-                unionGroupId, personType, userState, paymentProjectId, year, isPay,schoolTime,retireDate);
+                unionGroupId, personType, userState, paymentProjectId, year, isPay,schoolTime,retireDate,"");
 
         List<NutMap> list = memberPaymentService.listMap(sql);
         NutMap nutMap = list.stream().findFirst().orElse(null);
diff --git a/src/main/resources/views/mobile/memberCost/summary.html b/src/main/resources/views/mobile/memberCost/summary.html
index d080ad5..762e9c0 100644
--- a/src/main/resources/views/mobile/memberCost/summary.html
+++ b/src/main/resources/views/mobile/memberCost/summary.html
@@ -7,7 +7,7 @@ layout("/mobile/platform.html"){
     </van-sticky>
 
     <div>
-        <van-search v-model="pageForm.searchKeyword" placeholder="请输入搜索关键词" @search="doSearch">
+        <van-search v-model="pageForm.search" placeholder="请输入搜索关键词" @search="doSearch">
         </van-search>
     </div>
     <div>
@@ -40,7 +40,7 @@ layout("/mobile/platform.html"){
                         <div class="custom-title">缴费金额：{{item.paymentMoney}}</div>
                     </template>
                     <template #right-icon>
-                        <van-button @click="show=true" v-if="!item.isPayment" size="mini" plain type="info">设为已缴</van-button>
+                        <van-button @click="openPay(item)" v-if="!item.isPayment" size="mini" plain type="info">设为已缴</van-button>
                     </template>
                 </van-cell>
                     <template #right>
@@ -64,6 +64,7 @@ layout("/mobile/platform.html"){
                         v-model="formData.paymentMoney"
                         name="缴费金额"
                         label="缴费金额"
+                        type="digit"
                         placeholder="缴费金额"
                         :rules="[{ required: true, message: '请填写缴费金额' }]"
                     ></van-field>
@@ -97,8 +98,7 @@ layout("/mobile/platform.html"){
                     totalCount: 0,
                     username: "",
                     isPay:false,
-                    searchName:'u.username',
-                    searchKeyword:''
+                    search:''
                 },
                 option1: [
                     { text: '姓名', value: 'u.username' },
@@ -162,6 +162,31 @@ layout("/mobile/platform.html"){
                         }
                 })
             },
+            openPay(item){
+              this.show=true
+              this.formData=item
+            },
+            onSubmit(){
+                this.$dialog.confirm({
+                    title: '提示',
+                    message: "您确定要更改缴费信息吗?",
+                }).then(async () => {
+                    const data={
+                        ids:JSON.stringify([this.formData.id]),
+                        paymentMoney:this.formData.paymentMoney,
+                        remark:this.formData.remark,
+                        isPay:this.formData.isPayment
+                    }
+                    const resp = await $.get("/platform/member/payment/summary/modify", data)
+                    if (resp.code === 0) {
+                        this.$toast.success(resp.msg)
+                        await this.doSearch()
+                        this.show=false
+                    } else {
+                        this.$toast.fail(resp.msg)
+                    }
+                })
+            }
         },
         async created() {
             await this.pageData()

From 0d3bafb32873657f82613a484688af394908643b Mon Sep 17 00:00:00 2001
From: Paidax <paidax.422@qq.com>
Date: Mon, 10 Mar 2025 09:40:09 +0800
Subject: [PATCH 05/17] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E3=80=81=E7=A6=8F=E5=88=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |   8 +-
 .../MemberPaymentConfigController.java        |   5 +-
 .../MemberPaymentMineController.java          |  40 +
 .../MemberPaymentProjectController.java       |   5 +-
 .../MemberPaymentSummaryController.java       |   4 +-
 .../MemberPaymentUserController.java          |  46 +-
 .../MobileMemberCostListController.java       |   2 +-
 .../controller/AlipayClientController.java    |   4 +-
 .../alipay/service}/AlipayClientConfig.java   |   2 +-
 .../alipay}/service/AlipayService.java        |   2 +-
 .../service/impl/AlipayNewServiceImpl.java    |   6 +-
 .../payment/enums/RefundStateEnum.java        |  22 +
 .../payment/enums/TradingChannelEnum.java     |  23 +
 .../payment/enums/TradingStateEnum.java       |  22 +
 .../payment/enums/TradingTypeEnum.java        |  20 +
 .../payment/model/PaymentTransaction.java     | 107 +++
 .../payment/model/RefundRecord.java           |  57 ++
 .../payment/wxpay/bean/WxPayV3Bean.java       |  47 ++
 .../payment/wxpay/pem/apiclient_cert.pem      |  25 +
 .../payment/wxpay/pem/apiclient_key.pem       |  28 +
 .../payment/wxpay/pem/wechatpay.pem           |  24 +
 .../wxpay/service/WxPayCommonService.java     |  68 ++
 .../service/impl/WxPayCommonServiceImpl.java  | 479 ++++++++++++
 .../payment/wxpay/vo/WxPayNeedParamVo.java    |  39 +
 .../WelfareProjectMangeController.java        |  29 +-
 .../WelfareUserChooseController.java          |  26 +-
 .../zhgh/welfare/model/WelfareProject.java    |   7 +-
 .../impl/WelfareSingleServiceImpl.java        |  87 ++-
 src/main/resources/application.properties     |  14 +-
 src/main/resources/logback.xml                |   4 +-
 .../resources/static/components/sign/sign.vue |  13 +-
 .../resources/views/layouts/platform.html     |   2 +-
 .../views/mobile/memberCost/query/index.html  |  16 +
 .../views/mobile/welfare/list/receive.html    | 515 +++++++------
 .../mobile/welfare/mine/address_edit.html     |  71 +-
 .../views/platform/jf/Funds/apply.html        |  42 +-
 .../payment => membercost}/config.html        |   0
 .../views/platform/membercost/mine/index.html |  17 +
 .../payment => membercost}/project.html       |   0
 .../payment => membercost}/summary.html       |   0
 .../payment => membercost}/user.html          |   0
 .../views/platform/welfare/addressManage.html | 268 ++++---
 .../views/platform/welfare/mine.html          | 318 ++++----
 .../welfare/project/ProjectMange.html         | 708 +++++++++---------
 .../platform/welfare/statistics/single.html   |  65 +-
 .../views/platform/welfare/userChoose.html    | 637 ++++++++--------
 46 files changed, 2489 insertions(+), 1435 deletions(-)
 rename src/main/java/io/v/nutz/zhgh/memberCost/controller/{payment => }/MemberPaymentConfigController.java (93%)
 create mode 100644 src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentMineController.java
 rename src/main/java/io/v/nutz/zhgh/memberCost/controller/{payment => }/MemberPaymentProjectController.java (98%)
 rename src/main/java/io/v/nutz/zhgh/memberCost/controller/{payment => }/MemberPaymentSummaryController.java (99%)
 rename src/main/java/io/v/nutz/zhgh/memberCost/controller/{payment => }/MemberPaymentUserController.java (64%)
 rename src/main/java/io/v/nutz/zhgh/memberCost/{controller/mobile => h5controller}/MobileMemberCostListController.java (97%)
 rename src/main/java/io/v/nutz/zhgh/memberCost/{ => payment/alipay}/controller/AlipayClientController.java (93%)
 rename src/main/java/io/v/nutz/zhgh/memberCost/{controller => payment/alipay/service}/AlipayClientConfig.java (98%)
 rename src/main/java/io/v/nutz/zhgh/memberCost/{ => payment/alipay}/service/AlipayService.java (85%)
 rename src/main/java/io/v/nutz/zhgh/memberCost/{ => payment/alipay}/service/impl/AlipayNewServiceImpl.java (96%)
 create mode 100644 src/main/java/io/v/nutz/zhgh/memberCost/payment/enums/RefundStateEnum.java
 create mode 100644 src/main/java/io/v/nutz/zhgh/memberCost/payment/enums/TradingChannelEnum.java
 create mode 100644 src/main/java/io/v/nutz/zhgh/memberCost/payment/enums/TradingStateEnum.java
 create mode 100644 src/main/java/io/v/nutz/zhgh/memberCost/payment/enums/TradingTypeEnum.java
 create mode 100644 src/main/java/io/v/nutz/zhgh/memberCost/payment/model/PaymentTransaction.java
 create mode 100644 src/main/java/io/v/nutz/zhgh/memberCost/payment/model/RefundRecord.java
 create mode 100644 src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/bean/WxPayV3Bean.java
 create mode 100644 src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/pem/apiclient_cert.pem
 create mode 100644 src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/pem/apiclient_key.pem
 create mode 100644 src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/pem/wechatpay.pem
 create mode 100644 src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/service/WxPayCommonService.java
 create mode 100644 src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/service/impl/WxPayCommonServiceImpl.java
 create mode 100644 src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/vo/WxPayNeedParamVo.java
 create mode 100644 src/main/resources/views/mobile/memberCost/query/index.html
 rename src/main/resources/views/platform/{memberCost/payment => membercost}/config.html (100%)
 create mode 100644 src/main/resources/views/platform/membercost/mine/index.html
 rename src/main/resources/views/platform/{memberCost/payment => membercost}/project.html (100%)
 rename src/main/resources/views/platform/{memberCost/payment => membercost}/summary.html (100%)
 rename src/main/resources/views/platform/{memberCost/payment => membercost}/user.html (100%)

diff --git a/pom.xml b/pom.xml
index 54367f9..a4d53b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
         <jsoup.veision>1.12.1</jsoup.veision>
         <poitl.version>1.9.1</poitl.version>
         <easypoi.version>4.2.0</easypoi.version>
-        <jetty.version>9.4.47.v20220610</jetty.version>
+        <jetty.version>9.4.56.v20240826</jetty.version>
     </properties>
 
     <url>https://budwk.com</url>
@@ -53,6 +53,12 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>com.github.javen205</groupId>
+            <artifactId>IJPay-All</artifactId>
+            <version>2.9.10</version>
+        </dependency>
+
         <dependency>
             <groupId>com.xingyuv</groupId>
             <artifactId>captcha-plus</artifactId>
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentConfigController.java b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentConfigController.java
similarity index 93%
rename from src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentConfigController.java
rename to src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentConfigController.java
index 1059c3d..6b11307 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentConfigController.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentConfigController.java
@@ -1,10 +1,9 @@
-package io.v.nutz.zhgh.memberCost.controller.payment;
+package io.v.nutz.zhgh.memberCost.controller;
 
 import io.v.nutz.base.annontation.ViReturn;
 import io.v.nutz.base.dao.CndPlus;
 import io.v.nutz.base.query.PageForm;
 import io.v.nutz.zhgh.memberCost.model.MemberPaymentConfig;
-import io.v.nutz.zhgh.memberCost.model.MemberPaymentProject;
 import io.v.nutz.zhgh.memberCost.service.MemberPaymentService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -30,7 +29,7 @@ public class MemberPaymentConfigController {
     private MemberPaymentService memberPaymentService;
 
     @At("")
-    @Ok("beetl:/platform/memberCost/payment/config.html")
+    @Ok("beetl:/platform/membercost/config.html")
     @RequiresPermissions("member.payment.config")
     public void index() {}
 
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentMineController.java b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentMineController.java
new file mode 100644
index 0000000..84b8f67
--- /dev/null
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentMineController.java
@@ -0,0 +1,40 @@
+package io.v.nutz.zhgh.memberCost.controller;
+
+import io.v.nutz.zhgh.memberCost.payment.wxpay.service.WxPayCommonService;
+import io.v.nutz.zhgh.memberCost.service.MemberPaymentService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+/**
+ * @version 1.0
+ * @Author zzr
+ * @name：MemberPaymentMineController
+ * @Date 2025/3/10 8:44
+ * @注释 我的缴费列表
+ */
+@Slf4j
+@IocBean
+@Ok("json:full")
+@At("/platform/member/payment/mine")
+public class MemberPaymentMineController {
+
+    @Inject
+    private WxPayCommonService wxPayCommonService;
+    @Inject
+    private MemberPaymentService memberPaymentService;
+
+    @At("")
+    @Ok("beetl:/platform/membercost/mine/index.html")
+    @RequiresPermissions("member.payment.project")
+    public void index() {
+    }
+
+
+    public Object pageData(){
+        return null;
+    }
+}
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentProjectController.java b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentProjectController.java
similarity index 98%
rename from src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentProjectController.java
rename to src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentProjectController.java
index 5d23841..4a42247 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentProjectController.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentProjectController.java
@@ -1,4 +1,4 @@
-package io.v.nutz.zhgh.memberCost.controller.payment;
+package io.v.nutz.zhgh.memberCost.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateTime;
@@ -30,7 +30,6 @@ import org.nutz.mvc.annotation.Param;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -50,7 +49,7 @@ public class MemberPaymentProjectController {
     private MemberPaymentService memberPaymentService;
 
     @At("")
-    @Ok("beetl:/platform/memberCost/payment/project.html")
+    @Ok("beetl:/platform/membercost/project.html")
     @RequiresPermissions("member.payment.project")
     public void index() {
     }
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentSummaryController.java b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentSummaryController.java
similarity index 99%
rename from src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentSummaryController.java
rename to src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentSummaryController.java
index 4fdd028..d7e61c9 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentSummaryController.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentSummaryController.java
@@ -1,4 +1,4 @@
-package io.v.nutz.zhgh.memberCost.controller.payment;
+package io.v.nutz.zhgh.memberCost.controller;
 
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.ExcelImportUtil;
@@ -66,7 +66,7 @@ public class MemberPaymentSummaryController {
     private MsgApi msgApi;
 
     @At("")
-    @Ok("beetl:/platform/memberCost/payment/summary.html")
+    @Ok("beetl:/platform/membercost/summary.html")
     @RequiresPermissions("member.payment.summary")
     public void index() {
     }
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentUserController.java b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentUserController.java
similarity index 64%
rename from src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentUserController.java
rename to src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentUserController.java
index 1cbec5d..3eaa205 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/controller/payment/MemberPaymentUserController.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentUserController.java
@@ -1,4 +1,4 @@
-package io.v.nutz.zhgh.memberCost.controller.payment;
+package io.v.nutz.zhgh.memberCost.controller;
 
 
 import io.v.nutz.base.annontation.ViReturn;
@@ -6,28 +6,19 @@ import io.v.nutz.base.dao.CndPlus;
 import io.v.nutz.base.query.PageForm;
 import io.v.nutz.web.commons.utils.ShiroUtil;
 import io.v.nutz.zhgh.memberCost.model.MemberPaymentInfo;
-import io.v.nutz.zhgh.memberCost.model.MemberPaymentProject;
 import io.v.nutz.zhgh.memberCost.service.MemberPaymentService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.nutz.dao.Chain;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
-import org.nutz.dao.util.cri.Static;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
-import org.nutz.lang.Lang;
 import org.nutz.lang.Strings;
 import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
 import org.nutz.mvc.annotation.Param;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
 /**
  * 个人缴费管理
  * @author hpf
@@ -42,7 +33,7 @@ public class MemberPaymentUserController {
     private MemberPaymentService memberPaymentService;
 
     @At("")
-    @Ok("beetl:/platform/memberCost/payment/user.html")
+    @Ok("beetl:/platform/membercost/user.html")
     @RequiresPermissions("member.payment.user")
     public void index() {
     }
@@ -51,23 +42,26 @@ public class MemberPaymentUserController {
     @ViReturn
     @RequiresPermissions("member.payment.user")
     public Object pageData(PageForm pageForm,@Param(value = "year", required = false) String year,@Param(value = "projectName", required = false) String projectName){
-        Sql sql = Sqls.create("SELECT" +
-                " mpi.*," +
-                " mpp.`year`," +
-                " mpp.projectName," +
-                " mpp.startTime," +
-                " mpp.endTime," +
-                " mpp.configId," +
-                " mpc.payStandards," +
-                " mpc.paymentStartMonth," +
-                " mpc.paymentEndMonth" +
-                " FROM" +
-                " member_payment_info mpi" +
-                " LEFT JOIN member_payment_project mpp ON mpi.paymentProjectId = mpp.id " +
-                " LEFT JOIN member_payment_config mpc ON mpc.id = mpp.configId $condition");
+        Sql sql = Sqls.create("""
+                SELECT
+                    mpi.*,
+                    mpp.`year`,
+                    mpp.projectName,
+                    mpp.startTime,
+                    mpp.endTime,
+                    mpp.configId,
+                    mpc.payStandards,
+                    mpc.paymentStartMonth,
+                    mpc.paymentEndMonth
+                FROM
+                    member_payment_info mpi
+                LEFT JOIN member_payment_project mpp ON mpi.paymentProjectId = mpp.id
+                LEFT JOIN member_payment_config mpc ON mpc.id = mpp.configId 
+                $condition
+                """);
         CndPlus cnd = CndPlus.create();
 
-        cnd.andEX("mpp.isDisabled", "=", '0');
+        cnd.andEX("mpp.isDisabled", "=", false);
         cnd.andEX("mpp.year", "=", year);
         cnd.and("mpi.userId", "=", ShiroUtil.getUserId());
         if (Strings.isNotBlank(projectName)) {
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/mobile/MobileMemberCostListController.java b/src/main/java/io/v/nutz/zhgh/memberCost/h5controller/MobileMemberCostListController.java
similarity index 97%
rename from src/main/java/io/v/nutz/zhgh/memberCost/controller/mobile/MobileMemberCostListController.java
rename to src/main/java/io/v/nutz/zhgh/memberCost/h5controller/MobileMemberCostListController.java
index 6907302..d2ddeba 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/controller/mobile/MobileMemberCostListController.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/h5controller/MobileMemberCostListController.java
@@ -1,4 +1,4 @@
-package io.v.nutz.zhgh.memberCost.controller.mobile;
+package io.v.nutz.zhgh.memberCost.h5controller;
 
 import io.v.nutz.base.annontation.ViReturn;
 import io.v.nutz.web.commons.utils.ShiroUtil;
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/AlipayClientController.java b/src/main/java/io/v/nutz/zhgh/memberCost/payment/alipay/controller/AlipayClientController.java
similarity index 93%
rename from src/main/java/io/v/nutz/zhgh/memberCost/controller/AlipayClientController.java
rename to src/main/java/io/v/nutz/zhgh/memberCost/payment/alipay/controller/AlipayClientController.java
index 7270989..abc1f68 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/controller/AlipayClientController.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/payment/alipay/controller/AlipayClientController.java
@@ -1,6 +1,6 @@
-package io.v.nutz.zhgh.memberCost.controller;
+package io.v.nutz.zhgh.memberCost.payment.alipay.controller;
 
-import io.v.nutz.zhgh.memberCost.service.AlipayService;
+import io.v.nutz.zhgh.memberCost.payment.alipay.service.AlipayService;
 import lombok.extern.slf4j.Slf4j;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/AlipayClientConfig.java b/src/main/java/io/v/nutz/zhgh/memberCost/payment/alipay/service/AlipayClientConfig.java
similarity index 98%
rename from src/main/java/io/v/nutz/zhgh/memberCost/controller/AlipayClientConfig.java
rename to src/main/java/io/v/nutz/zhgh/memberCost/payment/alipay/service/AlipayClientConfig.java
index 7819815..0594c7c 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/controller/AlipayClientConfig.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/payment/alipay/service/AlipayClientConfig.java
@@ -1,4 +1,4 @@
-package io.v.nutz.zhgh.memberCost.controller;
+package io.v.nutz.zhgh.memberCost.payment.alipay.service;
 
 /**
  * @ClassName AlipayClientConfig
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/service/AlipayService.java b/src/main/java/io/v/nutz/zhgh/memberCost/payment/alipay/service/AlipayService.java
similarity index 85%
rename from src/main/java/io/v/nutz/zhgh/memberCost/service/AlipayService.java
rename to src/main/java/io/v/nutz/zhgh/memberCost/payment/alipay/service/AlipayService.java
index 32da08e..f0fe4d8 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/service/AlipayService.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/payment/alipay/service/AlipayService.java
@@ -1,4 +1,4 @@
-package io.v.nutz.zhgh.memberCost.service;
+package io.v.nutz.zhgh.memberCost.payment.alipay.service;
 
 
 import io.v.nutz.base.service.ViService;
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/service/impl/AlipayNewServiceImpl.java b/src/main/java/io/v/nutz/zhgh/memberCost/payment/alipay/service/impl/AlipayNewServiceImpl.java
similarity index 96%
rename from src/main/java/io/v/nutz/zhgh/memberCost/service/impl/AlipayNewServiceImpl.java
rename to src/main/java/io/v/nutz/zhgh/memberCost/payment/alipay/service/impl/AlipayNewServiceImpl.java
index 0dd726e..b78cd14 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/service/impl/AlipayNewServiceImpl.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/payment/alipay/service/impl/AlipayNewServiceImpl.java
@@ -1,4 +1,4 @@
-package io.v.nutz.zhgh.memberCost.service.impl;
+package io.v.nutz.zhgh.memberCost.payment.alipay.service.impl;
 
 import com.alipay.api.AlipayApiException;
 import com.alipay.api.AlipayConstants;
@@ -9,9 +9,9 @@ import com.alipay.api.request.AlipayTradeWapPayRequest;
 import com.alipay.api.response.AlipayTradeWapPayResponse;
 import io.v.nutz.base.service.impl.ViServiceImpl;
 import io.v.nutz.web.commons.utils.ShiroUtil;
-import io.v.nutz.zhgh.memberCost.controller.AlipayClientConfig;
+import io.v.nutz.zhgh.memberCost.payment.alipay.service.AlipayClientConfig;
 import io.v.nutz.zhgh.memberCost.model.MemberPaymentInfo;
-import io.v.nutz.zhgh.memberCost.service.AlipayService;
+import io.v.nutz.zhgh.memberCost.payment.alipay.service.AlipayService;
 import lombok.extern.slf4j.Slf4j;
 import org.nutz.dao.Chain;
 import org.nutz.dao.Cnd;
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/enums/RefundStateEnum.java b/src/main/java/io/v/nutz/zhgh/memberCost/payment/enums/RefundStateEnum.java
new file mode 100644
index 0000000..3e54d0a
--- /dev/null
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/payment/enums/RefundStateEnum.java
@@ -0,0 +1,22 @@
+package io.v.nutz.zhgh.memberCost.payment.enums;
+
+import io.v.nutz.base.annontation.SelectEnum;
+
+/**
+ * 退款状态枚举
+ */
+@Getter
+@SelectEnum
+@AllArgsConstructor
+public enum RefundStateEnum {
+
+    INITIATE_REFUND("发起退款"),
+    REFUNDING("退款中"),
+    REFUND_SUCCESS("退款成功"),
+    REFUND_FAILED("退款失败");
+
+    /**
+     * 避免和枚举类的name冲突
+     */
+    public final String refundStateName;
+}
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/enums/TradingChannelEnum.java b/src/main/java/io/v/nutz/zhgh/memberCost/payment/enums/TradingChannelEnum.java
new file mode 100644
index 0000000..2f1ea6c
--- /dev/null
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/payment/enums/TradingChannelEnum.java
@@ -0,0 +1,23 @@
+package io.v.nutz.zhgh.memberCost.payment.enums;
+
+import io.v.nutz.base.annontation.SelectEnum;
+
+/**
+ * 交易渠道枚举
+ */
+@Getter
+@SelectEnum
+@AllArgsConstructor
+public enum TradingChannelEnum {
+
+    QQ_PAY("QQ"),
+    WX_PAY("微信"),
+    JD_PAY("京东"),
+    ALI_PAY("支付宝"),
+    UNION_PAY("云闪付");
+
+    /**
+     * 避免和枚举类的name冲突
+     */
+    public final String trdingChannelName;
+}
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/enums/TradingStateEnum.java b/src/main/java/io/v/nutz/zhgh/memberCost/payment/enums/TradingStateEnum.java
new file mode 100644
index 0000000..17c7c9f
--- /dev/null
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/payment/enums/TradingStateEnum.java
@@ -0,0 +1,22 @@
+package io.v.nutz.zhgh.memberCost.payment.enums;
+
+import io.v.nutz.base.annontation.SelectEnum;
+
+
+/**
+ * 支付状态枚举
+ */
+@Getter
+@SelectEnum
+@AllArgsConstructor
+public enum TradingStateEnum {
+
+    WAITING_FOR_PAYMENT("等待支付"),
+    PAY_SUCCESS("支付成功"),
+    CANCEL_PAYMENT("取消支付");
+
+    /**
+     * 避免和枚举类的name冲突
+     */
+    public final String trdingStateName;
+}
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/enums/TradingTypeEnum.java b/src/main/java/io/v/nutz/zhgh/memberCost/payment/enums/TradingTypeEnum.java
new file mode 100644
index 0000000..31865e4
--- /dev/null
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/payment/enums/TradingTypeEnum.java
@@ -0,0 +1,20 @@
+package io.v.nutz.zhgh.memberCost.payment.enums;
+
+import io.v.nutz.base.annontation.SelectEnum;
+
+/**
+ * 交易类型枚举
+ */
+@Getter
+@SelectEnum
+@AllArgsConstructor
+public enum TradingTypeEnum {
+
+    PAYMENT("付款"),
+    REFUND("退款");
+
+    /**
+     * 避免和枚举类的name冲突
+     */
+    public final String trdingTypeName;
+}
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/model/PaymentTransaction.java b/src/main/java/io/v/nutz/zhgh/memberCost/payment/model/PaymentTransaction.java
new file mode 100644
index 0000000..1a9c092
--- /dev/null
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/payment/model/PaymentTransaction.java
@@ -0,0 +1,107 @@
+package io.v.nutz.zhgh.memberCost.payment.model;
+
+import io.v.nutz.base.model.BaseModel;
+
+import java.math.BigDecimal;
+
+/**
+ * 交易单表
+ */
+@Data
+@Table
+@Comment("交易订单表")
+@EqualsAndHashCode(callSuper = true)
+public class PaymentTransaction extends BaseModel {
+
+    @Column
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("商户号")
+    @ColDefine(type = ColType.VARCHAR,width = 128)
+    private String mchId;
+
+    @Column
+    @Comment("订单号，传递给交易系统，交易系统订单号")
+    @ColDefine(type = ColType.VARCHAR,width = 128)
+    private String outTradeNo;
+
+    @Column
+    @Comment("交易系统交易号")
+    @ColDefine(type = ColType.VARCHAR,width = 128)
+    private String tradingOrderNo;
+
+    @Column
+    @Comment("交易渠道")
+    @ColDefine(type = ColType.VARCHAR,width = 50)
+    private String tradingChannel;
+
+    @Column
+    @Comment("交易类型")
+    @ColDefine(type = ColType.VARCHAR,width = 30)
+    private String tradingType;
+
+    @Column
+    @Comment("用户ID")
+    @ColDefine(type = ColType.VARCHAR,width = 32)
+    private String userId;
+
+    @Column
+    @Comment("用户工号")
+    @ColDefine(type = ColType.VARCHAR,width = 50)
+    private String loginName;
+
+    @Column
+    @Comment("用户姓名")
+    @ColDefine(type = ColType.VARCHAR,width = 50)
+    private String userName;
+
+    @Column
+    @Comment("用户工会")
+    @ColDefine(type = ColType.VARCHAR,width = 50)
+    private String unionName;
+
+    @Column
+    @Comment("用户单位")
+    @ColDefine(type = ColType.VARCHAR,width = 50)
+    private String unitName;
+
+    @Column
+    @Comment("交易金额")
+    @ColDefine(customType = "decimal")
+    private BigDecimal tradingAmount;
+
+    @Column
+    @Comment("是否退款")
+    @ColDefine(type = ColType.BOOLEAN)
+    private Boolean isRefund;
+
+    @Column
+    @Comment("退款金额")
+    @ColDefine(customType = "decimal")
+    private String refundAmount;
+
+    @Column
+    @Comment("订单描述")
+    @ColDefine(type = ColType.VARCHAR,width = 128)
+    private String description;
+
+    @Column
+    @Comment("附加详细描述")
+    @ColDefine(type = ColType.TEXT)
+    private String attach;
+
+    @Column
+    @Comment("微信支付用户openId")
+    @ColDefine(type = ColType.VARCHAR,width = 50)
+    private String openId;
+
+    @Column
+    @Comment("交易返回数据")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private String resultJson;
+}
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/model/RefundRecord.java b/src/main/java/io/v/nutz/zhgh/memberCost/payment/model/RefundRecord.java
new file mode 100644
index 0000000..d65049f
--- /dev/null
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/payment/model/RefundRecord.java
@@ -0,0 +1,57 @@
+package io.v.nutz.zhgh.memberCost.payment.model;
+
+import io.v.nutz.base.model.BaseModel;
+
+import java.math.BigDecimal;
+
+/**
+ * 退款记录表
+ */
+@Data
+@Table
+@Comment("退款记录表")
+@EqualsAndHashCode(callSuper = true)
+public class RefundRecord extends BaseModel {
+
+    @Column
+    @Name
+    @Comment("ID")
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @Comment("关联系统交易订单表Id")
+    @ColDefine(type = ColType.VARCHAR,width = 32)
+    private String paymentTransactionId;
+
+    @Column
+    @Comment("本次退款订单号")
+    @ColDefine(type = ColType.VARCHAR,width = 128)
+    private String outRefundTradeNo;
+
+    @Column
+    @Comment("第三方支付的退款单号")
+    @ColDefine(type = ColType.VARCHAR,width = 128)
+    private String refundNo;
+
+    @Column
+    @Comment("退款状态")
+    @ColDefine(type = ColType.VARCHAR,width = 30)
+    private String refundState;
+
+    @Column
+    @Comment("本次退款金额")
+    @ColDefine(customType = "decimal")
+    private BigDecimal refundAmount;
+
+    @Column
+    @Comment("原订单金额")
+    @ColDefine(customType = "decimal")
+    private BigDecimal total;
+
+    @Column
+    @Comment("交易返回数据")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private String resultJson;
+}
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/bean/WxPayV3Bean.java b/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/bean/WxPayV3Bean.java
new file mode 100644
index 0000000..4999027
--- /dev/null
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/bean/WxPayV3Bean.java
@@ -0,0 +1,47 @@
+package io.v.nutz.zhgh.memberCost.payment.wxpay.bean;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @version 1.0
+ * @Author zzr
+ * @name：WxPayV3Bean
+ * @Date 2025/3/6 9:54
+ * @注释
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class WxPayV3Bean {
+
+    private String appId;
+    private String keyPath;
+    private String publicKeyPath;
+    private String certPath;
+    private String certP12Path;
+    private String platformCertPath;
+    private String mchId;
+    private String apiKey;
+    private String apiKey3;
+    private String domain;
+    private String publicKeyId;
+
+    @Override
+    public String toString() {
+        return "WxPayV3Bean{" +
+                "appId='" + appId + '\'' +
+                ", keyPath='" + keyPath + '\'' +
+                ", publicKeyPath='" + publicKeyPath + '\'' +
+                ", certPath='" + certPath + '\'' +
+                ", certP12Path='" + certP12Path + '\'' +
+                ", platformCertPath='" + platformCertPath + '\'' +
+                ", mchId='" + mchId + '\'' +
+                ", apiKey='" + apiKey + '\'' +
+                ", apiKey3='" + apiKey3 + '\'' +
+                ", domain='" + domain + '\'' +
+                ", publicKeyId='" + publicKeyId + '\'' +
+                '}';
+    }
+}
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/pem/apiclient_cert.pem b/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/pem/apiclient_cert.pem
new file mode 100644
index 0000000..ee557fe
--- /dev/null
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/pem/apiclient_cert.pem
@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIEKDCCAxCgAwIBAgIUONYpzvxVfV/RrWnLGPlL6/nb/AcwDQYJKoZIhvcNAQEL
+BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
+FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
+Q0EwHhcNMjUwMzA2MTQwNDAzWhcNMzAwMzA1MTQwNDAzWjCBgTETMBEGA1UEAwwK
+MTY2NjkzMDk4MDEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMS0wKwYDVQQL
+DCTmrabmsYnlnLDlpKfkuInmgJ3np5HmioDmnInpmZDlhazlj7gxCzAJBgNVBAYT
+AkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALlDML+FJEW+m2hXp/qUH1cU6xlwFllLU4LjFusJkxwyzzcZO4nY0mOi
+3woz8xIJipvUWj2Y413WYwMkfcJcRgghupZkfYwdQtSyPfUu7xQBUm8TLWGH88Re
+kyyVABEB5T+ne6r3LesXS4IuZknm5N/iaa4z9mbbscGqF0GLvMUqZCRNyTkyfK9r
+Bkvs/vspi+Jcjx9I7aU++h/vwzsGB6Bf/uB3kLMb+lj/i3xY20sdrrW8JD2sqONQ
+NcRIKmNXSp4zsNy+d6kIKWE3P5609ZTta1ogkeGBNdGXMRNNy6vLIudQc7zny/9H
+S4LxGsIrsYmZNhGljRng56X+PG3w1CUCAwEAAaOBuTCBtjAJBgNVHRMEAjAAMAsG
+A1UdDwQEAwID+DCBmwYDVR0fBIGTMIGQMIGNoIGKoIGHhoGEaHR0cDovL2V2Y2Eu
+aXRydXMuY29tLmNuL3B1YmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRC
+MDZBRDM5NzU0OTg0NkMwMUMzRThFQkQyJnNnPUhBQ0M0NzFCNjU0MjJFMTJCMjdB
+OUQzM0E4N0FEMUNERjU5MjZFMTQwMzcxMA0GCSqGSIb3DQEBCwUAA4IBAQBQ5e8U
+1pQ40gfRoZyO0s+QF16L8pAcVLVwHffo0mmJpIRB4bu8W5IJ9kKhksJ0CzZ0YEwB
+Yv7/LTC1qpi7PE73nZ4Ytm9oZeH1Kk5KIlQS+2H3IwOpoV4wucMc34y6MVQJjC7E
+u5OnglBPSAopwNP4p+Us9A3ah7Ks48XCw+LCEWpA/setJwo9C13Qq2AQm8qLpogK
+pNBwm/oylxb8/kZK1lLPgcXd7geLDhl/Str+aOzBXyd7YSEMxS8zWiZhWozu6rCq
+dg10QFKicPGDkDzNQwBz7cDXvlJXSWRDBK5r1li1YgX+QD5WJYPchATo5SlvF4Lr
+5/V/dZzI7BJTinr1
+-----END CERTIFICATE-----
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/pem/apiclient_key.pem b/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/pem/apiclient_key.pem
new file mode 100644
index 0000000..36b4b67
--- /dev/null
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/pem/apiclient_key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC5QzC/hSRFvpto
+V6f6lB9XFOsZcBZZS1OC4xbrCZMcMs83GTuJ2NJjot8KM/MSCYqb1Fo9mONd1mMD
+JH3CXEYIIbqWZH2MHULUsj31Lu8UAVJvEy1hh/PEXpMslQARAeU/p3uq9y3rF0uC
+LmZJ5uTf4mmuM/Zm27HBqhdBi7zFKmQkTck5MnyvawZL7P77KYviXI8fSO2lPvof
+78M7BgegX/7gd5CzG/pY/4t8WNtLHa61vCQ9rKjjUDXESCpjV0qeM7DcvnepCClh
+Nz+etPWU7WtaIJHhgTXRlzETTcuryyLnUHO858v/R0uC8RrCK7GJmTYRpY0Z4Oel
+/jxt8NQlAgMBAAECggEBAKGQqTi9Ii741Ysftsze1J4bDhS3HaZt/LyO0vPS+8qB
+vRiuFrBWuNRPu/en6nl2fLz9al2Bsfep+dtJvar80c5Rq+lwZdUFx7y6XTIv5iwq
+IvvfW5pM+Bfu6qbcopwybP0gUMd+nTsCq8UyNd6JUFy3lbZodqCpQ9JDRdjRxqSi
+oMonve36Q9kJyDs0mS2F0w+Y9oYFtpE9WvGMBthwT7VfzWuDa+YC/Gh0RhT2V9OG
+uDC8kxmfaIbk0IITDVFWVMMhScXiqmJL1II9yQWsCHH73dZS+dDxwwH0ObRD3kOx
+hHptxpRzhtuNxLjCOZDGhneyvUHIftpqf4wdOgQ8iUECgYEA6TDo36s3XDFIs8SH
+lpVYrhie0nmaNET50CtOc5C2M1OotrkMUrQTMoa4F263UloJfqweW9AKZX11wPp2
+8h7af2sZsGawjuwv7mMthZJoi0fc5J2+z6BnVGgFo7uZbcs1Y/+B0tNrDKIHVrqb
+Lywmh18iKDXrMiMDMRp8mtiNyU0CgYEAy2Im0oGb1rmAh9gPvQIENmNEgRsyIU4x
+WPAFb5KO7jnseO9KrC9uiRSO5JuwZu/QNGlga2w77Gu7n+Q4HfSU2KFlNhR6pKjb
+mqXzPq1quryzbtWay520VsRKz3F/Tfp1FUpIuZvj8x7FrL8z8vjbLkbW4p+Z7HE4
+heYdmk2KCjkCgYBC6xU48pJtc3swk2pxjSQoucoCDoFxFIY39eWKhnGy4wQcg5gE
+t8Z2jnCP0ObszAfDgTMpF9eT7l/3ZCj0LGR5gkuZ8q4iJadPmsh6d1xm89VxCc+z
+F43vi/ZqWTCbcGA+9RjVXnRu6KSAgAZ+kAXyfRt5PJflCGUnFznA2fo+VQKBgG6s
+n7Gno/UKBv5lPdM9mKs8A5g6A2KKWWIrYtnfJ/ZNAPiiRsFCImVoEYYnjqvFTkhn
+G3f5cvZpfbU5jKwIX0MvOJNgO4kE9lPGgIKX/d9WNlJW3KB21h7tPER8X6lAZJxM
+SxztzvKKyUkC1zMd5q/dDqxN64X16qs6mNtR3I9JAoGBAJbqQtg59Szi2m4jZ9Xo
+0cKvP7+PSKgysdWsemTkU0ji1rcMpGRTtcUGRWlawLjRSInQS+xNdL6GVU5mHZWe
+gNwXIXEpape4IJta0B1PYAhNcIvOSh5CzcUnVTeo6q0CTSVQPdsivlrObLKZ4uGQ
+eewDw82Ej6YoSgczjf99ug0x
+-----END PRIVATE KEY-----
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/pem/wechatpay.pem b/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/pem/wechatpay.pem
new file mode 100644
index 0000000..aaa6938
--- /dev/null
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/pem/wechatpay.pem
@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEFDCCAvygAwIBAgIUKN05Gm0Q9n9mLPPltUh8qjKKegQwDQYJKoZIhvcNAQEL
+BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
+FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
+Q0EwHhcNMjUwMzA2MTQwNDAzWhcNMzAwMzA1MTQwNDAzWjBuMRgwFgYDVQQDDA9U
+ZW5wYXkuY29tIHNpZ24xEzARBgNVBAoMClRlbnBheS5jb20xHTAbBgNVBAsMFFRl
+bnBheS5jb20gQ0EgQ2VudGVyMQswCQYDVQQGEwJDTjERMA8GA1UEBwwIU2hlblpo
+ZW4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbMenF0GNlcUYErPpj
+Aj+WOuzRFz+PJcrtgkI81S0WDh8flMtq1A2nwKARNyPXx+UPd9it657nH5G8E9kL
+Ea5u5rENpn+JZc4cAIvZqazteSAUg2pfQH9ewW+/CxNOWarjXPNRYa0OjZWf+5F8
+ZBOT/x8sJ2+jou9lxKNe1skha+jzmiQ8m3B2vPXqR87qgL/fyQjjpLvBGpvearh/
+hxTMBEfGeB4F6Fu52Fz3/VCWe38ubxwj8EMcRSPp4xsl2BTaRVMMT525Hul2N49C
+vXCSVsCNt3ND8UDffXnb19Zgpir4KqpECTbfqcT7YX+U34P1Av8gcDl6rRm+7Wpj
+PY4RAgMBAAGjgbkwgbYwCQYDVR0TBAIwADALBgNVHQ8EBAMCA/gwgZsGA1UdHwSB
+kzCBkDCBjaCBiqCBh4aBhGh0dHA6Ly9ldmNhLml0cnVzLmNvbS5jbi9wdWJsaWMv
+aXRydXNjcmw/Q0E9MUJENDIyMEU1MERCQzA0QjA2QUQzOTc1NDk4NDZDMDFDM0U4
+RUJEMiZzZz1IQUNDNDcxQjY1NDIyRTEyQjI3QTlEMzNBODdBRDFDREY1OTI2RTE0
+MDM3MTANBgkqhkiG9w0BAQsFAAOCAQEAUAvXCx55ZGmd3ATi28W4mirnUHQb2RAw
+X5/0OC2SkuBdzxI5RbY4YAuugP6nQIAU8TXCANzno2oqZ6vmFZ4dBnJmLewVFMoM
+qp18A4RWmnsGnmEIgMm6N1kB+RbM11oLCLdy2KK0SvmqDmTBFJyjyUGqEmRshnV/
+QfKn4UUzJ4suDFAolGX4DyDIOtM0D+SCHwwxGI4yf2+nj4IB8XgmmOeschxoSvu9
+T3E6BgQ271YVDwg+3r9CiFVI5JdyftvQagOEQmZJMPINEKgFn5LzrZJW7mH42+N+
+i4RFz04wpGUsrSFDESh3JxYSNhq/HulpMLinntWxEBHFhpkjyyGDGg==
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/service/WxPayCommonService.java b/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/service/WxPayCommonService.java
new file mode 100644
index 0000000..60d8689
--- /dev/null
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/service/WxPayCommonService.java
@@ -0,0 +1,68 @@
+package io.v.nutz.zhgh.memberCost.payment.wxpay.service;
+
+import io.v.nutz.zhgh.memberCost.payment.wxpay.vo.WxPayNeedParamVo;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @version 1.0
+ * @Author zzr
+ * @name：WxPayCommonService
+ * @Date 2025/3/6 11:40
+ * @注释
+ */
+public interface WxPayCommonService {
+
+
+    /**
+     * 二维码统一下单，返回支付二维码链接
+     * @param paramVo 需要传递的信息，请自定义付款金额Amount 和  付款描述Description，其他关键信息请勿修改
+     *                注意Amount的总价total是int类型，会自动乘以0.01，例如传递100元，会自动转换为1元
+     * @return
+     */
+    String nativePay(WxPayNeedParamVo paramVo);
+
+
+    /**
+     * JSAPI支付，返回支付参数
+     * @param paramVo 需要传递的信息，请自定义付款金额Amount 和  付款描述Description，其他关键信息请勿修改
+     *                注意Amount的总价total是int类型，会自动乘以0.01，例如传递100元，会自动转换为1元
+     *                JsAPI支付，需要传递openId，请自行获取
+     * @return
+     */
+    String jsApiPay(WxPayNeedParamVo paramVo);
+
+    /**
+     * WAP支付，返回支付参数
+     * @param paramVo 需要传递的信息，请自定义付款金额Amount 和  付款描述Description，其他关键信息请勿修改
+     *                注意Amount的总价total是int类型，会自动乘以0.01，例如传递100元，会自动转换为1元
+     * @return
+     */
+    String wapPay(WxPayNeedParamVo paramVo);
+
+
+    /**
+     * 支付回调,验证是否支付成功
+     * @param request 请求
+     * @param response 响应
+     */
+    void payNotify(HttpServletRequest request, HttpServletResponse response);
+
+
+    /**
+     * 退款
+     * @param transactionId 微信订单号
+     * @param outTradeNo 商户订单号
+     * @return
+     */
+    String refund(String transactionId, String outTradeNo);
+
+
+    /**
+     * 退款回调
+     * @param request 请求
+     * @param response 响应
+     */
+    void refundNotify(HttpServletRequest request, HttpServletResponse response);
+}
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/service/impl/WxPayCommonServiceImpl.java b/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/service/impl/WxPayCommonServiceImpl.java
new file mode 100644
index 0000000..8d2a0a0
--- /dev/null
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/service/impl/WxPayCommonServiceImpl.java
@@ -0,0 +1,479 @@
+package io.v.nutz.zhgh.memberCost.payment.wxpay.service.impl;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.ContentType;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.ijpay.core.IJPayHttpResponse;
+import com.ijpay.core.enums.AuthTypeEnum;
+import com.ijpay.core.enums.RequestMethodEnum;
+import com.ijpay.core.kit.AesUtil;
+import com.ijpay.core.kit.HttpKit;
+import com.ijpay.core.kit.PayKit;
+import com.ijpay.core.kit.WxPayKit;
+import com.ijpay.wxpay.WxPayApi;
+import com.ijpay.wxpay.enums.WxDomainEnum;
+import com.ijpay.wxpay.enums.v3.BasePayApiEnum;
+import com.ijpay.wxpay.model.v3.*;
+import io.v.nutz.zhgh.memberCost.payment.wxpay.bean.WxPayV3Bean;
+import io.v.nutz.zhgh.memberCost.payment.wxpay.service.WxPayCommonService;
+import io.v.nutz.zhgh.memberCost.payment.wxpay.vo.WxPayNeedParamVo;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.ioc.loader.annotation.IocBean;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayInputStream;
+import java.io.FileWriter;
+import java.nio.charset.StandardCharsets;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @version 1.0
+ * @Author zzr
+ * @name：WxPayCommonServiceImpl
+ * @Date 2025/3/6 11:41
+ * @注释
+ */
+@Slf4j
+@IocBean
+public class WxPayCommonServiceImpl implements WxPayCommonService {
+
+    // 判断下单接口成功返回码
+    private final static int OK = 200;
+
+    // 微信V3必要的支付参数，后期优化
+    private final static WxPayV3Bean WX_PAY_V3_BEAN = new WxPayV3Bean(
+            "ww3eda050a1b5ad96e",
+            "src/main/java/io/v/nutz/zhgh/memberCost/wxpay/pem/apiclient_key.pem",
+            "src/main/java/io/v/nutz/zhgh/memberCost/wxpay/pem/apiclient_key.pem",
+            "src/main/java/io/v/nutz/zhgh/memberCost/wxpay/pem/apiclient_cert.pem",
+            "src/main/java/io/v/nutz/zhgh/memberCost/wxpay/pem/apiclient_cert.pem",
+            "src/main/java/io/v/nutz/zhgh/memberCost/wxpay/pem/wechatpay.pem",
+            "1666930980",
+            "",
+            "4ebd020883285d698c44ec50939c0967",
+            "https://schoolhd.top/platform",
+            "");
+
+    // 自定义参数，内容是统一的，但会被多次调用，直接声明
+    String serialNo;
+    String platSerialNo;
+    String payNotifyUrl = WX_PAY_V3_BEAN.getDomain().concat("/wxPay/notifyMessage");
+
+    /**
+     * 微信扫描二维码支付
+     * @param paramVo 需要传递的信息，请自定义付款金额Amount 和  付款描述Description，其他关键信息请勿修改
+     *                注意Amount的总价total是int类型，会自动乘以0.01，例如传递100元，会自动转换为1元
+     * @return
+     */
+    @Override
+    public String nativePay(WxPayNeedParamVo paramVo) {
+        try {
+            // 商户订单号，存储当前用户的订单
+            String outTradeNo = PayKit.generateStr();
+
+            String timeExpire = getNowTimeExpire();
+            UnifiedOrderModel unifiedOrderModel = new UnifiedOrderModel()
+                    .setAppid(WX_PAY_V3_BEAN.getAppId())
+                    .setMchid(WX_PAY_V3_BEAN.getMchId())
+                    // 描述信息
+                    .setDescription(paramVo.getDescription())
+                    .setOut_trade_no(outTradeNo)
+                    .setTime_expire(timeExpire)
+                    .setAttach(paramVo.getAttach())
+                    .setNotify_url(payNotifyUrl)
+                    // 订单金额
+                    .setAmount(paramVo.getAmount());
+
+            log.info("二维码支付统一下单参数 {}", JSONUtil.toJsonStr(unifiedOrderModel));
+            IJPayHttpResponse response = WxPayApi.v3(
+                    RequestMethodEnum.POST,
+                    WxDomainEnum.CHINA.toString(),
+                    BasePayApiEnum.NATIVE_PAY.toString(),
+                    WX_PAY_V3_BEAN.getMchId(),
+                    getSerialNumber(),
+                    null,
+                    WX_PAY_V3_BEAN.getKeyPath(),
+                    JSONUtil.toJsonStr(unifiedOrderModel),
+                    AuthTypeEnum.RSA.getCode()
+            );
+            log.info("统一下单响应 {}", response);
+            // 根据证书序列号查询对应的证书来验证签名结果
+            boolean verifySignature = WxPayKit.verifySignature(response, WX_PAY_V3_BEAN.getPlatformCertPath());
+            log.info("verifySignature: {}", verifySignature);
+            // 下单返回数据
+            String result = response.getBody();
+
+            if (result != null) {
+                // 向数据库插入订单记录
+            }
+
+            return result;
+        } catch (Exception e) {
+            log.error("系统异常", e);
+            return e.getMessage();
+        }
+    }
+
+
+    @Override
+    public String jsApiPay(WxPayNeedParamVo paramVo) {
+        try {
+            // 商户订单号，存储当前用户的订单
+            String outTradeNo = PayKit.generateStr();
+            // 订单关闭时间
+            String timeExpire = getNowTimeExpire();
+            UnifiedOrderModel unifiedOrderModel = new UnifiedOrderModel()
+                    .setAppid(WX_PAY_V3_BEAN.getAppId())
+                    .setMchid(WX_PAY_V3_BEAN.getMchId())
+                    .setDescription(paramVo.getDescription())
+                    .setOut_trade_no(outTradeNo)
+                    .setTime_expire(timeExpire)
+                    .setAttach(paramVo.getAttach())
+                    .setNotify_url(payNotifyUrl)
+                    .setAmount(paramVo.getAmount())
+                    .setPayer(paramVo.getPayer());
+
+            log.info("统一下单参数 {}", JSONUtil.toJsonStr(unifiedOrderModel));
+            IJPayHttpResponse response = WxPayApi.v3(
+                    RequestMethodEnum.POST,
+                    WxDomainEnum.CHINA.toString(),
+                    BasePayApiEnum.JS_API_PAY.toString(),
+                    WX_PAY_V3_BEAN.getMchId(),
+                    getSerialNumber(),
+                    null,
+                    WX_PAY_V3_BEAN.getKeyPath(),
+                    JSONUtil.toJsonStr(unifiedOrderModel)
+            );
+            log.info("统一下单响应 {}", response);
+            // 根据证书序列号查询对应的证书来验证签名结果
+            boolean verifySignature = WxPayKit.verifySignature(response, WX_PAY_V3_BEAN.getPlatformCertPath());
+            log.info("verifySignature: {}", verifySignature);
+            if (response.getStatus() == OK && verifySignature) {
+                String body = response.getBody();
+                JSONObject jsonObject = JSONUtil.parseObj(body);
+                String prepayId = jsonObject.getStr("prepay_id");
+                Map<String, String> map = WxPayKit.jsApiCreateSign(WX_PAY_V3_BEAN.getAppId(), prepayId, WX_PAY_V3_BEAN.getKeyPath());
+                log.info("唤起支付参数:{}", map);
+                // 唤起支付成功，向数据库插入订单参数
+
+                return JSONUtil.toJsonStr(map);
+            }
+            return JSONUtil.toJsonStr(response);
+        } catch (Exception e) {
+            log.error("系统异常", e);
+            return e.getMessage();
+        }
+    }
+
+
+    @Override
+    public String wapPay(WxPayNeedParamVo paramVo) {
+        try {
+            // 商户订单号，存储当前用户的订单
+            String outTradeNo = PayKit.generateStr();
+            // 订单关闭时间
+            String timeExpire = getNowTimeExpire();
+            UnifiedOrderModel unifiedOrderModel = new UnifiedOrderModel()
+                    .setAppid(WX_PAY_V3_BEAN.getAppId())
+                    .setMchid(WX_PAY_V3_BEAN.getMchId())
+                    .setDescription(paramVo.getDescription())
+                    .setOut_trade_no(outTradeNo)
+                    .setTime_expire(timeExpire)
+                    .setAttach(paramVo.getAttach())
+                    .setNotify_url(payNotifyUrl)
+                    .setAmount(paramVo.getAmount())
+                    .setScene_info(
+                            new SceneInfo()
+                                    .setPayer_client_ip("").
+                                    setH5_info(new H5Info()
+                                            .setType("Wap")));
+
+            log.info("统一下单参数 {}", JSONUtil.toJsonStr(unifiedOrderModel));
+            IJPayHttpResponse response = WxPayApi.v3(
+                    RequestMethodEnum.POST,
+                    WxDomainEnum.CHINA.toString(),
+                    BasePayApiEnum.H5_PAY.toString(),
+                    WX_PAY_V3_BEAN.getMchId(),
+                    getSerialNumber(),
+                    null,
+                    WX_PAY_V3_BEAN.getKeyPath(),
+                    JSONUtil.toJsonStr(unifiedOrderModel)
+            );
+            log.info("统一下单响应 {}", response);
+            // 根据证书序列号查询对应的证书来验证签名结果
+            boolean verifySignature = WxPayKit.verifySignature(response, WX_PAY_V3_BEAN.getPlatformCertPath());
+            log.info("verifySignature: {}", verifySignature);
+            if (response.getStatus() == OK && verifySignature) {
+                String body = response.getBody();
+                return JSONUtil.toJsonStr(body);
+            }
+            return JSONUtil.toJsonStr(response);
+        } catch (Exception e) {
+            log.error("系统异常", e);
+            return e.getMessage();
+        }
+    }
+
+
+    /**
+     * 支付回调
+     * @param request
+     * @param response
+     */
+    @Override
+    public void payNotify(HttpServletRequest request, HttpServletResponse response) {
+        Map<String, String> map = new HashMap<>(12);
+        try {
+            String timestamp = request.getHeader("Wechatpay-Timestamp");
+            String nonce = request.getHeader("Wechatpay-Nonce");
+            String serialNo = request.getHeader("Wechatpay-Serial");
+            String signature = request.getHeader("Wechatpay-Signature");
+
+            log.info("timestamp:{} nonce:{} serialNo:{} signature:{}", timestamp, nonce, serialNo, signature);
+            String result = HttpKit.readData(request);
+            log.info("支付通知密文 {}", result);
+//            String plainText = null;
+            // 需要通过证书序列号查找对应的证书，verifyNotify 中有验证证书的序列号
+			String plainText = WxPayKit.verifyNotify(serialNo, result, signature, nonce, timestamp,
+                    WX_PAY_V3_BEAN.getApiKey3(), WX_PAY_V3_BEAN.getPlatformCertPath());
+            // 微信公钥验证签名并解密
+//            if (ObjectUtil.equals(serialNo, WX_PAY_V3_BEAN.getPublicKeyId())) {
+//                plainText = WxPayKit.verifyPublicKeyNotify(result, signature, nonce, timestamp,
+//                        WX_PAY_V3_BEAN.getApiKey3(), WX_PAY_V3_BEAN.getPlatformCertPath());
+//            }
+            log.info("支付通知明文 {}", plainText);
+
+            if (StrUtil.isNotEmpty(plainText)) {
+                response.setStatus(200);
+                map.put("code", "SUCCESS");
+                map.put("message", "SUCCESS");
+            } else {
+                response.setStatus(500);
+                map.put("code", "ERROR");
+                map.put("message", "签名错误");
+            }
+            response.setHeader("Content-type", ContentType.JSON.toString());
+            response.getOutputStream().write(JSONUtil.toJsonStr(map).getBytes(StandardCharsets.UTF_8));
+            response.flushBuffer();
+        } catch (Exception e) {
+            log.error("系统异常", e);
+        }
+    }
+
+
+    /**
+     * 退款
+     * @param transactionId 微信订单号
+     * @param outTradeNo 商户订单号
+     * @return
+     */
+    @Override
+    public String refund(String transactionId, String outTradeNo) {
+        try {
+            String outRefundNo = PayKit.generateStr();
+            log.info("商户退款单号: {}", outRefundNo);
+
+            List<RefundGoodsDetail> list = new ArrayList<>();
+            RefundGoodsDetail refundGoodsDetail = new RefundGoodsDetail()
+                    .setMerchant_goods_id("123")
+                    .setGoods_name("IJPay 测试")
+                    .setUnit_price(1)
+                    .setRefund_amount(1)
+                    .setRefund_quantity(1);
+            list.add(refundGoodsDetail);
+
+            RefundModel refundModel = new RefundModel()
+                    .setOut_refund_no(outRefundNo)
+                    .setReason("IJPay 测试退款")
+                    .setNotify_url(WX_PAY_V3_BEAN.getDomain().concat("/v3/refundNotify"))
+                    .setAmount(new RefundAmount().setRefund(1).setTotal(1).setCurrency("CNY"))
+                    .setGoods_detail(list);
+
+            if (StrUtil.isNotEmpty(transactionId)) {
+                refundModel.setTransaction_id(transactionId);
+            }
+            if (StrUtil.isNotEmpty(outTradeNo)) {
+                refundModel.setOut_trade_no(outTradeNo);
+            }
+            log.info("退款参数 {}", JSONUtil.toJsonStr(refundModel));
+            IJPayHttpResponse response = WxPayApi.v3(
+                    RequestMethodEnum.POST,
+                    WxDomainEnum.CHINA.toString(),
+                    BasePayApiEnum.REFUND.toString(),
+                    WX_PAY_V3_BEAN.getMchId(),
+                    getSerialNumber(),
+                    null,
+                    WX_PAY_V3_BEAN.getKeyPath(),
+                    JSONUtil.toJsonStr(refundModel)
+            );
+            // 根据证书序列号查询对应的证书来验证签名结果
+			boolean verifySignature = WxPayKit.verifySignature(response, WX_PAY_V3_BEAN.getPlatformCertPath());
+            // 微信支付公钥验证签名
+//            boolean verifySignature = WxPayKit.verifyPublicKeySignature(response, WX_PAY_V3_BEAN.getPlatformCertPath());
+            log.info("verifySignature: {}", verifySignature);
+            log.info("退款响应 {}", response);
+
+            if (verifySignature) {
+                return response.getBody();
+            }
+        } catch (Exception e) {
+            log.error("系统异常", e);
+            return e.getMessage();
+        }
+        return null;
+    }
+
+
+    /**
+     * 退款回调
+     * @param request
+     * @param response
+     */
+    @Override
+    public void refundNotify(HttpServletRequest request, HttpServletResponse response) {
+        Map<String, String> map = new HashMap<>(12);
+        try {
+            String timestamp = request.getHeader("Wechatpay-Timestamp");
+            String nonce = request.getHeader("Wechatpay-Nonce");
+            String serialNo = request.getHeader("Wechatpay-Serial");
+            String signature = request.getHeader("Wechatpay-Signature");
+
+            log.info("退款通知 timestamp:{} nonce:{} serialNo:{} signature:{}", timestamp, nonce, serialNo, signature);
+            String result = HttpKit.readData(request);
+            log.info("退款通知密文 {}", result);
+//            String plainText = null;
+            // 需要通过证书序列号查找对应的证书，verifyNotify 中有验证证书的序列号
+			String plainText = WxPayKit.verifyNotify(serialNo, result, signature, nonce, timestamp,
+                    WX_PAY_V3_BEAN.getApiKey3(), WX_PAY_V3_BEAN.getPlatformCertPath());
+            // 微信公钥验证签名并解密
+//            if (ObjectUtil.equals(serialNo, WX_PAY_V3_BEAN.getPublicKeyId())) {
+//                plainText = WxPayKit.verifyPublicKeyNotify(result, signature, nonce, timestamp,
+//                        WX_PAY_V3_BEAN.getApiKey3(), WX_PAY_V3_BEAN.getPlatformCertPath());
+//            }
+            log.info("退款通知明文 {}", plainText);
+
+            if (StrUtil.isNotEmpty(plainText)) {
+                response.setStatus(200);
+                map.put("code", "SUCCESS");
+                map.put("message", "SUCCESS");
+            } else {
+                response.setStatus(500);
+                map.put("code", "ERROR");
+                map.put("message", "签名错误");
+            }
+            response.setHeader("Content-type", ContentType.JSON.toString());
+            response.getOutputStream().write(JSONUtil.toJsonStr(map).getBytes(StandardCharsets.UTF_8));
+            response.flushBuffer();
+        } catch (Exception e) {
+            log.error("系统异常", e);
+        }
+    }
+
+
+    /**
+     * 公共方法，获取证书序列号
+     * @return
+     */
+    private String getSerialNumber() {
+        if (StrUtil.isEmpty(serialNo)) {
+            // 获取证书序列号
+            X509Certificate certificate = PayKit.getCertificate(WX_PAY_V3_BEAN.getCertPath());
+            if (null != certificate) {
+                serialNo = certificate.getSerialNumber().toString(16).toUpperCase();
+                // 提前两天检查证书是否有效
+                boolean isValid = PayKit.checkCertificateIsValid(certificate, WX_PAY_V3_BEAN.getMchId(), -2);
+                log.info("证书是否可用 {} 证书有效期为 {}", isValid, DateUtil.format(certificate.getNotAfter(), DatePattern.NORM_DATETIME_PATTERN));
+            }
+//            System.out.println("输出证书信息:\n" + certificate.toString());
+//            // 输出关键信息，截取部分并进行标记
+//            System.out.println("证书序列号:" + certificate.getSerialNumber().toString(16));
+//            System.out.println("版本号:" + certificate.getVersion());
+//            System.out.println("签发者：" + certificate.getIssuerDN());
+//            System.out.println("有效起始日期：" + certificate.getNotBefore());
+//            System.out.println("有效终止日期：" + certificate.getNotAfter());
+//            System.out.println("主体名：" + certificate.getSubjectDN());
+//            System.out.println("签名算法：" + certificate.getSigAlgName());
+//            System.out.println("签名：" + certificate.getSignature().toString());
+        }
+        System.out.println("serialNo:" + serialNo);
+        return serialNo;
+    }
+
+
+    /**
+     * 公共方法，获取平台证书序列号
+     * @return
+     */
+    private String getPlatSerialNumber() {
+        if (StrUtil.isEmpty(platSerialNo)) {
+            // 获取平台证书序列号
+            X509Certificate certificate = PayKit.getCertificate(FileUtil.getInputStream(WX_PAY_V3_BEAN.getPlatformCertPath()));
+            platSerialNo = certificate.getSerialNumber().toString(16).toUpperCase();
+        }
+        System.out.println("platSerialNo:" + platSerialNo);
+        return platSerialNo;
+    }
+
+
+    /**
+     * 公共方法，保存平台证书
+     * @param associatedData
+     * @param nonce
+     * @param cipherText
+     * @param algorithm
+     * @param certPath
+     * @return
+     */
+    private String savePlatformCert(String associatedData, String nonce, String cipherText, String algorithm, String certPath) {
+        try {
+            String key3 = WX_PAY_V3_BEAN.getApiKey3();
+            String publicKey;
+            if (StrUtil.equals(algorithm, AuthTypeEnum.SM2.getPlatformCertAlgorithm())) {
+                publicKey = PayKit.sm4DecryptToString(key3, cipherText, nonce, associatedData);
+            } else {
+                AesUtil aesUtil = new AesUtil(WX_PAY_V3_BEAN.getApiKey3().getBytes(StandardCharsets.UTF_8));
+                // 平台证书密文解密
+                // encrypt_certificate 中的  associated_data nonce  ciphertext
+                publicKey = aesUtil.decryptToString(
+                        associatedData.getBytes(StandardCharsets.UTF_8),
+                        nonce.getBytes(StandardCharsets.UTF_8),
+                        cipherText
+                );
+            }
+            if (StrUtil.isNotEmpty(publicKey)) {
+                // 保存证书
+                FileWriter writer = new FileWriter(certPath);
+                writer.write(publicKey);
+                // 获取平台证书序列号
+                X509Certificate certificate = PayKit.getCertificate(new ByteArrayInputStream(publicKey.getBytes()));
+                return certificate.getSerialNumber().toString(16).toUpperCase();
+            }
+            return "";
+        } catch (Exception e) {
+            log.error("保存平台证书异常", e);
+            return e.getMessage();
+        }
+    }
+
+
+    /**
+     * 公共方法，构建订单关闭时间，默认3分钟
+     * @return
+     */
+    private String getNowTimeExpire() {
+        long currentTimeMillis = System.currentTimeMillis() + 1000 * 60 * 3;
+        // 将时间戳转换为 DateTime 对象
+        DateTime dateTime = DateUtil.date(currentTimeMillis);
+        return DateUtil.format(dateTime, "yyyy-MM-dd'T'HH:mm:ssXXX");
+    }
+}
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/vo/WxPayNeedParamVo.java b/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/vo/WxPayNeedParamVo.java
new file mode 100644
index 0000000..58977a1
--- /dev/null
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/vo/WxPayNeedParamVo.java
@@ -0,0 +1,39 @@
+package io.v.nutz.zhgh.memberCost.payment.wxpay.vo;
+
+import com.ijpay.wxpay.model.v3.Amount;
+import com.ijpay.wxpay.model.v3.Payer;
+import lombok.Data;
+
+/**
+ * @version 1.0
+ * @Author zzr
+ * @name：WxPayNeedParamVo
+ * @Date 2025/3/7 18:43
+ * @注释
+ */
+@Data
+public class WxPayNeedParamVo {
+
+    /**
+     * 订单描述，会显示在支付界面的标题，最大长度127，必填
+     */
+    private String description;
+
+    /**
+     * 附加数据，订单的详细描述信息，不必填
+     */
+    private String attach;
+
+    /**
+     * 金额对象,对象中的 total 是金额，必填；
+     * 其余参数可不传递也可不填
+     */
+    private Amount amount;
+
+    /**
+     * 支付者对象，JsApi支付是必填，其他支付方式忽略；
+     * openid 微信绑定的用户openid和小程序的openid相同，必填；
+     * 其余参数可忽略
+     */
+    private Payer payer;
+}
diff --git a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareProjectMangeController.java b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareProjectMangeController.java
index e16ec82..f28dd4e 100644
--- a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareProjectMangeController.java
+++ b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareProjectMangeController.java
@@ -1,5 +1,7 @@
 package io.v.nutz.zhgh.welfare.controller;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import io.v.nutz.base.annontation.ViReturn;
 import io.v.nutz.base.dao.CndPlus;
@@ -32,7 +34,6 @@ import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.Lang;
 import org.nutz.lang.Strings;
 import org.nutz.lang.random.R;
-import org.nutz.lang.util.NutMap;
 import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
 import org.nutz.mvc.annotation.Param;
@@ -94,7 +95,7 @@ public class WelfareProjectMangeController {
 
         Sql sql = Sqls.create("SELECT project.*,IF((SELECT count(1) FROM welfare_list WHERE projectId = project.id)>0,TRUE,FALSE) created FROM `welfare_project` project $condition");
         CndPlus cnd = CndPlus.create();
-        pageForm.defaultSortDesc("createdAt");
+        pageForm.defaultSortDesc("opAt");
 
         cnd.andEx("year", "=", year);
         if (Strings.isNotBlank(name)) {
@@ -117,13 +118,14 @@ public class WelfareProjectMangeController {
 
 
         Trans.exec(() -> {
+            project.setYear(DateUtil.thisYear());
+            project.setIsDisabled(false);
             if (project.getConditionStructure() != null) {
                 project.setConditionStructureId(matchConditionStructureService.save(project.getConditionStructure()).getId());
             }
             if (StrUtil.isBlank(project.getId())) {
                 WelfareProject insertProject = dao.insertWith(project, "welfareProjectSubjects");
 
-
                 if (Lang.isNotEmpty(insertProject.getWelfareProjectSubjects())) {
                     insertProject.getWelfareProjectSubjects().forEach(v -> {
                         dao.insertLinks(v, "options");
@@ -235,10 +237,8 @@ public class WelfareProjectMangeController {
                 dao.update(project);
 
             }
-//            if (project.getIsPushHome() != 0) {
-//                mobileHomeService.handle(project, "welfare", "/mobile/welfare/list/receive?projectId=" + project.getId(), project.getIsPushHome());
-//            }
             Sys_home_activity sysHomeActivity = project.covertToSysHomeActivity();
+            sysHomeActivity.setEnable(true);
             dao.insertOrUpdate(sysHomeActivity);
         });
         return null;
@@ -256,7 +256,9 @@ public class WelfareProjectMangeController {
             projectService.dao().delete(MatchConditionStructure.class, project.getConditionStructureId());
         }
         projectService.dao().clear(WelfareProjectSubject.class, Cnd.where("projectId", "=", id));
-        projectService.dao().clear(WelfareProjectSubjectOption.class, Cnd.where("subjectId", "=", welfareProjectSubject.getId()));
+        if (ObjectUtil.isNotEmpty(welfareProjectSubject)) {
+            projectService.dao().clear(WelfareProjectSubjectOption.class, Cnd.where("subjectId", "=", welfareProjectSubject.getId()));
+        }
         projectService.dao().clear(WelfareUserSelection.class, Cnd.where("welfareId", "=", id));
         projectService.delete(id);
         mobileHomeService.delete(id);
@@ -292,7 +294,7 @@ public class WelfareProjectMangeController {
     public Object sendMsgToNotWelfareUsers(String projectId, String sendMsgValue) {
         Sql sql = Sqls.create("""
                 SELECT
-                	u.loginname as userId
+                	u.loginname
                 FROM
                 	welfare_list wl
                 	left join sys_user u on u.id = wl.userId
@@ -308,8 +310,13 @@ public class WelfareProjectMangeController {
                 	)
                 """);
         sql.setParam("projectId", projectId);
-        List<NutMap> userList = listService.listMap(sql);
-//        msgApi.sendMsg(sendMsgValue, "福利选择链接", "", "https://zhgh.jiangnan.edu.cn/mobile/welfare/list/receive?projectId=4fa233704ddb41bc8e34e966efeda0a4", "4", userList);
+//        List<NutMap> userList = listService.listMap(sql);
+//        Set<String> loginNameList = userList.stream().map(user -> user.getString("loginname")).collect(Collectors.toSet());
+//        String loginNames = loginNameList.stream().collect(Collectors.joining(","));
+//        WelfareProject project = dao.fetch(WelfareProject.class, projectId);
+//        String link = Globals.AppDomain + "/mobile/welfare/list/receive?projectId=%s".formatted(projectId);
+//        String imageUrl = Globals.AppDomain + "/file_server/fileStreamPreview?id=" + project.getCover();
+//        msgApi.sendMsg(List.of("DingTalk"), loginNames, 2, "职工福利", sendMsgValue, "", link);
         return null;
     }
 
@@ -321,9 +328,11 @@ public class WelfareProjectMangeController {
      */
     @At
     @ViReturn
+    @Aop(TransAop.READ_COMMITTED)
     @RequiresPermissions("welfare.list.mange")
     public Object projectStatusChange(String id, boolean val) {
         dao.update(WelfareProject.class, Chain.make("isDisabled", !val), Cnd.where("id", "=", id));
+        dao.update(Sys_home_activity.class, Chain.make("enable", val), Cnd.where("id", "=", id));
         return null;
     }
 
diff --git a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareUserChooseController.java b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareUserChooseController.java
index be6e065..eedf43e 100644
--- a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareUserChooseController.java
+++ b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareUserChooseController.java
@@ -55,27 +55,29 @@ public class WelfareUserChooseController {
     @ViReturn
     @RequiresPermissions("welfare.user.choose")
     public Object pageData(PageForm pageForm, Integer year) {
+
         Sql sql = Sqls.create("""
                     SELECT
-                         wp.*,
-                         CASE
-                             WHEN wus.selectUserId IS NOT NULL THEN 1
-                             ELSE 0
-                         END AS isChoose,
-                         wus.selectTime,
-                         GROUP_CONCAT(DISTINCT wuso.optionName ,'（',wus.selectNum,'份）') AS gist_list,
-                         wus.receiveAddress
+                        wp.*,
+                        CASE
+                            WHEN wus.selectUserId IS NOT NULL THEN 1
+                            ELSE 0
+                        END AS isChoose,
+                        wus.selectTime,
+                        GROUP_CONCAT(DISTINCT wuso.optionName ,'（',wus.selectNum,'份）') AS gist_list,
+                        wus.receiveAddress
                     FROM
-                         welfare_project wp
-                         LEFT JOIN welfare_project_user_selection wus ON wp.id = wus.welfareId AND wus.selectUserId = @selectUserId
-                         INNER JOIN welfare_list wl ON wp.id = wl.projectId AND wl.userId = @selectUserId
-                         LEFT JOIN welfare_project_subject_option wuso ON wus.selectOptionId = wuso.id
+                        welfare_project wp
+                        LEFT JOIN welfare_project_user_selection wus ON wp.id = wus.welfareId AND wus.selectUserId = @selectUserId
+                        LEFT JOIN welfare_list wl ON wp.id = wl.projectId AND wl.userId = @selectUserId
+                        LEFT JOIN welfare_project_subject_option wuso ON wus.selectOptionId = wuso.id
                    $condition
                 """);
         sql.setParam("selectUserId", ShiroUtil.getUserId());
 
         Cnd cnd = Cnd.NEW();
         cnd.and("wp.provideMode", "in", "2,3");
+        cnd.and("wl.userId", "=", ShiroUtil.getUserId());
         cnd.andEX("YEAR(wp.choiceTimeStart)", "in", year);
         cnd.and("wp.isDisabled", "=", 0);
         cnd.groupBy("wp.id");
diff --git a/src/main/java/io/v/nutz/zhgh/welfare/model/WelfareProject.java b/src/main/java/io/v/nutz/zhgh/welfare/model/WelfareProject.java
index ab3e5c8..d012ecc 100644
--- a/src/main/java/io/v/nutz/zhgh/welfare/model/WelfareProject.java
+++ b/src/main/java/io/v/nutz/zhgh/welfare/model/WelfareProject.java
@@ -1,6 +1,6 @@
 package io.v.nutz.zhgh.welfare.model;
 
-import io.v.nutz.base.model.ViBaseModel;
+import cn.wizzer.framework.base.model.BaseModel;
 import io.v.nutz.sys.models.Sys_home_activity;
 import io.v.nutz.sys.services.SysHomeConvert;
 import io.v.nutz.zhgh.data.model.MatchConditionStructure;
@@ -29,7 +29,7 @@ import java.util.List;
 @Accessors(chain = true)
 @Table("welfare_project")
 @Comment("福利项目")
-public class WelfareProject extends ViBaseModel implements Serializable, SysHomeConvert {
+public class WelfareProject extends BaseModel implements Serializable, SysHomeConvert {
 
     private static final long serialVersionUID = 1L;
 
@@ -43,9 +43,6 @@ public class WelfareProject extends ViBaseModel implements Serializable, SysHome
     @Column
     @Comment("年度")
     @ColDefine(type = ColType.INT, width = 4)
-    @PrevInsert(
-            els = {@EL("$me.nowYear()")}
-    )
     private Integer year;
 
     @Column
diff --git a/src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java b/src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java
index d6e3490..c1a8fa7 100644
--- a/src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java
+++ b/src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java
@@ -1,10 +1,10 @@
 package io.v.nutz.zhgh.welfare.service.impl;
 
-import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
+import cn.afterturn.easypoi.excel.export.ExcelExportService;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
@@ -21,6 +21,7 @@ import io.v.nutz.zhgh.welfare.model.WelfareProject;
 import io.v.nutz.zhgh.welfare.model.template.WelfareExportEntityTc;
 import io.v.nutz.zhgh.welfare.service.WelfareSingleService;
 import lombok.Data;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
@@ -46,9 +47,7 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -671,23 +670,25 @@ public class WelfareSingleServiceImpl extends ViServiceImpl<WelfareProject> impl
                 SELECT
                 	u.loginname,
                 	u.username,
-                	vwl.welfareUnitId as unionid,
-                	gh.unionname as unionname,
+                	IF(staffUnion.id IS NOT NULL, staffUnion.id, vwl.welfareUnitId) AS unionid,
+                	IF(staffUnion.id IS NOT NULL, staffUnion.unionname, gh.unionname) AS unionname,
                 	vwl.welfareSecondLevelUnitId as unitid,
                 	dw.`name` as unitname,
                 	wpus.userSign,
                 	wpus.selectOptionId,
-                	wpus.selectNum\s
+                	wpus.selectNum
                 FROM
                 	welfare_list vwl
-                	LEFT join sys_user u on u.id = vwl.userId
-                	left join sys_union gh on gh.id = vwl.welfareUnitId
-                	left join sys_unit dw on dw.id = vwl.welfareSecondLevelUnitId
-                	LEFT JOIN welfare_project_user_selection wpus ON wpus.selectUserId = vwl.userId\s
-                	AND wpus.welfareId = @projectId\s
+                	LEFT JOIN special_staff staff ON staff.userId = vwl.userId
+                	LEFT JOIN sys_union staffUnion ON staff.unionRelationUnionId = staffUnion.id
+                	LEFT JOIN sys_user u ON u.id = vwl.userId
+                	LEFT JOIN sys_union gh ON gh.id = vwl.welfareUnitId
+                	LEFT JOIN sys_unit dw ON dw.id = vwl.welfareSecondLevelUnitId
+                	LEFT JOIN welfare_project_user_selection wpus ON wpus.selectUserId = vwl.userId
+                	AND wpus.welfareId = @projectId
                 WHERE
                 	projectId = @projectId
-                	AND vwl.welfareUnitId = @unionId
+                	AND (vwl.welfareUnitId = @unionId OR staffUnion.id = @unionId)
                 order by vwl.welfareUnitId,vwl.welfareSecondLevelUnitId
                 """);
 
@@ -712,18 +713,21 @@ public class WelfareSingleServiceImpl extends ViServiceImpl<WelfareProject> impl
         });
 
         List<ExcelExportEntity> exportEntities = new ArrayList<>();
-        exportEntities.add(new ExcelExportEntity("序号", "no", 20));
-        exportEntities.add(new ExcelExportEntity("姓名", "username", 20));
-        exportEntities.add(new ExcelExportEntity("工号", "loginname", 20));
-        exportEntities.add(new ExcelExportEntity("所在基层工会", "unionname", 20));
-        exportEntities.add(new ExcelExportEntity("所在单位", "unitname", 20));
+        exportEntities.add(new ExcelExportEntity("序号", "no", 10));
+        exportEntities.add(new ExcelExportEntity("姓名", "username", 10));
+        exportEntities.add(new ExcelExportEntity("工号", "loginname", 15));
+//        exportEntities.add(new ExcelExportEntity("所在分工会", "unionname", 20));
+        ExcelExportEntity excelExportEntity1 = new ExcelExportEntity("所在单位", "unitname", 20);
+        excelExportEntity1.setWrap(true);
+        exportEntities.add(excelExportEntity1);
 
         for (NutMap option : options) {
-            exportEntities.add(new ExcelExportEntity(option.getString("optionName"), option.getString("id"), 20));
+            exportEntities.add(new ExcelExportEntity(option.getString("optionName"), option.getString("id"), 10));
         }
         ExcelExportEntity excelExportEntity = new ExcelExportEntity();
         excelExportEntity.setName("签字");
         excelExportEntity.setKey("qzBytes");
+        excelExportEntity.setHeight(12);
         excelExportEntity.setWidth(20);
         excelExportEntity.setType(2);
         excelExportEntity.setExportImageType(2);
@@ -764,9 +768,16 @@ public class WelfareSingleServiceImpl extends ViServiceImpl<WelfareProject> impl
             totalMap.put(option.getString("id"), selectNum);
         }
         dataList.add(totalMap);
-        ExportParams exportParams = new ExportParams();
+        /*ExportParams exportParams = new ExportParams();
         exportParams.setType(ExcelType.XSSF);
         Workbook workbook = ExcelExportUtil.exportExcel(exportParams, exportEntities, dataList);
+        workbook.write(outputStream);*/
+
+        Workbook workbook = new HSSFWorkbook();
+        ExportParams exportParams = new ExportParams();
+        exportParams.setType(ExcelType.HSSF);
+        ExcelExportService service = new ExcelExportService();
+        service.createSheetForMap(workbook, exportParams, exportEntities, dataList);
         workbook.write(outputStream);
 
 //        List<NutMap> result = new ArrayList<>();
@@ -1023,7 +1034,6 @@ public class WelfareSingleServiceImpl extends ViServiceImpl<WelfareProject> impl
             sheet.setColumnWidth(0, 1000 * 2);
             sheet.setColumnWidth(1, 1500 * 2);
             sheet.setColumnWidth(2, 3000 * 2);
-            sheet.setColumnWidth(2, 3000 * 2);
             sheet.setColumnWidth(3, 2000 * 2);
             sheet.setColumnWidth(4, 2000 * 2);
             sheet.setColumnWidth(5, 1500 * 2);
@@ -1180,18 +1190,43 @@ public class WelfareSingleServiceImpl extends ViServiceImpl<WelfareProject> impl
                 } else {
                     v.setQzBytes(null);
                 }
-
             }
+
+            Map<String, String> addressMap = new HashMap<>();
+            String receiveAddress = v.getReceiveAddress();
+            if (StrUtil.isNotBlank(receiveAddress)) {
+                List<String> addressList = Arrays.stream(receiveAddress.split("[,，]")).collect(Collectors.toList());
+                for (String pair : addressList) {
+                    // 2. 根据冒号分割键和值
+                    String[] keyValue = pair.split("[:：]", 2);
+                    if (keyValue.length == 2) {
+                        String key = keyValue[0].trim();
+                        String value = keyValue[1].trim();
+                        addressMap.put(key, value);
+                    }
+                }
+//                v.setRecipient(addressMap.get("收件人"));
+//                v.setPhone(addressMap.get("联系方式"));
+//                v.setAddress(addressMap.get("收货地址"));
+            }
+
         });
         ExportParams exportParams = new ExportParams();
-        exportParams.setType(ExcelType.XSSF);
+        exportParams.setType(ExcelType.HSSF);
         exportParams.setSheetName(project.getName());
         try {
-            Workbook workbook = ExcelExportUtil.exportExcel(exportParams, WelfareExportEntityTc.class, welfareExportEntityTcList);
-            ViTool.excelResponse(response, (project.getName() + (flag ? "已选名单" : "未选名单")) + ".xlsx");
+            ViTool.excelResponse(response, (project.getName() + (flag ? "已选名单" : "未选名单")) + ".xls");
+            Workbook workbook = new HSSFWorkbook();
+            ExcelExportService service = new ExcelExportService();
+            service.createSheet(workbook, exportParams, WelfareExportEntityTc.class, welfareExportEntityTcList);
             ServletOutputStream outputStream = response.getOutputStream();
             workbook.write(outputStream);
-            outputStream.close();
+
+
+//            Workbook workbook = ExcelExportUtil.exportExcel(exportParams, WelfareExportEntityTc.class, welfareExportEntityTcList);
+//            ServletOutputStream outputStream = response.getOutputStream();
+//            workbook.write(outputStream);
+//            outputStream.close();
         } catch (IOException e) {
             e.printStackTrace();
         }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index c530690..551a601 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -47,7 +47,7 @@ jdbc.defaultAutoCommit=true
 xsssql.ignore.urls=/platform/cms/content/article/addDo,/platform/sys/app/conf/addDo,/platform/sys/app/conf/editDo,\
   /platform/member/change/mange/userPageData,/platform/welfare/member/mange/userPageData,/platform/sys/task/cronExp,\
   /platform/sys/task/editDo,/platform/sys/task/addDo,/platform/fellowship/manage/activity/doHandle,/platform/sys/menu/editMenuDo,\
-  /platform/trainSingUp/manage/activity/doHandle
+  /platform/trainSingUp/manage/activity/doHandle,/platform/activity/school/info/mange/doAdd,/platform/activity/school/info/mange/doEdit
 #环境 dev/prod
 v.environment=dev
 v.loginUrl=/sso/login
@@ -78,7 +78,7 @@ shiro.url.login=/platform
 shiro.url.logout_redirect=/platform
 shiro.url.unauth=/platform
 #开发时设置本地路径,便于调试
-beetl.RESOURCE.rootLocal=G:/zhgh/zhgh_hrbnu/src/main/resources/views/
+beetl.RESOURCE.rootLocal=G:/zhgh/ /src/main/resources/views/
 beetl.RESOURCE.root=views/
 beetl.DELIMITER_STATEMENT_START=<!--#
 beetl.DELIMITER_STATEMENT_END=#-->
@@ -143,5 +143,15 @@ logback.exts.loglevel.enabled=true
 #心跳间隔(单位:秒)
 logback.exts.loglevel.heartbeat=15
 
+wxpay.appId=\u5E94\u7528\u7F16\u53F7
+wxpay.keyPath=key.pem
+wxpay.certPath=cert.pem
+wxpay.certP12Path=cert.p12
+wxpay.platformCertPath=wx_cert.pem
+wxpay.mchId=\u5FAE\u4FE1\u5546\u6237\u53F7
+wxpay.apiKey3=Api-v3 \u5BC6\u94A5
+wxpay.apiKey=Api \u5BC6\u94A5
+wxpay.domain=https://ijpay.javen.com
+
 
 
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 8128e03..86e2312 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -32,9 +32,9 @@
     <logger name="org.quartz" level="INFO"/>
     <logger name="org.nutz" level="DEBUG"/>
 
-    <root level="DEBUG">
+    <root level="INFO">
         <appender-ref ref="STDOUT" />
         <appender-ref ref="ASYNC" />
     </root>
 
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/src/main/resources/static/components/sign/sign.vue b/src/main/resources/static/components/sign/sign.vue
index 0e15416..25aa749 100644
--- a/src/main/resources/static/components/sign/sign.vue
+++ b/src/main/resources/static/components/sign/sign.vue
@@ -84,8 +84,17 @@ module.exports = {
             clearInterval(signatureInterval)
             const ts = new Date().getTime() + (Math.floor(Math.random() * (1000 - 1 + 1)) + 1).toString()
             console.log(ts)
-            // this.postAddress = location.protocol + '//' + location.host + '/signature?prefix=' + this.prefix + '&id=' + ts + "&is_value_base64=" + this.is_value_base64
-            this.postAddress = "https://zhgh.hrbnu.edu.cn/signature?prefix=" + this.prefix + "&id=" + ts + "&is_value_base64=" + this.is_value_base64
+            this.postAddress =
+                location.protocol +
+                "//" +
+                location.host +
+                "/signature?prefix=" +
+                this.prefix +
+                "&id=" +
+                ts +
+                "&is_value_base64=" +
+                this.is_value_base64
+            // this.postAddress = "https://zhgh.hrbnu.edu.cn/signature?prefix=" + this.prefix + "&id=" + ts + "&is_value_base64=" + this.is_value_base64
 
             this.showQrCode = true
 
diff --git a/src/main/resources/views/layouts/platform.html b/src/main/resources/views/layouts/platform.html
index 03123ce..95ec4c3 100644
--- a/src/main/resources/views/layouts/platform.html
+++ b/src/main/resources/views/layouts/platform.html
@@ -101,7 +101,6 @@
         <script src="${base!}/assets/platform/js/offscreen.js"></script>
         <!--    <script src="https://cdn.jsdelivr.net/npm/vue-echarts@4.0.2"></script>-->
         <script src="${base!}/assets/platform/plugins/vue-charts/echartTheme.js"></script>
-        <script src="${base!}/assets/platform/js/chengSh.js"></script>
 
         <!--拖拽js-->
         <script src="${base!}/assets/platform/js/directive/v-sticky.js"></script>
@@ -109,6 +108,7 @@
         <script src="${base!}/assets/platform/js/jr-qrcode.js"></script>
 
         <!--字典混入-->
+        <script src="${base!}/assets/platform/js/chengSh.js"></script>
         <script src="${base!}/components/plugins/sysDict/DictData.js"></script>
         <script src="${base!}/assets/platform/js/util/commonUtil.js"></script>
 
diff --git a/src/main/resources/views/mobile/memberCost/query/index.html b/src/main/resources/views/mobile/memberCost/query/index.html
new file mode 100644
index 0000000..6f61605
--- /dev/null
+++ b/src/main/resources/views/mobile/memberCost/query/index.html
@@ -0,0 +1,16 @@
+<!--#
+layout("/mobile/platform.html"){
+#-->
+<div id="app" v-cloak></div>
+<script>
+    new Vue({
+        el: "#app",
+        mixins: [mobileMixins],
+        data() {
+            return {}
+        }
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/mobile/welfare/list/receive.html b/src/main/resources/views/mobile/welfare/list/receive.html
index 63d0f47..f871108 100644
--- a/src/main/resources/views/mobile/welfare/list/receive.html
+++ b/src/main/resources/views/mobile/welfare/list/receive.html
@@ -16,11 +16,13 @@ layout("/mobile/platform.html"){
         border-bottom: 1px dashed lightgrey;
     }
 
-    .selection .van-checkbox-group .van-cell, .selection .van-radio-group .van-cell {
+    .selection .van-checkbox-group .van-cell,
+    .selection .van-radio-group .van-cell {
         flex-direction: row-reverse;
     }
 
-    .selection .van-checkbox-group .van-cell .van-cell__title, .selection .van-radio-group .van-cell .van-cell__title {
+    .selection .van-checkbox-group .van-cell .van-cell__title,
+    .selection .van-radio-group .van-cell .van-cell__title {
         padding-left: 20px;
     }
 
@@ -41,7 +43,6 @@ layout("/mobile/platform.html"){
     }
 
     .van-collapse-item .van-collapse-item__title {
-
     }
 
     .selection .van-radio {
@@ -59,7 +60,9 @@ layout("/mobile/platform.html"){
         height: 80px;
     }
 
-    .welfare_img .van-image__error, .welfare_img .van-image__img, .welfare_img .van-image__loading {
+    .welfare_img .van-image__error,
+    .welfare_img .van-image__img,
+    .welfare_img .van-image__loading {
         border-radius: 10px;
         margin-left: -35px;
     }
@@ -115,7 +118,7 @@ layout("/mobile/platform.html"){
         padding-left: 20px;
         padding-right: 10px;
         position: relative;
-        height: 100px
+        height: 100px;
     }
 
     .optionDesc {
@@ -132,142 +135,143 @@ layout("/mobile/platform.html"){
         border: 1pt solid #000000 !important;
     }
 
+    .van-submit-bar__button {
+        width: 150px;
+    }
+
+    .custom-cell {
+        font-size: 18px;
+        font-weight: bold;
+    }
 </style>
 
 <div id="app" v-cloak>
     <van-sticky>
-        <van-nav-bar @click-left="history.go(-1)" left-arrow
-                     title="福利详情"></van-nav-bar>
+        <van-nav-bar @click-left="history.go(-1)" left-arrow title="福利详情"></van-nav-bar>
     </van-sticky>
 
     <template v-show="vLoading && !vLoading.value">
         <div>
-            <van-image :src="CREATE_PREVIEW_URL(projectInfo.cover)"
-                       fit="cover"
-                       style="width: 100%;height: 150px"></van-image>
+            <van-image :src="CREATE_PREVIEW_URL(projectInfo.cover)" fit="cover" style="width: 100%; height: 150px"></van-image>
         </div>
 
         <!--基本信息-->
         <van-cell-group class="van-cell-group--inset">
             <van-cell>
-                <div style="font-weight: bold;font-size: 15px;display: flex;align-items: center">
-                    福利信息
+                <div style="font-weight: bold; font-size: 15px; display: flex; align-items: center; justify-content: space-between">
+                    <div>
+                        <span>福利信息</span>
+                    </div>
+                    <div @click="clickUpOrDown=!clickUpOrDown">
+                        <span>{{clickUpOrDown ? '点击收起' : '点击展开'}}</span>
+                        <van-icon :name="clickUpOrDown?'arrow-up':'arrow-down'"></van-icon>
+                    </div>
                 </div>
             </van-cell>
-            <van-cell :border="false" :value="projectInfo.name" title="福利名称"></van-cell>
-            <van-cell :border="false" :value="projectInfo.festival" title="发放节日"></van-cell>
-            <van-cell :border="false" :value="projectInfo.gift" title="福利礼品"
-                      v-if="!projectInfo.flexible"></van-cell>
-            <!--<van-cell :border="false" :value="projectInfo.provideAddress"
-                      title="发放地点"></van-cell>-->
-            <van-cell :border="false" title="选择形式">
-                {{projectInfo.isCheckBox==='checkBox'?'多选':'单选'}}
-            </van-cell>
-            <van-cell :border="false" :value="projectInfo.multiSelectNum" title="最多选几个"
-                      v-if="projectInfo.isCheckBox==='checkBox'"></van-cell>
-            <van-cell :border="false" title="发放形式">
-                <template>
-                    {{welfareProvideMode.find(v=>v.code==projectInfo.provideMode) &&
-                    welfareProvideMode.find(v=>v.code==projectInfo.provideMode).description}}
-                </template>
-            </van-cell>
-            <van-cell :border="false" title="签收形式">
-                <template>
-                    {{welfareSignMode.find(v=>v.code==projectInfo.signMode) &&
-                    welfareSignMode.find(v=>v.code==projectInfo.signMode).description}}
-                </template>
-            </van-cell>
-            <van-cell :border="false" title="选择时间">
-                <template #label>
-                    {{projectInfo.choiceTimeStart + ' 至 ' + projectInfo.choiceTimeEnd}}
-                </template>
-            </van-cell>
+            <template v-if="clickUpOrDown">
+                <van-cell :border="false" :value="projectInfo.name" title="福利名称"></van-cell>
+                <van-cell :border="false" :value="projectInfo.festival" title="发放节日"></van-cell>
+                <van-cell :border="false" :value="projectInfo.gift" title="福利礼品" v-if="!projectInfo.flexible"></van-cell>
+                <!--<van-cell :border="false" :value="projectInfo.provideAddress"
+                          title="发放地点"></van-cell>-->
+                <van-cell :border="false" title="选择形式">{{projectInfo.isCheckBox==='checkBox'?'多选':'单选'}}</van-cell>
+                <van-cell
+                    :border="false"
+                    :value="projectInfo.multiSelectNum"
+                    title="最多选几个"
+                    v-if="projectInfo.isCheckBox==='checkBox'"
+                ></van-cell>
+                <van-cell :border="false" title="发放形式">
+                    <template>
+                        {{welfareProvideMode.find(v=>v.code==projectInfo.provideMode) &&
+                        welfareProvideMode.find(v=>v.code==projectInfo.provideMode).description}}
+                    </template>
+                </van-cell>
+                <van-cell :border="false" title="签收形式">
+                    <template>
+                        {{welfareSignMode.find(v=>v.code==projectInfo.signMode) && welfareSignMode.find(v=>v.code==projectInfo.signMode).description}}
+                    </template>
+                </van-cell>
+                <van-cell :border="false" title="选择时间">
+                    <template #label>{{projectInfo.choiceTimeStart + ' 至 ' + projectInfo.choiceTimeEnd}}</template>
+                </van-cell>
+            </template>
         </van-cell-group>
 
         <!--礼品套餐-->
-        <div class="van-cell-group--inset"
-             style="margin:10px auto"
-             v-if="projectInfo.flexible && [2,3].includes(projectInfo.provideMode)
+        <div
+            class="van-cell-group--inset"
+            style="margin: 10px auto"
+            v-if="projectInfo.flexible && [2,3].includes(projectInfo.provideMode)
                     && projectInfo.welfareProjectSubjects
-                    && projectInfo.welfareProjectSubjects.length>0">
+                    && projectInfo.welfareProjectSubjects.length>0"
+        >
             <van-cell>
-                <div style="font-weight: bold;font-size: 15px;display: flex;align-items: center">
-                    选择套餐
-                </div>
+                <div style="font-weight: bold; font-size: 15px; display: flex; align-items: center">选择套餐</div>
             </van-cell>
 
-            <div class="selection" style="background: #FFF"
-                 v-for="(subject,sidx) in projectInfo.welfareProjectSubjects">
-                <div style="display: flex;width: 100%;padding: 10px 0"
-                     v-for="(option, oidx) in subject.options">
-                    <div style="width: 120px;height: 100px;display: flex;justify-content: center;align-items: center">
-                        <van-image :src="FILE_STREAM_PREVIEW_ADDRESS+'?id='+option.imgUrl"
-                                   fit="contain"
-                                   style="width: 100px;height: 100px;border-radius: 10px"></van-image>
+            <div class="selection" style="background: #fff" v-for="(subject,sidx) in projectInfo.welfareProjectSubjects">
+                <div style="display: flex; width: 100%; padding: 10px 0" v-for="(option, oidx) in subject.options">
+                    <div style="width: 120px; height: 100px; display: flex; justify-content: center; align-items: center">
+                        <van-image
+                            :src="FILE_STREAM_PREVIEW_ADDRESS+'?id='+option.imgUrl"
+                            fit="contain"
+                            style="width: 100px; height: 100px; border-radius: 10px"
+                        ></van-image>
                         <!--                        @click="vant.ImagePreview([CREATE_PREVIEW_URL(option.imgUrl)])"-->
                     </div>
 
                     <div class="right_content">
-                        <div style="display: flex;justify-content: space-between;align-items: center;font-size: 14px">
+                        <div style="display: flex; justify-content: space-between; align-items: center; font-size: 14px">
                             <div style="width: 100%">{{option.optionName}}</div>
                         </div>
                         <div class="optionDesc">
-                            <template v-if="option.supplier">
-                                服务专线:{{option.supplier}}
-                            </template>
+                            <template v-if="option.supplier">服务专线:{{option.supplier}}</template>
                         </div>
-                        <div class="optionDesc" v-if="option.simpleDesc">
-                            备注:{{option.simpleDesc}}
-                        </div>
-                        <div style="position: absolute;right: 10px;bottom: 0;left: 0;display: flex;justify-content: space-between">
-                            <div @click="openViewDesc(option.description)"
-                                 style="width: 70px;font-size: 13px;color: #918a8a;text-align: right">
+                        <div class="optionDesc" v-if="option.simpleDesc">备注:{{option.simpleDesc}}</div>
+                        <div style="position: absolute; right: 10px; bottom: 0; left: 0; display: flex; justify-content: space-between">
+                            <div @click="openViewDesc(option.description)" style="width: 70px; font-size: 13px; color: #918a8a; text-align: right">
                                 套餐详情
                             </div>
-                            <van-stepper :default-value="0"
-                                         :disabled="confirmButtonInfo.disabled"
-                                         :min="0"
-                                         @change="(value)=>{numChange(value,option,oidx)}"
-                                         async-change
-                                         button-size="20"
-                                         disable-input
-                                         integer
-                                         theme="round"
-                                         v-model="option.selectNum"></van-stepper>
+                            <van-stepper
+                                :default-value="0"
+                                :disabled="confirmButtonInfo.disabled"
+                                :min="0"
+                                @change="(value)=>{numChange(value,option,oidx)}"
+                                async-change
+                                button-size="20"
+                                disable-input
+                                integer
+                                theme="round"
+                                v-model="option.selectNum"
+                            ></van-stepper>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
 
-        <van-submit-bar :button-text="confirmButtonInfo.text"
-                        @submit="confirmSelect"
-                        tip="您可以在福利选择截至时间之前修改福利套餐"
-                        tip-icon="info-o">
-            <div style="width: calc(100% - 110px);">
-                <div style="width: 25px;height: 25px;position: relative">
+        <van-submit-bar
+            :button-text="confirmButtonInfo.text"
+            @submit="confirmSelect"
+            tip="您可以在福利选择截至时间之前修改福利套餐"
+            tip-icon="info-o"
+        >
+            <div style="width: calc(100% - 110px)">
+                <div style="width: 25px; height: 25px; position: relative">
                     <van-icon name="shopping-cart-o" size="25"></van-icon>
-                    <div class="van-info">
-                        {{sumSelectNum}}
-                    </div>
+                    <div class="van-info">{{sumSelectNum}}</div>
                 </div>
             </div>
         </van-submit-bar>
     </template>
 
-    <van-popup :style="{ height: '70%' }" closeable position="bottom" safe-area-inset-bottom
-               v-model="selectAddressPopup">
+    <van-popup :style="{ height: '70%' }" closeable position="bottom" safe-area-inset-bottom v-model="selectAddressPopup">
         <div style="height: 100%">
-            <div style="font-size: 15px;font-weight: bold;text-align: center;padding-top: 16px;">
-                配送至
-            </div>
+            <div style="font-size: 15px; font-weight: bold; text-align: center; padding-top: 16px">配送至</div>
             <template v-if="addressList && addressList.length>0">
-                <van-cell @click="addressClick(item);selectAddressPopup=false" clickable
-                          icon="location-o"
-                          v-for="item in addressList">
-                    <template #title>
-                        {{item.address}}
-                    </template>
+                <van-cell @click="addressClick(item);selectAddressPopup=false" clickable icon="location-o" v-for="item in addressList">
+                    <template #title>{{item.address}}</template>
                     <template #label>
                         <div>{{"地区:" + item.province + item.city + item.county}}</div>
                         <div>{{"收件人：" + item.name}}</div>
@@ -278,59 +282,48 @@ layout("/mobile/platform.html"){
 
             <van-empty description="暂无地址" v-else></van-empty>
 
-            <div style="position: absolute;bottom: 0;left: 0;box-sizing: border-box;width: 100%;padding: 0 16px;background: #fff">
-                <van-button @click="openAddressManage" block round
-                            style="height: 40px;margin: 5px 0"
-                            type="danger">
-                    地址管理
-                </van-button>
+            <div style="position: absolute; bottom: 0; left: 0; box-sizing: border-box; width: 100%; padding: 0 16px; background: #fff">
+                <van-button @click="openAddressManage" block round style="height: 40px; margin: 5px 0" type="danger">地址管理</van-button>
             </div>
         </div>
-
     </van-popup>
 
-    <van-popup :style="{ height: '100%',width: '100%'}" position="right" safe-area-inset-bottom
-               v-model="descPopup">
+    <van-popup :style="{ height: '100%',width: '100%'}" position="right" safe-area-inset-bottom v-model="descPopup">
         <van-sticky>
-            <van-nav-bar @click-left="descPopup=false" left-arrow
-                         title="详情"></van-nav-bar>
+            <van-nav-bar @click-left="descPopup=false" left-arrow title="详情"></van-nav-bar>
         </van-sticky>
 
-        <div @click="descImgClick" class="desc" style="padding: 20px;" v-html="desc"></div>
+        <div @click="descImgClick" class="desc" style="padding: 20px" v-html="desc"></div>
     </van-popup>
 
-    <van-popup :close-on-click-overlay="false"
-               :style="{ height: '90vh', 'overflow-y':'auto', background:'#f9f9f9'}"
-               closeable
-               position="bottom"
-               round
-               safe-area-inset-bottom
-               v-model="confirmPopup">
-
+    <van-popup
+        :close-on-click-overlay="false"
+        :style="{ height: '90vh', 'overflow-y':'auto', background:'#f9f9f9'}"
+        closeable
+        position="bottom"
+        round
+        safe-area-inset-bottom
+        v-model="confirmPopup"
+    >
         <div>
             <!--选择的信息-->
             <div class="van-cell-group--inset">
                 <van-cell>
-                    <van-icon class="van-cell__left-icon" color="red" name="location"
-                              slot="icon"></van-icon>
-                    <div slot="title" style="font-weight: bold;font-size: 15px">已选福利</div>
+                    <van-icon class="van-cell__left-icon" color="red" name="location" slot="icon"></van-icon>
+                    <div slot="title" style="font-weight: bold; font-size: 15px">已选福利</div>
                 </van-cell>
                 <van-cell style="padding: 0" v-for="(item,index) in selectedOptions">
                     <van-card
-                            :key="item.id"
-                            :num="item.selectNum"
-                            :thumb="FILE_STREAM_PREVIEW_ADDRESS+'?id='+item.imgUrl"
-                            :title="item.optionName"
-                            desc=""
-                            style="border-radius: 8px;background: #FFFFFF"
+                        :key="item.id"
+                        :num="item.selectNum"
+                        :thumb="FILE_STREAM_PREVIEW_ADDRESS+'?id='+item.imgUrl"
+                        :title="item.optionName"
+                        desc=""
+                        style="border-radius: 8px; background: #ffffff"
                     ></van-card>
                     <div class="van-hairline--top"></div>
-                    <van-cell @click="openShoppingPopup(item,index)" is-link title="收货门店"
-                              v-if="item.shoppingId">
-                        <template #label>
-                            {{item.receiveAddress?item.receiveAddress:'暂未选择'}}
-                        </template>
-
+                    <van-cell @click="openShoppingPopup(item,index)" is-link title="收货门店" v-if="item.shoppingId">
+                        <template #label>{{item.receiveAddress?item.receiveAddress:'暂未选择'}}</template>
                     </van-cell>
                 </van-cell>
             </div>
@@ -338,17 +331,13 @@ layout("/mobile/platform.html"){
             <!--邮寄到家 填写收货地址-->
             <div class="van-cell-group--inset" v-if="projectInfo.provideMode===3">
                 <van-cell>
-                    <van-icon class="van-cell__left-icon" color="red" name="location"
-                              slot="icon"></van-icon>
-                    <div slot="title" style="font-weight: bold;font-size: 15px">收货地址</div>
+                    <van-icon class="van-cell__left-icon" color="red" name="location" slot="icon"></van-icon>
+                    <div slot="title" style="font-weight: bold; font-size: 15px">收货地址</div>
                 </van-cell>
-                <van-cell @click="clickSelectAddressPopup" class="address-cell" is-link
-                          title="">
+                <van-cell @click="clickSelectAddressPopup" class="address-cell" is-link title="">
                     <template>
                         <span v-if="$.isEmptyObject(selectAddress)">请选择地址</span>
-                        <span v-else>
-                        {{selectAddress}}
-                    </span>
+                        <span v-else>{{selectAddress}}</span>
                     </template>
                 </van-cell>
             </div>
@@ -357,69 +346,58 @@ layout("/mobile/platform.html"){
             <div class="van-cell-group--inset" v-if="projectInfo.signMode===2">
                 <van-cell>
                     <template #title>
-                        <div style="font-weight: bold;font-size: 15px">电子签名</div>
+                        <div style="font-weight: bold; font-size: 15px">电子签名</div>
                     </template>
                 </van-cell>
                 <van-cell title="">
                     <template #label>
-                        <mobile-sign :is_value_base64="false" prefix="welfare" ref="signature"
-                                     v-model="signData"></mobile-sign>
+                        <mobile-sign :is_value_base64="false" prefix="welfare" ref="signature" v-model="signData"></mobile-sign>
                     </template>
                 </van-cell>
             </div>
 
-            <div style="padding: 10px 16px;left: 0;right: 0;bottom: 0;background: #FFFFFF">
-                <van-button @click="submitSelect" round style="width: 100%" type="danger">提交
-                </van-button>
+            <div style="padding: 10px 16px; left: 0; right: 0; bottom: 0; background: #ffffff">
+                <van-button @click="submitSelect" round style="width: 100%" type="danger">提交</van-button>
             </div>
         </div>
     </van-popup>
 
-    <van-popup :style="{ height: '90vh', 'overflow-y':'auto', background:'#f9f9f9'}"
-               closeable
-               position="bottom"
-               round
-               safe-area-inset-bottom
-               v-model="shoppingPopup">
-
+    <van-popup
+        :style="{ height: '90vh', 'overflow-y':'auto', background:'#f9f9f9'}"
+        closeable
+        position="bottom"
+        round
+        safe-area-inset-bottom
+        v-model="shoppingPopup"
+    >
         <div>
             <div style="margin-top: 45px">
-                <van-search
-                        @search="onSearchShoppingAddress"
-                        placeholder="请输入门店关键词"
-                        show-action
-                        v-model="shoppingAddress">
+                <van-search @search="onSearchShoppingAddress" placeholder="请输入门店关键词" show-action v-model="shoppingAddress">
                     <template #action>
                         <div @click="onSearchShoppingAddress">搜索</div>
                     </template>
                 </van-search>
-                <div class="van-cell-group--inset"
-                     v-if="offlineStoresOption&&offlineStoresOption.length>0">
-                    <van-cell @click="addShopping(item.address)" is-link
-                              v-for="item in offlineStoresOption"
-                    >
+                <div class="van-cell-group--inset" v-if="offlineStoresOption && offlineStoresOption.length>0">
+                    <van-cell icon="location-o" class="custom-cell" @click="addShopping(item.address)" v-for="item in offlineStoresOption">
                         {{item.address}}
                     </van-cell>
-
                 </div>
                 <div v-else>
-                    <van-empty description="描述文字" style="height: calc(100% - 180px);"></van-empty>
+                    <van-empty description="描述文字" style="height: calc(100% - 180px)"></van-empty>
                 </div>
-
             </div>
         </div>
     </van-popup>
-
 </div>
 
 <script>
     <!--#include("/mobile/welfare/include/mixins.js"){}#-->
 
     const vue = new Vue({
-        el: '#app',
+        el: "#app",
         mixins: [mobileMixins, welfareMixins],
         components: {
-            'mobile-sign': httpVueLoader('/components/sign/mobileSign.vue'),
+            "mobile-sign": httpVueLoader("/components/sign/mobileSign.vue")
         },
         data() {
             return {
@@ -441,13 +419,16 @@ layout("/mobile/platform.html"){
                 shoppingAddress: "",
                 optionIndex: null,
                 optionData: {},
+
+                clickUpOrDown: false
             }
         },
         computed: {
-
             sumSelectNum() {
                 if (this.projectInfo && this.projectInfo.welfareProjectSubjects) {
-                    return this.projectInfo.welfareProjectSubjects[0].options.map(v => v.selectNum).reduce((accumulator, currentValue) => accumulator + currentValue, 0)
+                    return this.projectInfo.welfareProjectSubjects[0].options
+                        .map((v) => v.selectNum)
+                        .reduce((accumulator, currentValue) => accumulator + currentValue, 0)
                 }
                 return 0
             },
@@ -465,92 +446,129 @@ layout("/mobile/platform.html"){
             },
             confirmButtonInfo() {
                 if (this.projectInfo) {
-                    const {choiceTimeEnd, choiceTimeStart, overdueChoiceTimeEnd} = this.projectInfo
+                    const { choiceTimeEnd, choiceTimeStart, overdueChoiceTimeEnd } = this.projectInfo
                     const now = moment().valueOf()
 
-                    if (overdueChoiceTimeEnd == null || overdueChoiceTimeEnd === '') {
+                    if (overdueChoiceTimeEnd == null || overdueChoiceTimeEnd === "") {
                         if (now > moment(choiceTimeStart).valueOf() && now < moment(choiceTimeEnd).valueOf()) {
-                            return {text: this.isSelect ? '确定修改' : '确定选择', disabled: false}
+                            return { text: this.isSelect ? "选好了，下一步" : "选好了，下一步", disabled: false }
                         } else if (now > moment(choiceTimeEnd).valueOf()) {
-                            return {text: '选择已结束', disabled: true}
+                            return { text: "选择已结束", disabled: true }
                         } else if (now < moment(choiceTimeStart).valueOf()) {
-                            return {text: '选择未开始', disabled: true}
+                            return { text: "选择未开始", disabled: true }
                         }
                     } else {
                         //已选择了不能再动了
                         if (this.isSelect) {
                             if (moment(this.selectTime).valueOf() > moment(choiceTimeEnd).valueOf() && now < moment(overdueChoiceTimeEnd).valueOf()) {
-                                return {text: '确定修改', disabled: false}
+                                return { text: "下一步", disabled: false }
                             }
-                            return {text: '选择已结束', disabled: true}
+                            return { text: "选择已结束", disabled: true }
                         } else {
                             if (now > moment(choiceTimeStart).valueOf() && now < moment(overdueChoiceTimeEnd).valueOf()) {
-                                return {text: this.isSelect ? '确定修改' : '确定选择', disabled: false}
+                                return { text: this.isSelect ? "选好了，下一步" : "选好了，下一步", disabled: false }
                             } else if (now > moment(overdueChoiceTimeEnd).valueOf()) {
-                                return {text: '选择已结束', disabled: true}
+                                return { text: "选择已结束", disabled: true }
                             } else if (now < moment(choiceTimeStart).valueOf()) {
-                                return {text: '选择未开始', disabled: true}
+                                return { text: "选择未开始", disabled: true }
                             }
                         }
                     }
                 }
-                return {text: '', disabled: true}
+                return { text: "", disabled: true }
             },
             selectedOptions() {
                 if (this.projectInfo && this.projectInfo.welfareProjectSubjects) {
-                    return this.projectInfo.welfareProjectSubjects[0].options.filter(v => v.selectNum >= 1)
+                    return this.projectInfo.welfareProjectSubjects[0].options.filter((v) => v.selectNum >= 1)
                 }
                 return []
             }
         },
         methods: {
             addShopping(address) {
-                this.$set(this.projectInfo.welfareProjectSubjects[0].options[this.optionIndex], 'receiveAddress', address)
+                this.$set(this.projectInfo.welfareProjectSubjects[0].options[this.optionIndex], "receiveAddress", address)
+                this.projectInfo.welfareProjectSubjects[0].options[this.optionIndex].receiveAddress = address
                 this.shoppingPopup = false
             },
             async onSearchShoppingAddress() {
                 const data = await this.getShoppingType()
-                const shopping = data.find(d => d.id === this.optionData.shoppingId)
+                const shopping = data.find((d) => d.id === this.optionData.shoppingId)
                 if (this.shoppingAddress) {
-                    this.offlineStoresOption = shopping.offlineStores.filter(s => s.address.includes(this.shoppingAddress))
+                    this.offlineStoresOption = shopping.offlineStores.filter((s) => s.address.includes(this.shoppingAddress))
                 } else {
                     this.offlineStoresOption = shopping.offlineStores
                 }
-
-
             },
             openShoppingPopup(item, optionIndex) {
                 this.optionData = item
-                const shopping = this.shoppingTypeOptions.find(v => v.id === item.shoppingId)
+                const shopping = this.shoppingTypeOptions.find((v) => v.id === item.shoppingId)
                 this.offlineStoresOption = shopping.offlineStores
                 this.optionIndex = optionIndex
                 this.shoppingAddress = ""
                 this.shoppingPopup = true
             },
+            editAddress(item) {
+                location.replace("/mobile/welfare/mine/addressEdit?projectId=" + this.projectId + "&id=" + item.id)
+                window.sessionStorage.setItem("welfareProjectId", this.projectId)
+
+                const formData = {
+                    projectInfo: this.projectInfo,
+                    signData: this.signData || null
+                }
+                window.sessionStorage.setItem("welfareProjectSelectInfo" + "${@shiro.getPrincipalProperty('loginname')}", JSON.stringify(formData))
+            },
+            deleteAddress(item) {
+                this.selectAddressPopup = true
+                // 确认要删除该地址吗
+                this.$dialog
+                    .confirm({
+                        title: "提示",
+                        message: "确认要删除该地址吗"
+                    })
+                    .then(async () => {
+                        const loading = this.$toast.loading({
+                            message: "删除中...",
+                            forbidClick: true,
+                            overlay: true,
+                            duration: 0
+                        })
+                        const resp = await $.post("/mobile/welfare/mine/deleteAddress", { id: item.id })
+                        loading.close()
+                        if (resp.code === 0) {
+                            this.$toast.success(resp.msg)
+                        }
+                        await this.selectAddressList()
+                        if (this.addressList && this.addressList.length > 0) {
+                            const resp = this.addressList.find((v) => v.isDefault)
+                            this.addressClick(resp)
+                        } else {
+                            this.selectAddress = ""
+                        }
+                        this.selectAddressPopup = true
+                    })
+                    .catch(() => {
+                        this.selectAddressPopup = true
+                    })
+            },
             //数量更改
             numChange(value, option, optionIndex) {
-                const {
-                    isCheckBox,
-                    multiSelectNum,
-                    singleOptionSupportMultipleSelection
-                } = this.projectInfo
-                if (isCheckBox === 'checkBox') {
+                const { isCheckBox, multiSelectNum, singleOptionSupportMultipleSelection } = this.projectInfo
+                if (isCheckBox === "checkBox") {
                     //判断是否支持单个多选
                     if (!singleOptionSupportMultipleSelection && value > 1) {
-                        this.$set(this.projectInfo.welfareProjectSubjects[0].options[optionIndex], 'selectNum', 1)
-                        this.$toast('此套餐最多只能选择1份')
-                        return;
+                        this.$set(this.projectInfo.welfareProjectSubjects[0].options[optionIndex], "selectNum", 1)
+                        this.$toast("此套餐最多只能选择1份")
+                        return
                     }
                 }
 
                 //获取用户当前选择的数量
-                const selectNums = this.projectInfo.welfareProjectSubjects[0].options.map(v => v.selectNum)
+                const selectNums = this.projectInfo.welfareProjectSubjects[0].options.map((v) => v.selectNum)
                 const sum = selectNums.reduce((accumulator, currentValue) => accumulator + currentValue, 0)
                 if (sum > multiSelectNum) {
-                    this.$set(this.projectInfo.welfareProjectSubjects[0].options[optionIndex], 'selectNum', value - 1)
-                    this.$toast('此次福利最多只能选择' + multiSelectNum + '份')
+                    this.$set(this.projectInfo.welfareProjectSubjects[0].options[optionIndex], "selectNum", value - 1)
+                    this.$toast("此次福利最多只能选择" + multiSelectNum + "份")
                 }
-
             },
 
             //确定选择
@@ -560,15 +578,11 @@ layout("/mobile/platform.html"){
                     return
                 }
 
-                const {
-                    isCheckBox,
-                    multiSelectNum,
-                    singleOptionSupportMultipleSelection
-                } = this.projectInfo
+                const { isCheckBox, multiSelectNum, singleOptionSupportMultipleSelection } = this.projectInfo
                 if (isCheckBox === "checkBox") {
                     if (this.sumSelectNum < multiSelectNum) {
                         //用户没有选择完
-                        this.$toast('一共可以选择' + multiSelectNum + '份,您目前只选择了' + this.sumSelectNum + '份，快去选择吧！')
+                        this.$toast("一共可以选择" + multiSelectNum + "份,您目前只选择了" + this.sumSelectNum + "份，快去选择吧！")
                         return
                     }
                 }
@@ -583,46 +597,43 @@ layout("/mobile/platform.html"){
                 if (this.projectInfo.signMode === 2 && this.isSelect && this.userSelection) {
                     this.signData = this.userSelection[0].userSign
                 }
-
             },
 
             //提交选择
             async submitSelect() {
                 if (this.projectInfo.provideMode === 3) {
-                    if (this.selectAddress == null || this.selectAddress === '') {
+                    if (this.selectAddress == null || this.selectAddress === "") {
                         this.$modal.msg("请填写您的收货地址")
                         return
                     }
                 }
                 if (this.projectInfo.signMode === 2) {
-                    if (this.signData == null || this.signData === '') {
+                    if (this.signData == null || this.signData === "") {
                         this.$modal.msg("请签名")
                         return
                     }
                 }
                 const notReceiveAddress = []
-                const formData = this.projectInfo.welfareProjectSubjects[0].options.filter(v => v.selectNum >= 1).map(v => {
-                    if (v.shoppingId && !v.receiveAddress) {
-                        notReceiveAddress.push(v.optionName)
-                    }
-                    return {
-                        welfareId: this.projectId,
-                        subjectId: v.subjectId,
-                        selectOptionId: v.id,
-                        receiveAddress: this.projectInfo.provideMode === 3 ? this.selectAddress : v.receiveAddress,
-                        userSign: this.signData,
-                        selectNum: v.selectNum
-                    }
-                })
+                const formData = this.projectInfo.welfareProjectSubjects[0].options
+                    .filter((v) => v.selectNum >= 1)
+                    .map((v) => {
+                        if (v.shoppingId && !v.receiveAddress) {
+                            notReceiveAddress.push(v.optionName)
+                        }
+                        return {
+                            welfareId: this.projectId,
+                            subjectId: v.subjectId,
+                            selectOptionId: v.id,
+                            receiveAddress: this.projectInfo.provideMode === 3 ? this.selectAddress : v.receiveAddress,
+                            userSign: this.signData,
+                            selectNum: v.selectNum
+                        }
+                    })
                 if (notReceiveAddress.length > 0) {
                     this.$modal.msg("请填写收货门店：" + notReceiveAddress.join(","))
                     return
                 }
-                const {
-                    code,
-                    msg,
-                    data
-                } = await $.post('/platform/welfare/userChoose/confirmSelect', {
+                const { code, msg, data } = await $.post("/platform/welfare/userChoose/confirmSelect", {
                     welfareUserSelections: JSON.stringify(formData),
                     projectId: this.projectId
                 })
@@ -638,24 +649,29 @@ layout("/mobile/platform.html"){
             //查看详情
             openViewDesc(desc) {
                 if (desc == null || desc.length === 0) {
-                    this.$toast('没有更多了')
+                    this.$toast("没有更多了")
                     return
                 }
                 this.desc = desc
                 this.descPopup = true
-
             },
 
             descImgClick(e) {
-                if (e.target.tagName === 'IMG') {
+                if (e.target.tagName === "IMG") {
                     vant.ImagePreview([e.target.src])
                 }
             },
 
             //地址管理
             openAddressManage() {
-                location.replace('/mobile/welfare/mine/address')
-                window.sessionStorage.setItem('welfareProjectId', this.projectId)
+                location.replace("/mobile/welfare/mine/addressEdit?projectId=" + this.projectId)
+                window.sessionStorage.setItem("welfareProjectId", this.projectId)
+
+                const formData = {
+                    projectInfo: this.projectInfo,
+                    signData: this.signData || null
+                }
+                window.sessionStorage.setItem("welfareProjectSelectInfo" + "${@shiro.getPrincipalProperty('loginname')}", JSON.stringify(formData))
             },
 
             clickSelectAddressPopup() {
@@ -665,12 +681,12 @@ layout("/mobile/platform.html"){
 
             //地址列表点击
             addressClick(item) {
-                const {province, city, county, address, name, tel} = item
+                const { province, city, county, address, name, tel } = item
                 this.selectAddress = "收货地址:" + province + city + county + address + "," + "收件人：" + name + "," + "联系方式：" + tel
             },
 
             async getProjectInfo() {
-                const resp = await $.get('/platform/welfare/common/findOne', {projectId: this.projectId})
+                const resp = await $.get("/platform/welfare/common/findOne", { projectId: this.projectId })
                 if (resp.code === 0) {
                     resp.data.multiSelectNum = resp.data.multiSelectNum ? resp.data.multiSelectNum : 1
                     this.projectInfo = resp.data
@@ -680,15 +696,15 @@ layout("/mobile/platform.html"){
 
             //获取用户选择的数据
             async getUserSelection(projectId) {
-                const resp = await $.get('/platform/welfare/mine/getUserSelection', {projectId: projectId})
+                const resp = await $.get("/platform/welfare/mine/getUserSelection", { projectId: projectId })
                 this.userSelection = resp.data
                 this.echoUserSelection()
             },
 
             //回显用户选择的数据
             echoUserSelection() {
-                this.projectInfo.welfareProjectSubjects[0].options.forEach(v => {
-                    const option = this.userSelection.find(x => x.selectOptionId === v.id)
+                this.projectInfo.welfareProjectSubjects[0].options.forEach((v) => {
+                    const option = this.userSelection.find((x) => x.selectOptionId === v.id)
                     if (option) {
                         v.selectNum = option.selectNum
                         v.receiveAddress = option.receiveAddress
@@ -698,25 +714,36 @@ layout("/mobile/platform.html"){
             async getShoppingType() {
                 const resp = await $.get("/platform/shoppingType/apply/getShoppingType")
                 return resp.data
-
-            },
+            }
         },
         async created() {
             const id = GetQueryString("projectId")
             if (!id) return
             this.projectId = id
-            this.getProjectInfo()
             this.shoppingTypeOptions = await this.getShoppingType()
             // this.getChoice()
-            getEnumOptions("WelfareProvideMode").then(res => {
+            getEnumOptions("WelfareProvideMode").then((res) => {
                 this.welfareProvideMode = res
             })
-            getEnumOptions("WelfareSignMode").then(res => {
+            getEnumOptions("WelfareSignMode").then((res) => {
                 this.welfareSignMode = res
             })
-        },
+
+            const loginname = "${@shiro.getPrincipalProperty('loginname')}"
+            const formData = window.sessionStorage.getItem("welfareProjectSelectInfo" + loginname)
+            if (formData) {
+                const resp = JSON.parse(formData)
+                this.projectInfo = resp.projectInfo
+                this.signData = resp.signData
+                this.confirmSelect()
+                window.sessionStorage.removeItem("welfareProjectSelectInfo" + loginname)
+                // this.selectAddressPopup = true
+            } else {
+                this.getProjectInfo()
+            }
+        }
     })
-    window.addEventListener('pageshow', e => {
+    window.addEventListener("pageshow", (e) => {
         if (e.persisted || (window.performance && window.performance.navigation.type === 2)) {
             vue.init()
         }
diff --git a/src/main/resources/views/mobile/welfare/mine/address_edit.html b/src/main/resources/views/mobile/welfare/mine/address_edit.html
index bed1542..779be3d 100644
--- a/src/main/resources/views/mobile/welfare/mine/address_edit.html
+++ b/src/main/resources/views/mobile/welfare/mine/address_edit.html
@@ -12,98 +12,97 @@ layout("/mobile/platform.html"){
 
 <div id="app" v-cloak>
     <van-sticky>
-        <van-nav-bar title="地址管理" left-arrow placeholder fixed
-                     @click-left="location.replace('/mobile/welfare/mine/address')"></van-nav-bar>
+        <van-nav-bar title="地址管理" left-arrow placeholder fixed @click-left="back()"></van-nav-bar>
     </van-sticky>
 
     <div v-if="vLoading && !vLoading.value">
         <van-address-edit
-                ref="address"
-                :area-list="areaList"
-                :show-delete="addressId"
-                :address-info="addressInfo"
-                show-set-default
-                show-search-result
-                tel-maxlength="11"
-                :area-columns-placeholder="['请选择', '请选择', '请选择']"
-                @save="onSave"
-                @delete="onDelete"
+            ref="address"
+            :area-list="areaList"
+            :show-delete="addressId"
+            :address-info="addressInfo"
+            show-set-default
+            show-search-result
+            tel-maxlength="11"
+            :area-columns-placeholder="['请选择', '请选择', '请选择']"
+            @save="onSave"
+            @delete="onDelete"
         ></van-address-edit>
     </div>
-
 </div>
 
 <script>
     <!--#include("/mobile/welfare/include/areaList.js"){};include("/mobile/welfare/include/mixins.js"){}#-->
 
-
     const vue = new Vue({
-        el: '#app',
+        el: "#app",
         mixins: [mobileMixins, welfareMixins],
         data() {
             return {
+                projectId: GetQueryString("projectId"),
                 areaList: areaList,
                 addressInfo: {},
                 addressId: null
-            };
+            }
         },
         methods: {
+            back() {
+                if (this.projectId) {
+                    // pjaxReplace("/mobile/welfare/mine/address?projectId=" + this.projectId)
+                    pjaxReplace("/mobile/welfare/list/receive?projectId=" + this.projectId)
+                } else {
+                    pjaxReplace("/mobile/welfare/mine/address")
+                }
+            },
             async onSave(content) {
                 const loading = this.$toast.loading({
-                    message: '保存中...',
+                    message: "保存中...",
                     forbidClick: true,
                     overlay: true,
                     duration: 0
                 })
                 content.userName = content.name
-                const resp = await $.post('/mobile/welfare/mine/doSaveUserAddress', content)
+                const resp = await $.post("/mobile/welfare/mine/doSaveUserAddress", content)
                 loading.close()
                 if (resp.code === 0) {
                     this.$toast.success(resp.msg)
-                    setTimeout(() => {
-                        let welfareProjectId = window.sessionStorage.getItem("welfareProjectId");
-                        if (welfareProjectId) {
-                            location.replace('/mobile/welfare/list/receive?projectId=' + welfareProjectId)
-                            window.sessionStorage.removeItem("welfareProjectId");
-                        } else {
-                            location.replace('/mobile/welfare/mine/address')
-                        }
-                    }, 1000)
+                    this.$nextTick(() => {
+                        this.back()
+                    })
                 }
             },
             async onDelete(content) {
                 const loading = this.$toast.loading({
-                    message: '删除中...',
+                    message: "删除中...",
                     forbidClick: true,
                     overlay: true,
                     duration: 0
                 })
-                const resp = await $.post('/mobile/welfare/mine/deleteAddress', {id: content.id})
+                const resp = await $.post("/mobile/welfare/mine/deleteAddress", { id: content.id })
                 loading.close()
                 if (resp.code === 0) {
                     this.$toast.success(resp.msg)
-                    setTimeout(() => {
-                        location.replace('/mobile/welfare/mine/address')
-                    }, 1000)
+                    this.$nextTick(() => {
+                        this.back()
+                    })
                 }
             }
         },
         async created() {
             this.startLoading()
-            this.addressId = GetQueryString("id") === '' ? null : GetQueryString("id")
+            this.addressId = GetQueryString("id") === "" ? null : GetQueryString("id")
             if (this.addressId) {
-                const resp = await $.get('/mobile/welfare/mine/findOneUserAddress', {id: this.addressId})
+                const resp = await $.get("/mobile/welfare/mine/findOneUserAddress", { id: this.addressId })
                 if (resp.code === 0) {
                     this.addressInfo = resp.data
                 }
                 this.closeLoading()
             } else {
-                this.addressInfo.name = "${@shiro.getPrincipalProperty('username')}";
+                this.addressInfo.name = "${@shiro.getPrincipalProperty('username')}"
                 this.closeLoading()
             }
             /*this.areaList.province_list = {320000: "江苏省"}
             this.areaList.city_list = {320200: "无锡市"}*/
-
         }
     })
 </script>
diff --git a/src/main/resources/views/platform/jf/Funds/apply.html b/src/main/resources/views/platform/jf/Funds/apply.html
index be36031..b4df755 100644
--- a/src/main/resources/views/platform/jf/Funds/apply.html
+++ b/src/main/resources/views/platform/jf/Funds/apply.html
@@ -84,10 +84,10 @@ layout("/layouts/platform.html"){
 
                     <el-col :span="12">
                         <el-form-item label="申报基层工会" prop="fundsUnitName" v-if="formData.activity_type!=40003">
-                            <el-input placeholder="请输入基层工会名称" type="text" v-model="formData.fundsUnitName"></el-input>
+                            <el-input placeholder="请输入基层工会名称" readonly type="text" v-model="formData.fundsUnitName"></el-input>
                         </el-form-item>
-                        <el-form-item label="申请协会" prop="clubId" v-else-if="formData.activity_type==40003">
-                            <el-select @change="fundsUnitChange" placeholder="请选择申请协会" style="width: 100%" v-model="formData.clubId">
+                        <el-form-item label="申报文体协会" prop="clubId" v-else-if="formData.activity_type==40003">
+                            <el-select @change="fundsUnitChange" placeholder="请选择申报文体协会" style="width: 100%" v-model="formData.clubId">
                                 <el-option
                                     :key="item.id"
                                     :label="item.name+' ('+item.code+')'"
@@ -106,29 +106,6 @@ layout("/layouts/platform.html"){
                                 v-model="formData.joinActivityNum"
                             ></el-input-number>
                         </el-form-item>
-
-                        <!--   <el-form-item prop="projectTypeCode" label="活动项目类型">
-                               <el-select v-model="formData.projectTypeCode" placeholder="请选择活动类型"
-                                          style="width: 100%;">
-                                   <el-option
-                                           v-for="item in projectType"
-                                           :key="item.id"
-                                           :label="item.name+' ('+item.code+')'"
-                                           :value="item.code">
-                                   </el-option>
-                               </el-select>
-                           </el-form-item>-->
-                        <!--<el-form-item label="活动经费类型" prop="projectJfCode">
-                            <el-select placeholder="选择活动主体类型自动选择" style="width: 100%" v-model="formData.projectJfCode">
-                                <el-option
-                                    :key="item.id"
-                                    :label="item.name+' ('+item.code+')'"
-                                    :value="item.code"
-                                    disabled
-                                    v-for="item in projectJfType"
-                                ></el-option>
-                            </el-select>
-                        </el-form-item>-->
                     </el-col>
 
                     <el-col :span="12">
@@ -155,7 +132,7 @@ layout("/layouts/platform.html"){
                         <el-form-item label="预算总费用" prop="funds_money">
                             <el-input-number
                                 disabled
-                                placeholder="输入物品单价自动计算"
+                                placeholder="输入预算费用自动计算"
                                 :precision="2"
                                 style="width: 100%"
                                 v-model="formData.funds_money"
@@ -366,19 +343,10 @@ layout("/layouts/platform.html"){
                 }
             },
             async getProjectCodeChange(val) {
-                this.$set(this.formData, "fundsUnitName", null)
                 await this.generateProjectCode(this.formData.activity_type)
-                if (this.formData.activity_type == "40001") {
-                    const jfType = this.projectJfType.find((p) => p.code == "70001")
-                    this.$set(this.formData, "projectJfCode", jfType ? jfType.code : null)
-                    this.$set(this.formData, "fundsUnitName", "校工会")
-                } else if (this.formData.activity_type == "40002") {
-                    const jfType = this.projectJfType.find((p) => p.code == "70002")
-                    this.$set(this.formData, "projectJfCode", jfType ? jfType.code : null)
+                if (this.formData.activity_type == "40002") {
                     this.$set(this.formData, "fundsUnitName", '${@shiro.getPrincipalProperty("union").getUnionname()}')
                 } else if (this.formData.activity_type == "40003") {
-                    const jfType = this.projectJfType.find((p) => p.code == "70003")
-                    this.$set(this.formData, "projectJfCode", jfType ? jfType.code : null)
                     const { data } = await $.get("/platform/jf/Funds/apply/getUserClub")
                     const clubList = await getClubs()
                     const aa = clubList.filter((v) => {
diff --git a/src/main/resources/views/platform/memberCost/payment/config.html b/src/main/resources/views/platform/membercost/config.html
similarity index 100%
rename from src/main/resources/views/platform/memberCost/payment/config.html
rename to src/main/resources/views/platform/membercost/config.html
diff --git a/src/main/resources/views/platform/membercost/mine/index.html b/src/main/resources/views/platform/membercost/mine/index.html
new file mode 100644
index 0000000..f8f080a
--- /dev/null
+++ b/src/main/resources/views/platform/membercost/mine/index.html
@@ -0,0 +1,17 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+<div id="app" v-cloak></div>
+<script>
+    new Vue({
+        el: "#app",
+        data() {
+            return {}
+        },
+        methods: {},
+        created() {}
+    })
+</script>
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/memberCost/payment/project.html b/src/main/resources/views/platform/membercost/project.html
similarity index 100%
rename from src/main/resources/views/platform/memberCost/payment/project.html
rename to src/main/resources/views/platform/membercost/project.html
diff --git a/src/main/resources/views/platform/memberCost/payment/summary.html b/src/main/resources/views/platform/membercost/summary.html
similarity index 100%
rename from src/main/resources/views/platform/memberCost/payment/summary.html
rename to src/main/resources/views/platform/membercost/summary.html
diff --git a/src/main/resources/views/platform/memberCost/payment/user.html b/src/main/resources/views/platform/membercost/user.html
similarity index 100%
rename from src/main/resources/views/platform/memberCost/payment/user.html
rename to src/main/resources/views/platform/membercost/user.html
diff --git a/src/main/resources/views/platform/welfare/addressManage.html b/src/main/resources/views/platform/welfare/addressManage.html
index a7e7510..ad18d52 100644
--- a/src/main/resources/views/platform/welfare/addressManage.html
+++ b/src/main/resources/views/platform/welfare/addressManage.html
@@ -11,180 +11,181 @@ layout("/layouts/platform.html"){
                     </template>
                 </table-tool>
 
-                <el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"
-                          ref="table"
-                          row-key="id" style="width: 100%" v-loading="tableLoading">
-
+                <el-table
+                    :data="tableData"
+                    :size="tableSize"
+                    @sort-change="pageOrder"
+                    ref="table"
+                    row-key="id"
+                    style="width: 100%"
+                    v-loading="tableLoading"
+                >
+                    <el-table-column label="序号" type="index" width="80px"></el-table-column>
                     <el-table-column
-                            label="序号" type="index"
-                            width="80px"></el-table-column>
-                    <el-table-column
-                            :key="column.prop"
-                            :label="column.label"
-                            :prop="column.prop"
-                            :sortable="column.sortable"
-                            :width="column.width" show-overflow-tooltip
-                            v-for="column in tableColumns">
-                        <template scope="{row}" v-if="column.prop=='address'">
-                            {{row.province}} {{row.city}} {{row.county}}
-                        </template>
-
+                        :key="column.prop"
+                        :label="column.label"
+                        :prop="column.prop"
+                        :sortable="column.sortable"
+                        :width="column.width"
+                        show-overflow-tooltip
+                        v-for="column in tableColumns"
+                    >
+                        <template scope="{row}" v-if="column.prop=='address'">{{row.province}} {{row.city}} {{row.county}}</template>
                     </el-table-column>
-                    <el-table-column align="center" fixed="right" header-align="center"
-                                     label="操作" prop="userOnline"
-                                     width="170px">
+                    <el-table-column align="center" fixed="right" header-align="center" label="操作" prop="userOnline" width="170px">
                         <template scope="{row}">
-                            <el-button @click="openEdit(row)" size="mini" type="primary">
-                                修改
-                            </el-button>
-                            <el-button @click="doDelete(row.id)" size="mini" type="danger">
-                                删除
-                            </el-button>
+                            <el-button @click="openEdit(row)" size="mini" type="primary">修改</el-button>
+                            <el-button @click="doDelete(row.id)" size="mini" type="danger">删除</el-button>
                         </template>
                     </el-table-column>
-                    <el-table-column align="center" fixed="right" header-align="center" label=""
-                                     prop="userOnline"
-                                     width="170px">
+                    <el-table-column align="center" fixed="right" header-align="center" label="" prop="userOnline" width="170px">
                         <template scope="{row}">
                             <span v-if="row.isDefault">
-                                <el-tag type="danger">默认地址</el-tag></span>
+                                <el-tag type="danger">默认地址</el-tag>
+                            </span>
                             <span v-else>
-                              <el-button @click="doDefault(row)" size="mini"
-                                         type="primary">设为默认</el-button>
-                          </span>
+                                <el-button @click="doDefault(row)" size="mini" type="primary">设为默认</el-button>
+                            </span>
                         </template>
                     </el-table-column>
-
                 </el-table>
             </el-card>
         </template>
     </guava>
 
-    <el-dialog
-            title="收货地址"
-            :close-on-click-modal="false"
-            :visible.sync="dialogVisible"
-            width="30%">
-
-        <el-form :model="formData" label-position="right"
-                 label-suffix="：" label-width="120px" ref="addForm">
+    <el-dialog title="收货地址" :close-on-click-modal="false" :visible.sync="dialogVisible" width="40%">
+        <el-form :model="formData" label-position="right" :rules="formRules" label-suffix="：" label-width="120px" ref="addForm">
             <el-row :gutter="60">
                 <el-col :span="24">
-                    <el-form-item :rules="{required:true,message: '请选择地址信息', trigger: 'blur'}"
-                                  label="地址信息"
-                                  prop="addressList">
+                    <el-form-item label="地址信息" prop="addressList">
                         <el-cascader
-                                :options="dzOptions"
-                                :props="{ expandTrigger: 'hover' }"
-                                @change="handleChange"
-                                clearable
-                                placeholder="请选择地址信息"
-                                style="width: 100%"
-                                v-model="formData.addressList"></el-cascader>
+                            :options="dzOptions"
+                            :props="{ expandTrigger: 'hover' }"
+                            @change="handleChange"
+                            clearable
+                            placeholder="请选择地址信息"
+                            style="width: 100%"
+                            v-model="formData.addressList"
+                        ></el-cascader>
                     </el-form-item>
                 </el-col>
                 <el-col :span="24">
-                    <el-form-item
-                            :rules="{required:true,message: '请填写您的详细地址', trigger: 'blur'}"
-                            label="详细地址"
-                            prop="addressDetail">
-                        <el-input maxlength="100"
-                                  placeholder="请输入详细地址信息，如道路、门牌号、小区、楼栋号、单元等信息"
-                                  rows="3"
-                                  show-word-limit
-                                  type="textarea"
-                                  v-model="formData.addressDetail"></el-input>
+                    <el-form-item label="详细地址" prop="addressDetail">
+                        <el-input
+                            maxlength="100"
+                            placeholder="请输入详细地址信息，如道路、门牌号、小区、楼栋号、单元等信息"
+                            rows="3"
+                            show-word-limit
+                            type="textarea"
+                            v-model="formData.addressDetail"
+                        ></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="24">
-                    <el-form-item
-                            :rules="{required:true,message: '请填写收货人姓名', trigger: 'blur'}"
-                            label="收货人姓名"
-                            prop="userName">
-                        <el-input maxlength="11"
-                                  placeholder="请填写收货人姓名"
-                                  v-model="formData.userName"></el-input>
+                    <el-form-item label="收货人姓名" prop="userName">
+                        <el-input maxlength="11" placeholder="请填写收货人姓名" v-model="formData.userName"></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="24">
-                    <el-form-item
-                            :rules="{required:true,message: '请填写手机号码', trigger: 'blur'}"
-                            label="手机号码"
-                            prop="tel">
-                        <el-input maxlength="11" placeholder="请填写手机号码"
-                                  type="tel"
-                                  v-model="formData.tel"></el-input>
+                    <el-form-item label="手机号码" prop="tel">
+                        <el-input maxlength="11" placeholder="请填写手机号码" clearable v-model="formData.tel"></el-input>
+                    </el-form-item>
+                </el-col>
+
+                <el-col :span="24">
+                    <el-form-item label="是否默认" prop="isDefault">
+                        <el-switch
+                            v-model="formData.isDefault"
+                            active-color="#13ce66"
+                            inactive-color="#ff4949"
+                            active-value="1"
+                            inactive-value="0"
+                            active-text="是"
+                            inactive-text="否"
+                        ></el-switch>
                     </el-form-item>
                 </el-col>
             </el-row>
         </el-form>
 
         <span class="dialog-footer" slot="footer">
-    <el-button @click="dialogVisible = false">取 消</el-button>
-    <el-button @click="doSaveUserAddress" type="primary">保存</el-button>
-  </span>
+            <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-button @click="doSaveUserAddress" type="primary">保存</el-button>
+        </span>
     </el-dialog>
-
 </div>
-<script src="${base!}/assets/platform/js/chengSh.js"></script>
 <script>
     const vue = new Vue({
-        el: '#app',
+        el: "#app",
         mixins: [initTableMixins],
         data() {
             return {
                 dzOptions: chengShiList,
                 dialogVisible: false,
                 tableColumns: [
-                    {prop: 'userName', label: '收货人'},
-                    {prop: 'address', label: '所在地区'},
-                    {prop: 'addressDetail', label: '详细地址'},
-                    {prop: 'tel', label: '电话'},
-                ]
+                    { prop: "userName", label: "收货人" },
+                    { prop: "address", label: "所在地区" },
+                    { prop: "addressDetail", label: "详细地址" },
+                    { prop: "tel", label: "电话" }
+                ],
+                formRules: {
+                    addressList: [{ required: true, message: "请选择地址信息", trigger: ["blur", "change"] }],
+                    addressDetail: [{ required: true, message: "请填写您的详细地址", trigger: ["blur", "change"] }],
+                    userName: [{ required: true, message: "请填写收货人姓名", trigger: ["blur", "change"] }],
+                    tel: [
+                        { required: true, message: "必填", trigger: ["blur", "change"] },
+                        { pattern: /^1[3-9]\d{9}$/, message: "请输入正确的手机号" }
+                    ]
+                }
             }
         },
         methods: {
             pageData() {
-                sublime.showLoadingbar();
+                sublime.showLoadingbar()
                 this.tableLoading = true
-                $.post(loc() + "/selectUserAddress", this.pageForm, (data) => {
-                    sublime.closeLoadingbar();
-                    this.tableLoading = false
-                    if (data.code === 0) {
-                        this.tableData = data.data;
-                    } else {
-                        this.$message.error(data.msg);
-                    }
-                }, "json");
+                $.post(
+                    loc() + "/selectUserAddress",
+                    this.pageForm,
+                    (data) => {
+                        sublime.closeLoadingbar()
+                        this.tableLoading = false
+                        if (data.code === 0) {
+                            this.tableData = data.data
+                        } else {
+                            this.$message.error(data.msg)
+                        }
+                    },
+                    "json"
+                )
             },
             handleChange(val) {
                 if (val) {
                     let provinceName = ""
                     let cityName = ""
                     let countyName = ""
-                    const province = this.dzOptions.find(c => c.value === val[0])
+                    const province = this.dzOptions.find((c) => c.value === val[0])
                     provinceName = province.label
-                    const city = province.children.find(p => p.value === val[1])
+                    const city = province.children.find((p) => p.value === val[1])
                     cityName = city.label
                     if (val.length === 3) {
-                        const county = city.children.find(p => p.value === val[2])
+                        const county = city.children.find((p) => p.value === val[2])
                         countyName = county.label
                         this.$set(this.formData, "areaCode", county.value)
-                    }else{
+                    } else {
                         this.$set(this.formData, "areaCode", city.value)
                     }
                     this.$set(this.formData, "province", provinceName)
                     this.$set(this.formData, "city", cityName)
                     this.$set(this.formData, "county", countyName)
-
                 }
-
             },
             openAddress() {
-                this.formData = {}
+                this.formData = {
+                    userName: "${@shiro.getPrincipalProperty('username')}",
+                    tel: "${@shiro.getPrincipalProperty('mobile')}"
+                }
                 this.dialogVisible = true
-                if (this.$refs["addForm"])
-                    this.$refs["addForm"].resetFields();
+                if (this.$refs["addForm"]) this.$refs["addForm"].resetFields()
             },
             doSaveUserAddress() {
                 this.$refs["addForm"].validate(async (valid) => {
@@ -194,72 +195,69 @@ layout("/layouts/platform.html"){
                             this.doSearch()
                             this.$message({
                                 message: resp.msg,
-                                type: 'success'
-                            });
+                                type: "success"
+                            })
                             this.dialogVisible = false
                         } else {
-                            this.$message.error(resp.msg);
+                            this.$message.error(resp.msg)
                         }
                     }
                 })
             },
             doDelete(id) {
-                this.$confirm('此操作将永久删除该地址, 是否继续?', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
+                this.$confirm("此操作将永久删除该地址, 是否继续?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
                 }).then(async () => {
-                    const resp = await $.post("/mobile/welfare/mine/deleteAddress", {id: id})
+                    const resp = await $.post("/mobile/welfare/mine/deleteAddress", { id: id })
                     if (resp.code === 0) {
                         this.doSearch()
                         this.$message({
-                            type: 'success',
+                            type: "success",
                             message: resp.msg
-                        });
+                        })
                     } else {
-                        this.$message.error(resp.msg);
+                        this.$message.error(resp.msg)
                     }
                 })
             },
             openEdit(row) {
                 row.addressList = []
-                const province = chengShiList.find(c => c.label === row.province)
+                const province = chengShiList.find((c) => c.label === row.province)
                 row.addressList.push(province.value)
-                const city = province.children.find(p => p.label === row.city)
+                const city = province.children.find((p) => p.label === row.city)
                 row.addressList.push(city.value)
-                const county = city.children.find(p => p.label === row.county)
-                if (county) {
-                    row.addressList.push(county.value)
+                if (row.county) {
+                    const county = city.children.find((p) => p.label === row.county)
+                    if (county) {
+                        row.addressList.push(county.value)
+                    }
                 }
-                this.formData = row
+
+                this.formData = { ...row }
+                this.formData.isDefault = this.formData.isDefault ? "1" : "0"
                 this.dialogVisible = true
             },
             async doDefault(row) {
-                const resp = await $.post(loc()+"/doDefault", {id: row.id})
+                const resp = await $.post(loc() + "/doDefault", { id: row.id })
                 if (resp.code === 0) {
                     this.doSearch()
                     this.$message({
-                        type: 'success',
+                        type: "success",
                         message: resp.msg
-                    });
+                    })
                 } else {
-                    this.$message.error(resp.msg);
+                    this.$message.error(resp.msg)
                 }
-
-            },
-
+            }
         },
         async created() {
             this.pageData()
-           /* if ("${@shiro.hasRole('sysadmin')}" === 'false') {
-                this.dzOptions = this.dzOptions.filter(d => d.label === "江苏省")
-                this.dzOptions[0].children = this.dzOptions[0].children.filter(d => d.label === "无锡市")
-            }*/
         }
     })
 </script>
 
-
 <!--#
 }
 #-->
diff --git a/src/main/resources/views/platform/welfare/mine.html b/src/main/resources/views/platform/welfare/mine.html
index 3b1dc3f..a58078a 100644
--- a/src/main/resources/views/platform/welfare/mine.html
+++ b/src/main/resources/views/platform/welfare/mine.html
@@ -25,26 +25,24 @@ layout("/layouts/platform.html"){
         font-size: 13px;
         color: #868282;
     }
-
 </style>
 
-
 <div id="app" v-cloak>
     <guava :edit_scroll="false" ref="guava">
         <template>
             <el-card shadow="never">
                 <div class="search">
-
                     <div class="search-item">
                         <div class="search-item-label">年度：</div>
                         <div class="search-item-option">
                             <el-date-picker
-                                    :clearable="true"
-                                    placeholder="选择年"
-                                    type="year"
-                                    v-model="pageForm.year"
-                                    value-format="yyyy">
-                            </el-date-picker>
+                                :clearable="true"
+                                placeholder="选择年"
+                                type="year"
+                                style="width: 100%"
+                                v-model="pageForm.year"
+                                value-format="yyyy"
+                            ></el-date-picker>
                         </div>
                     </div>
 
@@ -59,38 +57,48 @@ layout("/layouts/platform.html"){
                            </div>-->
 
                     <div class="search-query">
-                        <el-button @click="doSearch" icon="el-icon-search" type="primary">搜索
-                        </el-button>
+                        <el-button @click="doSearch" icon="el-icon-search" type="primary">搜索</el-button>
                     </div>
                 </div>
             </el-card>
             <el-card class="mt10" shadow="never">
                 <table-tool :app="this" label="我的福利">
-                    <template #func>
-
-                    </template>
+                    <template #func></template>
                 </table-tool>
 
-                <el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"
-                          class="vi-table" ref="table"
-                          row-key="id" style="width: 100%" v-loading="tableLoading">
-
-
-                    <el-table-column :index="indexMethod" align="center" header-align="center"
-                                     label="序号" type="index"
-                                     width="80px"></el-table-column>
+                <el-table
+                    :data="tableData"
+                    :size="tableSize"
+                    @sort-change="pageOrder"
+                    class="vi-table"
+                    ref="table"
+                    row-key="id"
+                    style="width: 100%"
+                    v-loading="tableLoading"
+                >
+                    <el-table-column
+                        :index="indexMethod"
+                        align="center"
+                        header-align="center"
+                        label="序号"
+                        type="index"
+                        width="80px"
+                    ></el-table-column>
 
                     <el-table-column
-                            :label="column.label"
-                            :prop="column.prop"
-                            :sortable="column.sortable"
-                            :width="column.width"
-                            align="center"
-                            header-align="center"
-                            min-width="100px" show-overflow-tooltip v-for="column in tableColumns">
+                        :label="column.label"
+                        :prop="column.prop"
+                        :sortable="column.sortable"
+                        :width="column.width"
+                        align="center"
+                        header-align="center"
+                        min-width="100px"
+                        show-overflow-tooltip
+                        v-for="column in tableColumns"
+                    >
                         <template scope="{row}" v-if="column.prop=='choiceTime'">
-                            <i class="el-icon-time"></i>&ensp;
-                            {{moment(row.choiceTimeStart).format('YYYY/MM/DD HH:mm')}}
+                            <i class="el-icon-time"></i>
+                            &ensp; {{moment(row.choiceTimeStart).format('YYYY/MM/DD HH:mm')}}
                             <span>- {{moment(row.choiceTimeEnd).format('YYYY/MM/DD HH:mm')}}</span>
                         </template>
 
@@ -101,9 +109,7 @@ layout("/layouts/platform.html"){
 
                         <template scope="{row}" v-else-if="column.prop=='gist_list'">
                             <template v-if="!projectInfo.flexible">{{projectInfo.gift}}</template>
-                            <template v-if="row.gist_list">
-                                {{row.gifts.map(v=>v.name + '（'+v.num+'份）').join('，')}}
-                            </template>
+                            <template v-if="row.gist_list">{{row.gifts.map(v=>v.name + '（'+v.num+'份）').join('，')}}</template>
                         </template>
 
                         <template scope="{row}" v-else-if="column.prop=='receiveAddress'">
@@ -112,33 +118,21 @@ layout("/layouts/platform.html"){
                         </template>
 
                         <template scope="{row}" v-else-if="column.prop=='courierNumber'">
-                            <span @click="viewCourierNumber(row)" class="text-primary"
-                                  style="cursor: pointer">点击查看</span>
+                            <span @click="viewCourierNumber(row)" class="text-primary" style="cursor: pointer">点击查看</span>
                         </template>
-
-
                     </el-table-column>
 
-                    <el-table-column align="center" fixed="right" header-align="center"
-                                     label="操作" prop="userOnline"
-                                     width="200px">
+                    <el-table-column align="center" fixed="right" header-align="center" label="操作" prop="userOnline" width="200px">
                         <template scope="{row}">
-                            <el-button @click="openView(row)" size="mini" type="primary">
-                                查看
-                            </el-button>
+                            <el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
                             <!--                            <el-button :disabled="!row.courierNumber" @click="openExpress(row)"-->
                             <!--                                       size="mini"-->
                             <!--                                       type="primary">-->
                             <!--                                查看物流-->
                             <!--                            </el-button>-->
-                            <el-button :disabled="!row.courierNumber" @click="openEvaluate(row)"
-                                       size="mini"
-                                       type="primary">
-                                评价
-                            </el-button>
+                            <el-button :disabled="!row.courierNumber" @click="openEvaluate(row)" size="mini" type="primary">评价</el-button>
                         </template>
                     </el-table-column>
-
                 </el-table>
                 <!--#include("/layouts/pagination.html"){}#-->
             </el-card>
@@ -148,29 +142,20 @@ layout("/layouts/platform.html"){
             <el-card shadow="never">
                 <el-form :model="formData" label-width="120px" ref="addForm">
                     <el-form-item label="福利名称">
-                        <span style="font-weight: bold;font-size: 20px">{{projectInfo.name}}</span>
+                        <span style="font-weight: bold; font-size: 20px">{{projectInfo.name}}</span>
                     </el-form-item>
                     <el-row :gutter="10">
                         <el-col span="8">
-                            <el-form-item label="福利节日">
-                                {{projectInfo.festival}}
-                            </el-form-item>
+                            <el-form-item label="福利节日">{{projectInfo.festival}}</el-form-item>
                         </el-col>
                         <el-col span="8" v-if="!projectInfo.flexible">
-                            <el-form-item label="福利礼品">
-                                {{projectInfo.gift}}
-                            </el-form-item>
+                            <el-form-item label="福利礼品">{{projectInfo.gift}}</el-form-item>
                         </el-col>
                         <el-col span="8">
-
-                            <el-form-item label="选择形式">
-                                {{projectInfo.isCheckBox==='checkBox'?'多选':'单选'}}
-                            </el-form-item>
+                            <el-form-item label="选择形式">{{projectInfo.isCheckBox==='checkBox'?'多选':'单选'}}</el-form-item>
                         </el-col>
                         <el-col span="8" v-if="projectInfo.isCheckBox==='checkBox'">
-                            <el-form-item label="最多选几个">
-                                {{projectInfo.multiSelectNum}}个
-                            </el-form-item>
+                            <el-form-item label="最多选几个">{{projectInfo.multiSelectNum}}个</el-form-item>
                         </el-col>
                         <el-col span="8">
                             <el-form-item label="发放形式">
@@ -189,75 +174,52 @@ layout("/layouts/platform.html"){
                             </el-form-item>
                         </el-col>
                         <el-col span="8">
-                            <el-form-item label="选择时间">
-                                {{projectInfo.choiceTimeStart}}至{{projectInfo.choiceTimeEnd}}
-                            </el-form-item>
+                            <el-form-item label="选择时间">{{projectInfo.choiceTimeStart}}至{{projectInfo.choiceTimeEnd}}</el-form-item>
                         </el-col>
                     </el-row>
                     <el-form-item label="福利套餐">
                         <el-row :gutter="0">
-                            <div :key="subject.id"
-                                 v-for="subject in projectInfo.welfareProjectSubjects">
-                                <el-col :key="oidx" :span="6"
-                                        v-for="(option, oidx) in subject.options">
-                                    <el-card shadow="never"
-                                             style="margin: 5px;">
-
-                                        <div slot="header"
-                                             style="display: flex;justify-content: space-between">
+                            <div :key="subject.id" v-for="subject in projectInfo.welfareProjectSubjects">
+                                <el-col :key="oidx" :span="6" v-for="(option, oidx) in subject.options">
+                                    <el-card shadow="never" style="margin: 5px">
+                                        <div slot="header" style="display: flex; justify-content: space-between">
+                                            <div>{{option.optionName}}</div>
                                             <div>
-                                                {{option.optionName}}
-                                            </div>
-                                            <div>
-                                                <el-button @click.stop="viewDesc(option)"
-                                                           type="text">套餐详情
-                                                </el-button>
+                                                <el-button @click.stop="viewDesc(option)" type="text">套餐详情</el-button>
                                             </div>
                                         </div>
 
                                         <el-row :gutter="10">
                                             <el-col :span="24">
                                                 <div class="optionImg">
-                                                    <el-image
-                                                            :src="CREATE_PREVIEW_URL(option.imgUrl)"
-                                                            fit="contain"
-                                                    ></el-image>
+                                                    <el-image :src="CREATE_PREVIEW_URL(option.imgUrl)" fit="contain"></el-image>
                                                 </div>
-
                                             </el-col>
                                         </el-row>
 
                                         <el-row :gutter="10" v-if="option.supplier">
                                             <el-col :span="24">
-                                                <div class="descriptionClass">
-                                                    {{removeHTMLTag(option.supplier)}}
-                                                </div>
+                                                <div class="descriptionClass">{{removeHTMLTag(option.supplier)}}</div>
                                             </el-col>
                                         </el-row>
 
                                         <el-row style="">
-                                            <el-input-number disabled
-                                                             style="width: 100%"
-                                                             v-model="option.selectNum"></el-input-number>
+                                            <el-input-number disabled style="width: 100%" v-model="option.selectNum"></el-input-number>
                                         </el-row>
-
                                     </el-card>
                                 </el-col>
                             </div>
                         </el-row>
                     </el-form-item>
-                    <el-form-item
-                            label="收货地址"
-                            prop="receiveAddress" v-if="projectInfo.provideMode===3">
-                        {{formData.receiveAddress}}
-                    </el-form-item>
-
+                    <el-form-item label="收货地址" prop="receiveAddress" v-if="projectInfo.provideMode===3">{{formData.receiveAddress}}</el-form-item>
 
                     <el-form-item label="签字" prop="sign" v-if="projectInfo.signMode===2">
-                        <el-image :src="'/signature/getSignData?path=' +formData.imageUrl"
-                                  fit="contain"
-                                  style="height: 100px;width: 100%" v-if="formData.imageUrl">
-                        </el-image>
+                        <el-image
+                            :src="'/signature/getSignData?path=' +formData.imageUrl"
+                            fit="contain"
+                            style="height: 100px; width: 100%"
+                            v-if="formData.imageUrl"
+                        ></el-image>
                         <span v-else>暂无</span>
                     </el-form-item>
                 </el-form>
@@ -265,86 +227,67 @@ layout("/layouts/platform.html"){
         </template>
     </guava>
 
-
-    <el-dialog
-            :close-on-click-modal="false"
-            :visible.sync="evaluateDialogVisible"
-            title="福利评价"
-            width="40%">
+    <el-dialog :close-on-click-modal="false" :visible.sync="evaluateDialogVisible" title="福利评价" width="40%">
         <el-form :model="formData" label-width="80px" ref="form">
             <el-form-item :rules="[{ required: true, message: ''}]" label="评价套餐">
-                <el-radio-group
-                        @change="finOneWelfareEvaluate(formData.projectId,formData.optionId)"
-                        v-model="formData.optionId">
+                <el-radio-group @change="finOneWelfareEvaluate(formData.projectId,formData.optionId)" v-model="formData.optionId">
                     <el-row gutter="10">
-                        <el-col :key="item.selectOptionId" class="mt10" span="24"
-                                v-for="item in userSelection">
-                            <el-radio :label="item.selectOptionId" border style="width: 100%;position: relative">
+                        <el-col :key="item.selectOptionId" class="mt10" span="24" v-for="item in userSelection">
+                            <el-radio :label="item.selectOptionId" border style="width: 100%; position: relative">
                                 {{item.optionName}}
-                                <span style="color: red;position: absolute;right: 10px;" v-if="!item.isPj">未评价</span>
+                                <span style="color: red; position: absolute; right: 10px" v-if="!item.isPj">未评价</span>
                             </el-radio>
                         </el-col>
                     </el-row>
-
                 </el-radio-group>
             </el-form-item>
             <el-form-item :rules="[{ required: true, message: ''}]" label="评分">
-                <div style="position: absolute; top: 20%;">
-                    <el-rate :disabled="formData.id"
-                             show-score text-color="#ff9900"
-                             v-model="formData.evaluateScore"></el-rate>
+                <div style="position: absolute; top: 20%">
+                    <el-rate :disabled="formData.id" show-score text-color="#ff9900" v-model="formData.evaluateScore"></el-rate>
                 </div>
             </el-form-item>
             <el-form-item label="评价">
-                <el-input :disabled="formData.id"
-                          maxlength="500"
-                          placeholder="请输入评价"
-                          rows="5"
-                          show-word-limit
-                          type="textarea"
-                          v-model="formData.evaluateText"
-                >
-                </el-input>
+                <el-input
+                    :disabled="formData.id"
+                    maxlength="500"
+                    placeholder="请输入评价"
+                    rows="5"
+                    show-word-limit
+                    type="textarea"
+                    v-model="formData.evaluateText"
+                ></el-input>
             </el-form-item>
         </el-form>
         <span class="dialog-footer" slot="footer">
             <el-button @click="evaluateDialogVisible = false" type="primary">关 闭</el-button>
-            <el-button :loading="evaluateLoading" @click="doEvaluate" type="primary"
-                       v-if="!formData.id">提 交</el-button>
-          </span>
+            <el-button :loading="evaluateLoading" @click="doEvaluate" type="primary" v-if="!formData.id">提 交</el-button>
+        </span>
     </el-dialog>
 
-    <el-drawer
-            :visible.sync="descDialogVisible"
-            direction="rtl"
-            size="50%"
-            title="福利详情">
+    <el-drawer :visible.sync="descDialogVisible" direction="rtl" size="50%" title="福利详情">
         <el-card style="margin: 20px">
             <div v-html="descData"></div>
         </el-card>
     </el-drawer>
 
-    <el-drawer
-            :visible.sync="expressDrawer"
-            direction="rtl"
-            size="50%">
+    <el-drawer :visible.sync="expressDrawer" direction="rtl" size="50%">
         <template #title>
-            <div style="font-size: 20px">物流详情
+            <div style="font-size: 20px">
+                物流详情
                 <span style="color: red">&nbsp;&nbsp;温馨提示：物流信息一小时更新一次</span>
             </div>
         </template>
         <el-card style="margin: 30px">
             <el-timeline reverse="true">
                 <el-timeline-item
-                        :color="item.color"
-                        :key="index"
-                        :timestamp="moment().format('YYYY-MM-DD HH:mm:ss')"
-                        v-for="(item, index) in logisticsTrace.logisticsTraceDetailList">
+                    :color="item.color"
+                    :key="index"
+                    :timestamp="moment().format('YYYY-MM-DD HH:mm:ss')"
+                    v-for="(item, index) in logisticsTrace.logisticsTraceDetailList"
+                >
                     {{item.desc}}
                 </el-timeline-item>
             </el-timeline>
-
-
         </el-card>
     </el-drawer>
 
@@ -353,7 +296,7 @@ layout("/layouts/platform.html"){
 </div>
 <script>
     const vue = new Vue({
-        el: '#app',
+        el: "#app",
         mixins: [initTableMixins],
         data() {
             return {
@@ -361,7 +304,7 @@ layout("/layouts/platform.html"){
                 descDialogVisible: false,
                 projectInfo: {},
                 userSelection: [],
-                userId: '',
+                userId: "",
                 projectOptions: [],
                 units: [],
                 welfareUnits: [],
@@ -370,18 +313,17 @@ layout("/layouts/platform.html"){
                 welfareSignMode: [],
                 welfareNoticePushMode: [],
                 pageForm: {
-                    year: moment().format('YYYY'),
-                    searchName: 'username'
+                    year: moment().format("YYYY"),
+                    searchName: "username"
                 },
                 tableColumns: [
-                    {prop: 'year', label: '年度'},
-                    {prop: 'name', label: '项目名称'},
-                    {prop: 'choiceTime', label: '选择时间'},
-                    {prop: 'isChoose', label: '是否选择'},
-                    {prop: 'gist_list', label: '所选福利'},
-                    {prop: 'receiveAddress', label: '收货地址'},
-                    {prop: 'courierNumber', label: '快递单号', sortable: true},
-
+                    { prop: "year", label: "年度" },
+                    { prop: "name", label: "项目名称" },
+                    { prop: "choiceTime", label: "选择时间" },
+                    { prop: "isChoose", label: "是否选择" },
+                    { prop: "gist_list", label: "所选福利" },
+                    { prop: "receiveAddress", label: "收货地址" },
+                    { prop: "courierNumber", label: "快递单号", sortable: true }
                 ],
                 formRules: {},
                 selPersonType: [],
@@ -392,12 +334,11 @@ layout("/layouts/platform.html"){
                 evaluateLoading: false,
 
                 expressDrawer: false,
-                logisticsTrace: {},
-
+                logisticsTrace: {}
             }
         },
         components: {
-            'courier-number-info': httpVueLoader('/components/welfare/CourierNumberInfo.vue?v=' + new Date().getTime())
+            "courier-number-info": httpVueLoader("/components/welfare/CourierNumberInfo.vue?v=" + new Date().getTime())
         },
         methods: {
             //查看快递单号
@@ -411,15 +352,15 @@ layout("/layouts/platform.html"){
             async doEvaluate() {
                 if (!this.formData.evaluateScore || !this.formData.optionId) {
                     this.$message({
-                        message: '请打分后再提交',
-                        type: 'warning'
-                    });
+                        message: "请打分后再提交",
+                        type: "warning"
+                    })
                     return
                 }
-                const confirm = await this.$confirm('提交后将不能修改，确定要提交评价吗？', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning'
+                const confirm = await this.$confirm("提交后将不能修改，确定要提交评价吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
                 })
                 if (confirm === "confirm") {
                     this.evaluateLoading = true
@@ -427,24 +368,18 @@ layout("/layouts/platform.html"){
                     if (resp.code === 0) {
                         this.$message({
                             message: resp.msg,
-                            type: 'success'
-                        });
+                            type: "success"
+                        })
                         this.doSearch()
                         this.evaluateDialogVisible = false
                     } else {
-                        this.$message.error(resp.msg);
+                        this.$message.error(resp.msg)
                     }
                     this.evaluateLoading = false
                 }
-
             },
             async finOneWelfareEvaluate(projectId, optionId) {
-
-                const {
-                    data,
-                    code,
-                    msg
-                } = await $.post(loc() + "/finOneWelfareEvaluate", {
+                const { data, code, msg } = await $.post(loc() + "/finOneWelfareEvaluate", {
                     projectId: projectId,
                     optionId: optionId
                 })
@@ -470,7 +405,7 @@ layout("/layouts/platform.html"){
                 this.evaluateDialogVisible = true
             },
             async getProjectInfo(id) {
-                const resp = await $.get('/platform/welfare/common/findOne', {projectId: id})
+                const resp = await $.get("/platform/welfare/common/findOne", { projectId: id })
                 if (resp.code === 0) {
                     this.projectInfo = resp.data
                     await this.getUserSelection(id)
@@ -479,14 +414,14 @@ layout("/layouts/platform.html"){
             },
             //获取用户选择的数据
             async getUserSelection(projectId) {
-                const resp = await $.get('/platform/welfare/mine/getUserSelection', {projectId: projectId})
+                const resp = await $.get("/platform/welfare/mine/getUserSelection", { projectId: projectId })
                 this.userSelection = resp.data
             },
             //回显用户选择的数据
             echoUserSelection() {
                 //获取用户当前选择的数量
-                this.projectInfo.welfareProjectSubjects[0].options.forEach(v => {
-                    const option = this.userSelection.find(x => x.selectOptionId === v.id)
+                this.projectInfo.welfareProjectSubjects[0].options.forEach((v) => {
+                    const option = this.userSelection.find((x) => x.selectOptionId === v.id)
                     if (option) {
                         v.selectNum = option.selectNum
                     } else {
@@ -508,7 +443,7 @@ layout("/layouts/platform.html"){
                 this.$refs.guava.edit()
             },
             async getExpressInfo(row) {
-                const resp = await $.get(loc() + '/getExpressInfo', {courierNumber: row.courierNumber})
+                const resp = await $.get(loc() + "/getExpressInfo", { courierNumber: row.courierNumber })
                 if (resp.code === 0) {
                     for (let i = 0; i < resp.data.logisticsTraceDetailList.length; i++) {
                         if (i === resp.data.logisticsTraceDetailList.length - 1) {
@@ -518,17 +453,16 @@ layout("/layouts/platform.html"){
                     }
                     this.logisticsTrace = resp.data
                 } else {
-                    this.$message.error(resp.msg);
+                    this.$message.error(resp.msg)
                 }
-            },
-
+            }
         },
         async created() {
             this.pageData()
-            getEnumOptions("WelfareProvideMode").then(res => {
+            getEnumOptions("WelfareProvideMode").then((res) => {
                 this.welfareProvideMode = res
             })
-            getEnumOptions("WelfareSignMode").then(res => {
+            getEnumOptions("WelfareSignMode").then((res) => {
                 this.welfareSignMode = res
             })
         }
diff --git a/src/main/resources/views/platform/welfare/project/ProjectMange.html b/src/main/resources/views/platform/welfare/project/ProjectMange.html
index 9cd74c1..088b4c3 100644
--- a/src/main/resources/views/platform/welfare/project/ProjectMange.html
+++ b/src/main/resources/views/platform/welfare/project/ProjectMange.html
@@ -4,7 +4,7 @@ layout("/layouts/platform.html"){
 <style>
     .flexible-gifts {
         display: flex;
-        flex-direction: column
+        flex-direction: column;
     }
 
     .flexible-gifts-item {
@@ -37,7 +37,7 @@ layout("/layouts/platform.html"){
     }
 
     .avatar-uploader .el-upload:hover {
-        border-color: #409EFF;
+        border-color: #409eff;
     }
 
     .avatar-uploader-icon {
@@ -54,7 +54,6 @@ layout("/layouts/platform.html"){
         height: 178px;
         display: block;
     }
-
 </style>
 
 <div class="platform" id="app" v-cloak>
@@ -62,70 +61,68 @@ layout("/layouts/platform.html"){
         <template>
             <el-card shadow="never">
                 <div class="search">
-
                     <div class="search-item">
                         <div class="search-item-label">年&emsp;&emsp;度：</div>
                         <div class="search-item-option">
                             <el-date-picker
-                                    placeholder="请选择"
-                                    style="width: 100%"
-                                    type="year"
-                                    v-model="pageForm.year"
-                                    value-format="yyyy">
-                            </el-date-picker>
+                                placeholder="请选择"
+                                style="width: 100%"
+                                type="year"
+                                v-model="pageForm.year"
+                                value-format="yyyy"
+                            ></el-date-picker>
                         </div>
                     </div>
 
                     <div class="search-item">
                         <div class="search-item-label">项目名称：</div>
                         <div class="search-item-option">
-                            <el-input @keyup.enter.native="doSearch" clearable placeholder="请输入内容"
-                                      style="width:100%" v-model="pageForm.name"></el-input>
+                            <el-input
+                                @keyup.enter.native="doSearch"
+                                clearable
+                                placeholder="请输入内容"
+                                style="width: 100%"
+                                v-model="pageForm.name"
+                            ></el-input>
                         </div>
                     </div>
 
                     <div class="search-query">
-                        <el-button @click="doSearch" icon="el-icon-search" type="primary">搜索
-                        </el-button>
+                        <el-button @click="doSearch" icon="el-icon-search" type="primary">搜索</el-button>
                     </div>
                 </div>
             </el-card>
             <el-card class="mt10" shadow="never">
                 <table-tool :app="this" label="福利项目">
                     <template #func>
-                        <el-button @click="openAdd" icon="el-icon-plus" size="small"
-                                   type="primary"
-                                   v-if="judgmentAuthority">新建福利项目
-                        </el-button>
+                        <el-button @click="openAdd" icon="el-icon-plus" size="small" type="primary" v-if="judgmentAuthority">新建福利项目</el-button>
                     </template>
                 </table-tool>
 
-                <el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"
-                          class="vi-table" ref="table"
-                          row-key="id" style="width: 100%" v-loading="tableLoading">
-
+                <el-table
+                    :data="tableData"
+                    :size="tableSize"
+                    @sort-change="pageOrder"
+                    class="vi-table"
+                    ref="table"
+                    row-key="id"
+                    style="width: 100%"
+                    v-loading="tableLoading"
+                >
                     <el-table-column type="expand">
                         <template scope="{row}">
                             <vi-title title="详细信息"></vi-title>
                             <el-form label-suffix="：" label-width="120px">
-
-
                                 <el-row gutter="20">
                                     <el-col span="8">
-                                        <el-form-item label="项目名称">
-                                            {{ row.name }}
-                                        </el-form-item>
+                                        <el-form-item label="项目名称">{{ row.name }}</el-form-item>
                                     </el-col>
                                     <el-col span="8">
-                                        <el-form-item label="发放节日">
-                                            {{ row.festival }}
-                                        </el-form-item>
+                                        <el-form-item label="发放节日">{{ row.festival }}</el-form-item>
                                     </el-col>
                                 </el-row>
 
-                                <el-form-item label="发放地点">
-                                    {{ row.provideAddress }}
-                                </el-form-item>
+                                <el-form-item label="发放地点">{{ row.provideAddress }}</el-form-item>
 
                                 <el-row gutter="20">
                                     <el-col span="8">
@@ -134,30 +131,37 @@ layout("/layouts/platform.html"){
                                         </el-form-item>
                                     </el-col>
                                     <el-col span="8">
-                                        <el-form-item label="签收形式">
-                                            {{welfareSignMode.find(v=>v.code==row.signMode).description}}
-                                        </el-form-item>
+                                        <el-form-item label="签收形式">{{welfareSignMode.find(v=>v.code==row.signMode).description}}</el-form-item>
                                     </el-col>
                                 </el-row>
                             </el-form>
                         </template>
                     </el-table-column>
 
-                    <el-table-column :index="indexMethod" align="center" header-align="center"
-                                     label="序号" type="index"
-                                     width="80px"></el-table-column>
+                    <el-table-column
+                        :index="indexMethod"
+                        align="center"
+                        header-align="center"
+                        label="序号"
+                        type="index"
+                        width="80px"
+                    ></el-table-column>
 
                     <el-table-column
-                            :label="column.label"
-                            :prop="column.prop"
-                            :sortable="column.sortable"
-                            :width="column.width"
-                            align="center"
-                            header-align="center"
-                            min-width="100px" show-overflow-tooltip v-for="column in tableColumns">
+                        :label="column.label"
+                        :prop="column.prop"
+                        :sortable="column.sortable"
+                        :width="column.width"
+                        align="center"
+                        header-align="center"
+                        min-width="100px"
+                        show-overflow-tooltip
+                        v-for="column in tableColumns"
+                    >
                         <template scope="{row}" v-if="column.prop=='provideTimeStart'">
-                            <i class="el-icon-time"></i>&ensp;{{row.provideTimeStart}} <span
-                                v-if="row.provideTimeEnd">- {{row.provideTimeEnd}}</span>
+                            <i class="el-icon-time"></i>
+                            &ensp;{{row.provideTimeStart}}
+                            <span v-if="row.provideTimeEnd">- {{row.provideTimeEnd}}</span>
                         </template>
                         <template scope="{row}" v-if="column.prop=='gift'">
                             <span v-if="row.flexible">福利套餐</span>
@@ -167,17 +171,12 @@ layout("/layouts/platform.html"){
 
                     <el-table-column label="是否发布">
                         <template scope="{row}">
-                            <span class="text-success" v-if="!row.isDisabled">
-                                是
-                            </span>
-                            <span class="text-danger" v-else>
-                                否
-                            </span>
+                            <span class="text-success" v-if="!row.isDisabled">是</span>
+                            <span class="text-danger" v-else>否</span>
                         </template>
                     </el-table-column>
 
-                    <el-table-column align="center" header-align="center" label="操作"
-                                     prop="userOnline" width="150px">
+                    <el-table-column align="center" header-align="center" label="操作" prop="userOnline" width="150px">
                         <template scope="{row}">
                             <el-dropdown @command="dropdownCommand">
                                 <el-button :loading="submitLoading" plain size="mini">
@@ -185,50 +184,29 @@ layout("/layouts/platform.html"){
                                     <span class="ti-angle-down"></span>
                                 </el-button>
                                 <el-dropdown-menu slot="dropdown">
-                                    <el-dropdown-item :command="{type:'openCode',data:row}">
-                                        二维码
-                                    </el-dropdown-item>
-                                    <el-dropdown-item :command="{type:'status',data:row}">
-                                        {{row.isDisabled?'发布':'关闭'}}
-                                    </el-dropdown-item>
-                                    <el-dropdown-item :command="{type:'sendMsg',data:row}">
-                                        通知未选择人员
-                                    </el-dropdown-item>
-                                    <el-dropdown-item
-                                            :command="{type:'createList2',data:row}"
-                                            v-if="row.created">
-                                        更新福利名单
-                                    </el-dropdown-item>
+                                    <el-dropdown-item :command="{type:'openCode',data:row}">二维码</el-dropdown-item>
+                                    <el-dropdown-item :command="{type:'status',data:row}">{{row.isDisabled?'发布':'关闭'}}</el-dropdown-item>
+                                    <el-dropdown-item :command="{type:'sendMsg',data:row}">通知未选择人员</el-dropdown-item>
+                                    <el-dropdown-item :command="{type:'createList2',data:row}" v-if="row.created">更新福利名单</el-dropdown-item>
 
-                                    <el-dropdown-item
-                                            :command="{type:'createList',data:row}"
-                                            v-if="judgmentAuthority">
+                                    <el-dropdown-item :command="{type:'createList',data:row}" v-if="judgmentAuthority">
                                         {{row.created?'重置福利名单':'生成福利名单'}}
                                     </el-dropdown-item>
 
-                                    <el-dropdown-item :command="{type:'edit',data:row}"
-                                                      v-if="judgmentAuthority">
-                                        编辑
-                                    </el-dropdown-item>
+                                    <el-dropdown-item :command="{type:'edit',data:row}" v-if="judgmentAuthority">编辑</el-dropdown-item>
 
-                                    <el-dropdown-item :command="{type:'delete',data:row}"
-                                                      v-if="judgmentAuthority">
-                                        删除
-                                    </el-dropdown-item>
+                                    <el-dropdown-item :command="{type:'delete',data:row}" v-if="judgmentAuthority">删除</el-dropdown-item>
                                 </el-dropdown-menu>
                             </el-dropdown>
-
                         </template>
                     </el-table-column>
-
                 </el-table>
                 <!--#include("/layouts/pagination.html"){}#-->
             </el-card>
         </template>
 
         <template #edit>
-            <el-form :model="formData" :rules="formRules" label-width="150px" ref="form"
-                     v-loading="formLoading">
+            <el-form :model="formData" :rules="formRules" label-width="150px" ref="form" v-loading="formLoading">
                 <vi-title title="福利项目信息"></vi-title>
 
                 <el-form-item label="项目名称" prop="name">
@@ -238,27 +216,23 @@ layout("/layouts/platform.html"){
                 <el-row>
                     <el-col span="12">
                         <el-form-item label="发放节日" prop="festival">
-                            <el-select filterable
-                                       placeholder="发放节日"
-                                       style="width: 100%"
-                                       v-model="formData.festival">
-                                <el-option :key="f" :label="f" :value="f"
-                                           v-for="f in festival"></el-option>
+                            <el-select filterable placeholder="发放节日" style="width: 100%" v-model="formData.festival">
+                                <el-option :key="f" :label="f" :value="f" v-for="f in festival"></el-option>
                             </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col span="12">
                         <el-form-item label="选择时间" prop="choiceTime">
                             <el-date-picker
-                                    @change="choiceTimeChange"
-                                    end-placeholder="结束时间"
-                                    range-separator="-"
-                                    start-placeholder="开始时间"
-                                    style="width: 100%"
-                                    type="datetimerange"
-                                    v-model="formData.choiceTime"
-                                    value-format="yyyy-MM-dd HH:mm:ss">
-                            </el-date-picker>
+                                @change="choiceTimeChange"
+                                end-placeholder="结束时间"
+                                range-separator="-"
+                                start-placeholder="开始时间"
+                                style="width: 100%"
+                                type="datetimerange"
+                                v-model="formData.choiceTime"
+                                value-format="yyyy-MM-dd HH:mm:ss"
+                            ></el-date-picker>
                         </el-form-item>
                     </el-col>
                     <!--       <el-col span="12">
@@ -280,13 +254,13 @@ layout("/layouts/platform.html"){
                     <el-col span="12">
                         <el-form-item label="逾期选择时间" prop="overdueChoiceTimeEnd">
                             <el-date-picker
-                                    @change="choiceTimeChange"
-                                    placeholder="逾期未选择最后选择截至时间"
-                                    style="width: 100%"
-                                    type="datetime"
-                                    v-model="formData.overdueChoiceTimeEnd"
-                                    value-format="yyyy-MM-dd HH:mm:ss">
-                            </el-date-picker>
+                                @change="choiceTimeChange"
+                                placeholder="逾期未选择最后选择截至时间"
+                                style="width: 100%"
+                                type="datetime"
+                                v-model="formData.overdueChoiceTimeEnd"
+                                value-format="yyyy-MM-dd HH:mm:ss"
+                            ></el-date-picker>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -294,16 +268,14 @@ layout("/layouts/platform.html"){
                 <el-row>
                     <el-col span="4">
                         <el-form-item label="是否福利套餐" prop="flexible">
-                            <el-switch @change="isCheckBoxChange" v-model="formData.flexible">
-                            </el-switch>
+                            <el-switch @change="isCheckBoxChange" v-model="formData.flexible"></el-switch>
                         </el-form-item>
                     </el-col>
-                   <!-- <el-col span="4">
-                        <el-form-item label="是否全年生日蛋糕券" prop="isYearBirthday">
-                            <el-switch v-model="formData.isYearBirthday">
-                            </el-switch>
+                    <el-col span="4">
+                        <el-form-item label="是否补发生日蛋糕券" prop="isYearBirthday">
+                            <el-switch v-model="formData.isYearBirthday"></el-switch>
                         </el-form-item>
-                    </el-col>-->
+                    </el-col>
                     <!-- <el-col span="6">
                          <el-form-item label="是否常规" prop="isRoutine" v-if="formData.flexible">
                              <el-switch v-model="formData.isRoutine">
@@ -314,48 +286,43 @@ layout("/layouts/platform.html"){
                     <el-col span="4" v-if="formData.isRoutine">
                         <el-form-item label="是否多选" prop="isCheckBox">
                             <el-switch
-                                    @change="isCheckBoxChange"
-                                    active-value="checkBox"
-                                    inactive-value="radio"
-                                    v-model="formData.isCheckBox">
-                            </el-switch>
+                                @change="isCheckBoxChange"
+                                active-value="checkBox"
+                                inactive-value="radio"
+                                v-model="formData.isCheckBox"
+                            ></el-switch>
                         </el-form-item>
                     </el-col>
                     <template v-if="formData.isCheckBox=='checkBox'">
                         <el-col span="4">
-                            <el-form-item label="是否支持单个多选"
-                                          prop="singleOptionSupportMultipleSelection">
-                                <el-switch v-model="formData.singleOptionSupportMultipleSelection">
-                                </el-switch>
+                            <el-form-item label="是否支持单个多选" prop="singleOptionSupportMultipleSelection">
+                                <el-switch v-model="formData.singleOptionSupportMultipleSelection"></el-switch>
                             </el-form-item>
                         </el-col>
 
                         <el-col span="4">
                             <el-form-item label="最多选几个" prop="multiSelectNum">
-                                <el-input-number :max="10" :min="2"
-                                                 placeholder="最多选几个"
-                                                 v-model="formData.multiSelectNum"></el-input-number>
+                                <el-input-number :max="10" :min="2" placeholder="最多选几个" v-model="formData.multiSelectNum"></el-input-number>
                             </el-form-item>
                         </el-col>
                     </template>
-
                 </el-row>
 
+                <el-form-item label="人员核对名单" prop="taskId" v-if="formData.isYearBirthday">
+                    <el-select filterable placeholder="请选择人员核对名单" style="width: 100%" v-model="formData.taskId">
+                        <el-option :label="item.taskName" :value="item.id" v-for="item in memberCheckTaskOptions"></el-option>
+                    </el-select>
+                </el-form-item>
+
                 <el-form-item label="发放形式" prop="provideMode">
                     <el-radio-group size="medium" v-model="formData.provideMode">
-                        <el-radio-button :key="item.code" :label="item.code"
-                                         v-for="item in welfareProvideMode">
-                            {{item.description}}
-                        </el-radio-button>
+                        <el-radio-button :key="item.code" :label="item.code" v-for="item in welfareProvideMode">{{item.description}}</el-radio-button>
                     </el-radio-group>
                 </el-form-item>
 
                 <el-form-item label="签收形式" prop="signMode">
                     <el-radio-group size="medium" v-model="formData.signMode">
-                        <el-radio-button :key="item.code" :label="item.code"
-                                         v-for="item in welfareSignMode">
-                            {{item.description}}
-                        </el-radio-button>
+                        <el-radio-button :key="item.code" :label="item.code" v-for="item in welfareSignMode">{{item.description}}</el-radio-button>
                     </el-radio-group>
                 </el-form-item>
 
@@ -366,21 +333,16 @@ layout("/layouts/platform.html"){
                 <!--                    </el-radio-group>-->
                 <!--                </el-form-item>-->
 
-
                 <el-form-item label="福利礼品" prop="gift" v-if="!formData.flexible">
-                    <el-input maxlength="100" placeholder="福利礼品" suffix-icon="el-icon-present"
-                              v-model="formData.gift"></el-input>
+                    <el-input maxlength="100" placeholder="福利礼品" suffix-icon="el-icon-present" v-model="formData.gift"></el-input>
                 </el-form-item>
 
                 <template v-if="formData.flexible">
                     <el-form-item label="福利选项" v-if="[2,3,4].includes(formData.provideMode)">
-                        <question-naire :subject="formData.welfareProjectSubjects"
-                                        ref="questionNaire"
-                        ></question-naire>
+                        <question-naire :subject="formData.welfareProjectSubjects" ref="questionNaire"></question-naire>
                     </el-form-item>
                 </template>
 
-
                 <!--     <el-form-item prop="noticePushMode" label="通知推送">
                          <el-radio-group v-model="formData.noticePushMode" size="small">
                              <el-radio v-for="item in welfareNoticePushMode" :key="item.code"
@@ -390,39 +352,32 @@ layout("/layouts/platform.html"){
                          </el-radio-group>
                      </el-form-item>-->
 
-                <el-form-item label="发放范围" prop="conditionStructure">
-                    <el-button @click="$refs.cnd.open()" icon="el-icon-s-operation" size="small">
-                        打开
-                    </el-button>
+                <el-form-item label="发放范围" prop="conditionStructure" v-if="!formData.isYearBirthday">
+                    <el-button @click="$refs.cnd.open()" icon="el-icon-s-operation" size="small">打开</el-button>
                 </el-form-item>
 
                 <el-form-item label="封面图片" prop="cover">
-                    <image-Upload :file-size="4"
-                                  :file-type="['png','jpg']"
-                                  :height="100"
-                                  :limit="1"
-                                  :size="[500,200]"
-                                  :width="100"
-                                  ref="imageUpload"
-                                  v-model="formData.cover"></image-Upload>
+                    <image-Upload
+                        :file-size="0.2"
+                        :file-type="['png','jpg']"
+                        :height="100"
+                        :limit="1"
+                        :size="[500,200]"
+                        :width="100"
+                        ref="imageUpload"
+                        v-model="formData.cover"
+                    ></image-Upload>
                 </el-form-item>
             </el-form>
 
-            <el-row type="flex" style="justify-content: end" justify="end">
-                <el-button @click="$refs.guava.index()">
-                    取消
-                </el-button>
-                <el-button @click="save" type="primary" v-loading="submitLoading">
-                    提交
-                </el-button>
+            <el-row justify="end" style="justify-content: end" type="flex">
+                <el-button @click="$refs.guava.index()">取消</el-button>
+                <el-button @click="save" type="primary" v-loading="submitLoading">提交</el-button>
             </el-row>
         </template>
 
-        <template #view>
-
-        </template>
+        <template #view></template>
         <open-qr-code ref="openQRCode"></open-qr-code>
-
     </guava>
 
     <condition :fields="fields" ref="cnd" v-model="formData.conditionStructure"></condition>
@@ -439,97 +394,83 @@ layout("/layouts/platform.html"){
         </el-row>
     </el-dialog>
 
-    <el-dialog
-            :close-on-click-modal="false"
-            :visible.sync="sendMsgDialogVisible"
-            title="请在下方填写需要发送的内容"
-            width="50%"
-    >
+    <el-dialog :close-on-click-modal="false" :visible.sync="sendMsgDialogVisible" title="请在下方填写需要发送的内容" width="50%">
         <el-form :model="formData" label-width="80px" ref="sendForm">
-
-            <el-form-item
-                    :rules="[{required: true, message: '请选择发送方式', trigger: ['blur', 'change']}]"
-                    label="发送方式"
-                    prop="sendTypes">
-                <el-checkbox-group size="medium" v-model="formData.sendTypes">
-                    <el-checkbox border label="1">短信发送</el-checkbox>
-                    <el-checkbox border label="4">微信发送</el-checkbox>
-                </el-checkbox-group>
+            <!-- <el-form-item
+                     :rules="[{required: true, message: '请选择发送方式', trigger: ['blur', 'change']}]"
+                     label="发送方式"
+                     prop="sendTypes">
+                 <el-checkbox-group size="medium" v-model="formData.sendTypes">
+                     <el-checkbox border label="SMS">短信发送</el-checkbox>
+                     <el-checkbox border label="WeChat">微信发送</el-checkbox>
+                 </el-checkbox-group>
+             </el-form-item>
+ -->
+            <el-form-item :rules="[{required: true, message: '请选择发送内容', trigger: ['blur', 'change']}]" label="发送内容" prop="content">
+                <el-input :rows="6" placeholder="请输入内容" type="textarea" v-model="formData.content"></el-input>
             </el-form-item>
 
-            <el-form-item
-                    :rules="[{required: true, message: '请选择发送内容', trigger: ['blur', 'change']}]"
-                    label="发送内容"
-                    prop="content">
-                <el-input
-                        :rows="6"
-                        placeholder="请输入内容"
-                        type="textarea"
-                        v-model="formData.content">
-                </el-input>
-            </el-form-item>
-
-            <el-alert
-                    :title="formData.url"
-                    description="如果您发送的内容需要含有链接，请把上述内容复制到发送内容里面，不要随意修改！"
-                    show-icon
-                    type="warning">
-            </el-alert>
-
+            <!--            <el-alert-->
+            <!--                    :title="formData.url"-->
+            <!--                    description="如果您发送的内容需要含有链接，请把上述内容复制到发送内容里面，不要随意修改！"-->
+            <!--                    show-icon-->
+            <!--                    type="warning">-->
+            <!--            </el-alert>-->
         </el-form>
         <span class="dialog-footer" slot="footer">
-    <el-button @click="sendMsgDialogVisible = false">取 消</el-button>
-    <el-button @click="sendMsgToNotWelfareUsers" type="primary">确 定</el-button>
-  </span>
+            <el-button @click="sendMsgDialogVisible = false">取 消</el-button>
+            <el-button @click="sendMsgToNotWelfareUsers" type="primary">确 定</el-button>
+        </span>
     </el-dialog>
-
-
 </div>
 <script>
     <!--#include("/platform/welfare/include/common.js"){}#-->
 
     const vue = new Vue({
-        el: '#app',
+        el: "#app",
         mixins: [initTableMixins],
         data() {
             return {
                 judgmentAuthority,
                 fields: [
                     {
-                        label: '性别',
-                        value: 'sex',
+                        label: "性别",
+                        value: "sex",
                         type: "select",
-                        options: [{label: '男', value: '男'}, {label: '女', value: '女'}]
+                        options: [
+                            { label: "男", value: "男" },
+                            { label: "女", value: "女" }
+                        ]
                     },
-                    {label: '出生日期', value: 'birthday', type: "date"},
-                    {label: '是否会员', value: 'member'},
-                    {label: '是否福利会员', value: 'welfareMember'},
+                    { label: "出生日期", value: "birthday", type: "date" },
+                    { label: "是否会员", value: "member" },
+                    { label: "是否福利会员", value: "welfareMember" }
                 ],
 
                 welfareProvideMode: [],
                 welfareSignMode: [],
                 welfareNoticePushMode: [],
                 pageForm: {
-                    year: moment().format('YYYY')
+                    year: moment().format("YYYY")
                 },
                 tableColumns: [
-                    {prop: 'year', label: '年度'},
-                    {prop: 'name', label: '项目名称'},
-                    {prop: 'gift', label: '福利礼品'},
-                    {prop: 'provideTimeStart', label: '发放时间'},
+                    { prop: "year", label: "年度" },
+                    { prop: "name", label: "项目名称" },
+                    { prop: "gift", label: "福利礼品" },
+                    { prop: "provideTimeStart", label: "发放时间" }
                 ],
                 formRules: {
-                    name: [{required: true, message: '必填', trigger: ['blur', 'change']}],
-                    festival: [{required: true, message: '必选', trigger: ['blur', 'change']}],
-                    provideTime: [{required: true, message: '必选', trigger: ['blur', 'change']}],
-                    choiceTime: [{required: true, message: '必选', trigger: ['blur', 'change']}],
-                    provideAddress: [{required: true, message: '必选', trigger: ['blur', 'change']}],
-                    provideMode: [{required: true, message: '必选', trigger: ['blur', 'change']}],
-                    signMode: [{required: true, message: '必选', trigger: ['blur', 'change']}],
-                    noticePushMode: [{required: true, message: '必选', trigger: ['blur', 'change']}],
-                    gift: [{required: true, message: '必填', trigger: ['blur', 'change']}],
-                    multiSelectNum: [{required: true, message: '必填', trigger: ['blur', 'change']}],
-                    // flexible: [{required: true, message: '必填', trigger: ['blur', 'change']}],
+                    name: [{ required: true, message: "必填", trigger: ["blur", "change"] }],
+                    festival: [{ required: true, message: "必选", trigger: ["blur", "change"] }],
+                    provideTime: [{ required: true, message: "必选", trigger: ["blur", "change"] }],
+                    choiceTime: [{ required: true, message: "必选", trigger: ["blur", "change"] }],
+                    provideAddress: [{ required: true, message: "必选", trigger: ["blur", "change"] }],
+                    provideMode: [{ required: true, message: "必选", trigger: ["blur", "change"] }],
+                    signMode: [{ required: true, message: "必选", trigger: ["blur", "change"] }],
+                    noticePushMode: [{ required: true, message: "必选", trigger: ["blur", "change"] }],
+                    gift: [{ required: true, message: "必填", trigger: ["blur", "change"] }],
+                    multiSelectNum: [{ required: true, message: "必填", trigger: ["blur", "change"] }],
+                    taskId: [{ required: true, message: "必填", trigger: ["blur", "change"] }]
                 },
                 welfare,
                 welfareUnitMode,
@@ -539,19 +480,26 @@ layout("/layouts/platform.html"){
                 welfarePersonTypeList: [],
                 sendMsgValue: "",
                 sendMsgDialogVisible: false,
+
+                memberCheckTaskOptions: []
             }
         },
         components: {
-            'guava': httpVueLoader('/components/plugins/Guava.vue?v=1.0.0'),
-            'condition': httpVueLoader('/components/plugins/ConditionStructure.vue?v=1.0.0'),
-            'question-naire': httpVueLoader('/components/plugins/QuestionNaire.vue?v=' + new Date().getTime()),
-            'open-qr-code': httpVueLoader('/components/plugins/OpenQRCode.vue'),
-            'send-msg': httpVueLoader('/components/plugins/SendMsgByGroupId.vue'),
+            guava: httpVueLoader("/components/plugins/Guava.vue?v=1.0.0"),
+            condition: httpVueLoader("/components/plugins/ConditionStructure.vue?v=1.0.0"),
+            "question-naire": httpVueLoader("/components/plugins/QuestionNaire.vue?v=" + new Date().getTime()),
+            "open-qr-code": httpVueLoader("/components/plugins/OpenQRCode.vue"),
+            "send-msg": httpVueLoader("/components/plugins/SendMsgByGroupId.vue")
         },
         methods: {
-            async projectStatusChange({id, isDisabled: val}) {
-                const resp = await $.post(loc() + '/projectStatusChange', {
-                    id, val
+            async getMemberCheckTaskOptions() {
+                const resp = await $.get("/platform/welfareMember/check/task/getAllTask", { year: this.pageForm.year })
+                this.memberCheckTaskOptions = resp.data.filter((item) => item.welfareCheckFilterMode === 2)
+            },
+            async projectStatusChange({ id, isDisabled: val }) {
+                const resp = await $.post(loc() + "/projectStatusChange", {
+                    id,
+                    val
                 })
                 if (resp.code === 0) {
                     this.$message.success(resp.msg)
@@ -562,12 +510,12 @@ layout("/layouts/platform.html"){
             },
 
             async sendMsgToNotWelfareUsers() {
-                const valid = await this.$refs['sendForm'].validate()
+                const valid = await this.$refs["sendForm"].validate()
                 if (!valid) return
-                const confirm = await this.$confirm('您确定要向未选福利的人员发送信息吗？', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonTest: '取消',
-                    type: 'warning'
+                const confirm = await this.$confirm("您确定要向未选福利的人员发送信息吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonTest: "取消",
+                    type: "warning"
                 })
                 if (confirm === "confirm") {
                     // this.pageForm.sendMsgValue = this.sendMsgValue
@@ -575,9 +523,10 @@ layout("/layouts/platform.html"){
                     //     this.notifyWarning("请填写发送内容")
                     //     return
                     // }
-                    const resp = await $.post(loc() + '/sendMsgToNotWelfareUsers', {
+                    const resp = await $.post(loc() + "/sendMsgToNotWelfareUsers", {
                         projectId: this.formData.id,
-                        sendMsgValue: this.formData.content
+                        sendMsgValue: this.formData.content,
+                        url: this.formData.url
                     })
                     if (resp.code === 0) {
                         this.sendMsgDialogVisible = false
@@ -586,50 +535,55 @@ layout("/layouts/platform.html"){
                         this.notifyWarning(resp.msg)
                     }
                 }
-
-
             },
             sendMsg(row) {
                 this.$set(this.formData, "sendTypes", [])
-                this.$set(this.formData, "url", `<a href="` + (APP_DOMAIN + '/mobile/welfare/list/receive?projectId=' + row.id) + `">点击参与</a>`)
+                this.$set(this.formData, "url", `<a href="` + (APP_DOMAIN + "/mobile/welfare/list/receive?projectId=" + row.id) + `">点击参与</a>`)
                 this.$set(this.formData, "content", "温馨提示：请尽快完成福利套餐的选择，逾期未选择视为默认发放XXXX。")
                 this.$set(this.formData, "id", row.id)
                 this.sendMsgDialogVisible = true
             },
             openCode(row) {
-                this.$refs.openQRCode.openCode('/mobile/welfare/list/receive?projectId=' + row.id)
+                this.$refs.openQRCode.openCode("/mobile/welfare/list/receive?projectId=" + row.id)
             },
             isCheckBoxChange() {
-                this.formData.welfareProjectSubjects = [{
-                    subjectName: '请输入福利信息',
-                    subjectType: this.formData.isCheckBox ? this.formData.isCheckBox : 'radio',
-                    defaultOption: null,
-                    options: [
+                if (this.formData.welfareProjectSubjects && this.formData.welfareProjectSubjects.length > 0) {
+                    this.formData.welfareProjectSubjects.forEach((v) => {
+                        v.subjectType = this.formData.isCheckBox ? this.formData.isCheckBox : "radio"
+                    })
+                } else {
+                    this.formData.welfareProjectSubjects = [
                         {
-                            optionType: "套餐",
-                            optionName: '福利1',
-                            optionNameId: '',
-                            optionSort: '1',
-                            imgUrl: ''
+                            subjectName: "请输入福利信息",
+                            subjectType: this.formData.isCheckBox ? this.formData.isCheckBox : "radio",
+                            defaultOption: null,
+                            options: [
+                                {
+                                    optionType: "套餐",
+                                    optionName: "福利1",
+                                    optionNameId: "",
+                                    optionSort: "1",
+                                    imgUrl: ""
+                                }
+                            ]
                         }
                     ]
-                }]
-
+                }
             },
             async handleAvatarSuccess(res, file) {
-                this.$set(this.formData, 'cover', res.data.filepath)
-                await this.$refs['form'].validate()
+                this.$set(this.formData, "cover", res.data.filepath)
+                await this.$refs["form"].validate()
             },
             beforeAvatarUpload(file) {
-                const isJPG = file.type === 'image/jpeg';
-                const isLt2M = file.size / 1024 / 1024 / 1024 / 1024 < 2;
+                const isJPG = file.type === "image/jpeg"
+                const isLt2M = file.size / 1024 / 1024 / 1024 / 1024 < 2
                 if (!isJPG) {
-                    this.$message.error('上传头像图片只能是 JPG 格式!');
+                    this.$message.error("上传头像图片只能是 JPG 格式!")
                 }
                 if (!isLt2M) {
-                    this.$message.error('上传头像图片大小不能超过 4MB!');
+                    this.$message.error("上传头像图片大小不能超过 4MB!")
                 }
-                return isJPG && isLt2M;
+                return isJPG && isLt2M
             },
             doExportWelFareList() {
                 this.exportWelfareList(this.welfare_id, this.selPersonType)
@@ -642,7 +596,7 @@ layout("/layouts/platform.html"){
                     if (this.formData.flexible) {
                         const questionValid = this.$refs.questionNaire.validate()
                         if (!questionValid) {
-                            this.$message.warning('题目信息填写不完整！')
+                            this.$message.warning("题目信息填写不完整！")
                             return
                         }
                     }
@@ -650,10 +604,10 @@ layout("/layouts/platform.html"){
                     this.submitLoading = true
                     const loading = this.$loading({
                         lock: true,
-                        text: '数据保存中请稍后',
-                        spinner: 'el-icon-loading',
-                        background: 'rgba(0, 0, 0, 0.7)'
-                    });
+                        text: "数据保存中请稍后",
+                        spinner: "el-icon-loading",
+                        background: "rgba(0, 0, 0, 0.7)"
+                    })
                     const formData = clone(this.formData)
                     formData.provideAddress = "工会"
 
@@ -661,25 +615,23 @@ layout("/layouts/platform.html"){
                         formData.multiSelectNum = 1
                     }
                     if (formData.flexible) {
-                        formData.flexibleGifts.map(v => v.isDefault = false)
+                        formData.flexibleGifts.map((v) => (v.isDefault = false))
                         formData.flexibleGifts[formData.defaultFlexibleGifts].isDefault = true
                         formData.flexibleGifts = JSON.stringify(formData.flexibleGifts)
                     } else {
                         formData.flexibleGifts = null
                     }
 
-                    if (formData.conditionStructure)
-                        formData.conditionStructure = JSON.stringify(formData.conditionStructure)
+                    if (formData.conditionStructure) formData.conditionStructure = JSON.stringify(formData.conditionStructure)
 
                     if (this.formData.flexible && [2, 3, 4].includes(formData.provideMode)) {
                         formData.welfareProjectSubjects = JSON.stringify(this.$refs.questionNaire.subject)
                     }
 
                     if (!this.formData.id) {
-                        const alert = await this.$alert('在发放福利前，请及时生成福利名单，便于教职工选择福利', '提醒', {
-                            confirmButtonText: '确定',
+                        const alert = await this.$alert("在发放福利前，请及时生成福利名单，便于教职工选择福利", "提醒", {
+                            confirmButtonText: "确定"
                         })
-
                     }
                     try {
                         const resp = await $.post(loc() + "/save", formData)
@@ -698,7 +650,6 @@ layout("/layouts/platform.html"){
                         console.log(e)
                         this.notifyWarning(e.status)
                     }
-
                 }
             },
             provideTimeChange() {
@@ -706,8 +657,8 @@ layout("/layouts/platform.html"){
                     this.formData.provideTimeStart = this.formData.provideTime[0]
                     this.formData.provideTimeEnd = this.formData.provideTime[1]
                 } else {
-                    this.formData.provideTimeStart = ''
-                    this.formData.provideTimeEnd = ''
+                    this.formData.provideTimeStart = ""
+                    this.formData.provideTimeEnd = ""
                 }
             },
             choiceTimeChange() {
@@ -718,11 +669,11 @@ layout("/layouts/platform.html"){
                     this.formData.provideTimeStart = this.formData.choiceTime[0]
                     this.formData.provideTimeEnd = this.formData.choiceTime[1]
                 } else {
-                    this.formData.choiceTimeStart = ''
-                    this.formData.choiceTimeEnd = ''
+                    this.formData.choiceTimeStart = ""
+                    this.formData.choiceTimeEnd = ""
 
-                    this.formData.provideTimeStart = ''
-                    this.formData.provideTimeEnd = ''
+                    this.formData.provideTimeStart = ""
+                    this.formData.provideTimeEnd = ""
                 }
             },
             openAdd() {
@@ -738,18 +689,20 @@ layout("/layouts/platform.html"){
                     flexibleGifts: [{}]
                 }
                 this.$refs.guava.edit()
-                if (this.$refs.form)
-                    this.$refs.form.resetFields();
+                if (this.$refs.form) this.$refs.form.resetFields()
             },
 
             async createList(row) {
-                let msg = row.created ? "务必确认是否重新生成福利名单，如果确认，系统将清空已经选取的福利信息。请再次确认 !!" : "确定要生成福利名单吗？"
-                this.$confirm(msg, '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning',
+                let msg = row.created
+                    ? "务必确认是否重新生成福利名单，如果确认，系统将清空已经选取的福利信息。请再次确认 !!"
+                    : "确定要生成福利名单吗？"
+                this.$confirm(msg, "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
                     callback: async (a, b) => {
-                        if ("confirm" == a) {//确认后再执行
+                        if ("confirm" == a) {
+                            //确认后再执行
                             this.submitLoading = true
                             const resp = await $.post(loc() + "/createList", {
                                 id: row.id,
@@ -768,12 +721,13 @@ layout("/layouts/platform.html"){
             },
 
             async createList2(row) {
-                this.$confirm('系统根据现有的福利会员，更新当前福利名单，对已经选择的福利没有影响，请确认是否更新？', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning',
+                this.$confirm("系统根据现有的福利会员，更新当前福利名单，对已经选择的福利没有影响，请确认是否更新？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
                     callback: async (a, b) => {
-                        if ("confirm" == a) {//确认后再执行
+                        if ("confirm" == a) {
+                            //确认后再执行
                             this.submitLoading = true
                             const resp = await $.post(loc() + "/createList", {
                                 id: row.id,
@@ -792,14 +746,15 @@ layout("/layouts/platform.html"){
             },
 
             doDelete(id) {
-                this.$confirm('确定要删除吗？', '提示', {
-                    confirmButtonText: '确定',
-                    cancelButtonText: '取消',
-                    type: 'warning',
+                this.$confirm("确定要删除吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
                     callback: async (a, b) => {
-                        if ("confirm" == a) {//确认后再执行
+                        if ("confirm" == a) {
+                            //确认后再执行
                             this.submitLoading = true
-                            const resp = await $.post(loc() + "/delete", {id});
+                            const resp = await $.post(loc() + "/delete", { id })
                             if (resp.code === 0) {
                                 this.pageData()
                                 this.notifySuccess(resp.msg)
@@ -809,60 +764,62 @@ layout("/layouts/platform.html"){
                             this.submitLoading = false
                         }
                     }
-                });
+                })
             },
             dropdownCommand(command) {
-                const {type, data} = command
+                const { type, data } = command
                 this.welfare_id = data.id
-                if (type == 'view') {
+                if (type == "view") {
                     this.openView(data.id)
-                } else if (type == 'edit') {
+                } else if (type == "edit") {
                     this.openEdit(data)
-                } else if (type == 'delete') {
+                } else if (type == "delete") {
                     this.doDelete(data.id)
-                } else if (type == 'createList') {
+                } else if (type == "createList") {
                     this.createList(data)
-                } else if (type == 'createList2') {
+                } else if (type == "createList2") {
                     this.createList2(data)
-                } else if (type == 'export') {
+                } else if (type == "export") {
                     this.exportWelfareListDialog = true
-                } else if (type == 'sendMsg') {
+                } else if (type == "sendMsg") {
                     this.sendMsg(data)
-                } else if (type === 'openCode') {
+                } else if (type === "openCode") {
                     this.openCode(data)
-                } else if (type === 'status') {
+                } else if (type === "status") {
                     this.projectStatusChange(data)
                 }
             },
             async openEdit(row) {
                 this.submitLoading = true
-                const resp = await $.get(loc() + "/findOne", {id: row.id})
+                const resp = await $.get(loc() + "/findOne", { id: row.id })
                 this.submitLoading = false
                 if (resp.code === 0) {
                     const data = resp.data
                     data.flexibleGifts = data.flexibleGifts || [{}]
-                    const idx = data.flexibleGifts.findIndex(v => v.isDefault)
+                    const idx = data.flexibleGifts.findIndex((v) => v.isDefault)
                     data.defaultFlexibleGifts = idx < 0 ? 0 : idx
                     data.provideTime = [data.provideTimeStart, data.provideTimeEnd]
                     data.choiceTime = [data.choiceTimeStart, data.choiceTimeEnd]
-                    if (data.welfareProjectSubjects.length === 0) {
-                        data.welfareProjectSubjects = [{
-                            subjectName: '请输入福利信息',
-                            subjectType: data.isCheckBox,
-                            defaultOption: null,
-                            options: [
-                                {
-                                    optionType: "套餐",
-                                    optionName: '福利1',
-                                    optionNameId: '',
-                                    optionSort: '1',
-                                    imgUrl: ''
-                                }
-                            ]
-                        }]
+                    if (!data.welfareProjectSubjects || data.welfareProjectSubjects.length === 0) {
+                        data.welfareProjectSubjects = [
+                            {
+                                subjectName: "请输入福利信息",
+                                subjectType: data.isCheckBox,
+                                defaultOption: null,
+                                options: [
+                                    {
+                                        optionType: "套餐",
+                                        optionName: "福利1",
+                                        optionNameId: "",
+                                        optionSort: "1",
+                                        imgUrl: ""
+                                    }
+                                ]
+                            }
+                        ]
                     } else {
-                        data.welfareProjectSubjects.forEach(v => {
-                            v.options.map(o => {
+                        data.welfareProjectSubjects.forEach((v) => {
+                            v.options.map((o) => {
                                 if (!o.optionNameId) {
                                     o.optionNameId = ""
                                 }
@@ -879,57 +836,66 @@ layout("/layouts/platform.html"){
                 this.$refs.guava.view()
             },
             pageData() {
-                sublime.showLoadingbar();
+                sublime.showLoadingbar()
                 this.tableLoading = true
-                $.post(loc() + "/pageData", this.pageForm, (data) => {
-                    sublime.closeLoadingbar();
-                    this.tableLoading = false
-                    if (data.code == 0) {
-                        data.data.list.forEach(v => {
-                            v.flexibleGifts = JSON.parse(v.flexibleGifts || "[]")
-                        })
+                $.post(
+                    loc() + "/pageData",
+                    this.pageForm,
+                    (data) => {
+                        sublime.closeLoadingbar()
+                        this.tableLoading = false
+                        if (data.code == 0) {
+                            data.data.list.forEach((v) => {
+                                v.flexibleGifts = JSON.parse(v.flexibleGifts || "[]")
+                            })
 
-                        this.tableData = data.data.list;
-                        this.pageForm.totalCount = data.data.totalCount;
-                    } else {
-                        this.$message.error(data.msg);
-                    }
-                }, "json");
-            },
+                            this.tableData = data.data.list
+                            this.pageForm.totalCount = data.data.totalCount
+                        } else {
+                            this.$message.error(data.msg)
+                        }
+                    },
+                    "json"
+                )
+            }
         },
         async created() {
-            this.pageData();
+            this.pageData()
             this.welfareProvideMode = await getEnumOptions("WelfareProvideMode")
             this.welfareSignMode = await getEnumOptions("WelfareSignMode")
             this.welfareNoticePushMode = await getEnumOptions("WelfareNoticePushMode")
             this.welfarePersonTypeList = await getPersonTypeListGroupByWelfare()
 
-            this.welfarePersonTypeList.map(v => {
+            this.welfarePersonTypeList.map((v) => {
                 this.selPersonType.push(v.personType)
             })
 
-            const personType = await getDictOptions("UserType")
-            const userState = await getDictOptions("userState")
-
-            this.fields = this.fields.concat([{
-                label: '人员类型',
-                value: 'personType',
-                type: "select",
-                options: personType.map(v => {
-                    return {label: v.name, value: v.code}
-                })
-            }, {
-                label: '在职状态',
-                value: 'userState',
-                type: "select",
-                options: userState.map(v => {
-                    return {label: v.name, value: v.code}
-                })
-            }, {
-                label: '退休时间(年份)',
-                value: 'retiredYear',
-                type: 'date(year)'
-            }])
+            const personType = await getDictOptions("PERSON_TYPE")
+            const userState = await getDictOptions("USER_STATE")
+            this.getMemberCheckTaskOptions()
+            this.fields = this.fields.concat([
+                {
+                    label: "人员类型",
+                    value: "personType",
+                    type: "select",
+                    options: personType.map((v) => {
+                        return { label: v.name, value: v.code }
+                    })
+                },
+                {
+                    label: "在职状态",
+                    value: "userState",
+                    type: "select",
+                    options: userState.map((v) => {
+                        return { label: v.name, value: v.code }
+                    })
+                },
+                {
+                    label: "退休时间(年份)",
+                    value: "retiredYear",
+                    type: "date(year)"
+                }
+            ])
         }
     })
 </script>
diff --git a/src/main/resources/views/platform/welfare/statistics/single.html b/src/main/resources/views/platform/welfare/statistics/single.html
index 390ae0c..5ad2182 100644
--- a/src/main/resources/views/platform/welfare/statistics/single.html
+++ b/src/main/resources/views/platform/welfare/statistics/single.html
@@ -65,6 +65,20 @@ layout("/layouts/platform.html"){
                         </div>
                     </div>
 
+                    <div class="search-item">
+                        <div class="search-item-label">人员类型：</div>
+                        <div class="search-item-option">
+                            <dict-select
+                                @change="doSearch"
+                                clearable
+                                code="PERSON_TYPE"
+                                placeholder="人员类型"
+                                style="width: 100%"
+                                v-model="pageForm.personType"
+                            ></dict-select>
+                        </div>
+                    </div>
+
                     <div class="search-query">
                         <el-button @click="doSearch();unionGroupChange()" icon="el-icon-search" type="primary">搜索</el-button>
                     </div>
@@ -86,7 +100,7 @@ layout("/layouts/platform.html"){
                             type="primary"
                             v-if="judgmentAuthority"
                         >
-                            导出各基层工会福利签领表
+                            导出各分工会福利签领表
                         </el-button>
 
                         <el-button
@@ -105,7 +119,7 @@ layout("/layouts/platform.html"){
                                  type="primary">按品牌导出全部（蛋糕券）
                          </el-button>-->
 
-                        <template v-if="judgmentAuthority || ${@shiro.hasRole('H04') || @shiro.hasRole('gh12')}">
+                        <template v-if="judgmentAuthority || ${@shiro.hasRole('H04') || @shiro.hasRole('gh01') || @shiro.hasRole('gh12')}">
                             <el-button
                                 :disabled="!pageForm.projectId"
                                 @click="exportReceiveDetail(true)"
@@ -138,12 +152,19 @@ layout("/layouts/platform.html"){
                             <!--                                    @click="exportByUnionGroup">按工会小组导出汇总表-->
                             <!--                            </el-button>-->
                         </template>
-                        <template v-if="judgmentAuthority">
-                            <el-button :disabled="!pageForm.projectId" @click="exportByUnion" icon="el-icon-printer" size="small" type="primary">
-                                导出基层工会/福利套餐汇总表
+                        <!--<template
+                                v-if="judgmentAuthority">
+                            <el-button :disabled="!pageForm.projectId" @click="reimbursementDialog = true"
+                                       icon="el-icon-printer"
+                                       size="small"
+                                       type="primary">导出发放清单
                             </el-button>
-                            <el-button @click="selectOptionByAdmin" icon="el-icon-printer" size="small" type="primary">管理员代选择</el-button>
-                        </template>
+                            <el-button @click="selectOptionByAdmin"
+                                       icon="el-icon-printer"
+                                       size="small"
+                                       type="primary">管理员代选择
+                            </el-button>
+                        </template>-->
                     </template>
                 </table-tool>
                 <el-table
@@ -309,6 +330,19 @@ layout("/layouts/platform.html"){
             <el-button @click="doSelectByAdmin" type="primary">提交</el-button>
         </el-row>
     </el-dialog>
+
+    <el-dialog :visible.sync="reimbursementDialog" title="导出发放清单" width="40%">
+        <el-radio-group v-model="reimbursementPersonType" size="small">
+            <el-radio label="在职人员" border>在职人员</el-radio>
+            <el-radio label="劳务派遣人员" border>劳务派遣人员</el-radio>
+            <el-radio label="空状态" border>空状态</el-radio>
+            <el-radio label="全部" border>全部</el-radio>
+        </el-radio-group>
+        <span class="dialog-footer" slot="footer">
+            <el-button @click="reimbursementDialog = false">取消</el-button>
+            <el-button @click="exportByUnion" type="primary">导出</el-button>
+        </span>
+    </el-dialog>
 </div>
 
 <script>
@@ -328,7 +362,8 @@ layout("/layouts/platform.html"){
                     month: "",
                     unionGroupId: "",
                     year: "",
-                    welfareUnitCode: ""
+                    welfareUnitCode: "",
+                    personType: ""
                 },
                 unions: [],
                 tableColumns: [],
@@ -383,7 +418,10 @@ layout("/layouts/platform.html"){
                 projectInfo: {},
 
                 viewTableWrapHeight: 500,
-                judgmentAuthority
+                judgmentAuthority,
+
+                reimbursementDialog: false,
+                reimbursementPersonType: null
             }
         },
         computed: {
@@ -614,6 +652,10 @@ layout("/layouts/platform.html"){
                 this.unclaimedPageData()
             },
             exportByUnion() {
+                if (!this.reimbursementPersonType) {
+                    this.$message.warning("请先选择需要导出的人员类型")
+                    return
+                }
                 const { projectId, welfareUnitCode } = this.pageForm
                 window.open(
                     loc() +
@@ -622,8 +664,11 @@ layout("/layouts/platform.html"){
                         "&welfareUnitCode=" +
                         (welfareUnitCode ? welfareUnitCode : "") +
                         "&month=" +
-                        this.pageForm.month
+                        this.pageForm.month +
+                        "&personType=" +
+                        this.reimbursementPersonType
                 )
+                this.reimbursementDialog = false
             },
             exportByUnit() {
                 const { projectId, welfareUnitCode } = this.pageForm
diff --git a/src/main/resources/views/platform/welfare/userChoose.html b/src/main/resources/views/platform/welfare/userChoose.html
index 436ea1d..d372b0e 100644
--- a/src/main/resources/views/platform/welfare/userChoose.html
+++ b/src/main/resources/views/platform/welfare/userChoose.html
@@ -3,8 +3,6 @@ layout("/layouts/platform.html"){
 #-->
 
 <style>
-
-
     .optionImg {
         display: grid;
         place-items: center;
@@ -49,7 +47,6 @@ layout("/layouts/platform.html"){
     }
 </style>
 
-
 <div id="app" v-cloak>
     <guava :edit_scroll="false" ref="guava">
         <template>
@@ -59,50 +56,59 @@ layout("/layouts/platform.html"){
                         <div class="search-item-label">年&emsp;&emsp;度：</div>
                         <div class="search-item-option">
                             <el-date-picker
-                                    @change="doSearch"
-                                    placeholder="请选择"
-                                    style="width: 100%"
-                                    type="year"
-                                    v-model="pageForm.year"
-                                    value-format="yyyy">
-                            </el-date-picker>
+                                @change="doSearch"
+                                placeholder="请选择"
+                                style="width: 100%"
+                                type="year"
+                                v-model="pageForm.year"
+                                value-format="yyyy"
+                            ></el-date-picker>
                         </div>
                     </div>
                     <div class="search-query">
-                        <el-button @click="doSearch" icon="el-icon-search" type="primary">搜索
-                        </el-button>
+                        <el-button @click="doSearch" icon="el-icon-search" type="primary">搜索</el-button>
                     </div>
                 </div>
             </el-card>
 
             <el-card class="mt10" shadow="never">
                 <table-tool :app="this" label="福利项目">
-                    <template #func>
-
-                    </template>
+                    <template #func></template>
                 </table-tool>
 
-                <el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"
-                          ref="table"
-                          row-key="id" style="width: 100%" v-loading="tableLoading">
-
-                    <el-table-column :index="indexMethod" align="center" header-align="center"
-                                     label="序号" type="index"
-                                     width="80px"></el-table-column>
+                <el-table
+                    :data="tableData"
+                    :size="tableSize"
+                    @sort-change="pageOrder"
+                    ref="table"
+                    row-key="id"
+                    style="width: 100%"
+                    v-loading="tableLoading"
+                >
+                    <el-table-column
+                        :index="indexMethod"
+                        align="center"
+                        header-align="center"
+                        label="序号"
+                        type="index"
+                        width="80px"
+                    ></el-table-column>
 
                     <el-table-column
-                            :key="column.prop"
-                            :label="column.label"
-                            :prop="column.prop"
-                            :sortable="column.sortable"
-                            :width="column.width"
-                            align="center"
-                            header-align="center"
-                            min-width="100px" show-overflow-tooltip
-                            v-for="column in tableColumns">
+                        :key="column.prop"
+                        :label="column.label"
+                        :prop="column.prop"
+                        :sortable="column.sortable"
+                        :width="column.width"
+                        align="center"
+                        header-align="center"
+                        min-width="100px"
+                        show-overflow-tooltip
+                        v-for="column in tableColumns"
+                    >
                         <template scope="{row}" v-if="column.prop=='choiceTime'">
-                            <i class="el-icon-time"></i>&ensp;
-                            {{moment(row.choiceTimeStart).format('YYYY/MM/DD HH:mm')}}
+                            <i class="el-icon-time"></i>
+                            &ensp; {{moment(row.choiceTimeStart).format('YYYY/MM/DD HH:mm')}}
                             <span>- {{moment(row.choiceTimeEnd).format('YYYY/MM/DD HH:mm')}}</span>
                         </template>
 
@@ -122,12 +128,9 @@ layout("/layouts/platform.html"){
                         </template>
                     </el-table-column>
 
-                    <el-table-column align="center" header-align="center" label="操作"
-                                     prop="userOnline" width="150px">
+                    <el-table-column align="center" header-align="center" label="操作" prop="userOnline" width="150px">
                         <template scope="{row}">
-                            <el-button type="primary" size="mini" @click="openChoose(row)">
-                                {{confirmButtonInfo(row).text}}
-                            </el-button>
+                            <el-button type="primary" size="mini" @click="openChoose(row)">{{confirmButtonInfo(row).text}}</el-button>
 
                             <!--                            <el-button @click="openChoose(row)" size="mini" type="primary"-->
                             <!--                                       v-if="new Date().getTime()>moment(row.choiceTimeStart).valueOf()-->
@@ -143,7 +146,6 @@ layout("/layouts/platform.html"){
                             <!--                            </template>-->
                         </template>
                     </el-table-column>
-
                 </el-table>
                 <!--#include("/layouts/pagination.html"){}#-->
             </el-card>
@@ -153,29 +155,20 @@ layout("/layouts/platform.html"){
             <el-card shadow="never">
                 <el-form :model="formData" label-width="120px" ref="addForm">
                     <el-form-item label="福利名称">
-                        <span style="font-weight: bold;font-size: 20px">{{projectInfo.name}}</span>
+                        <span style="font-weight: bold; font-size: 20px">{{projectInfo.name}}</span>
                     </el-form-item>
                     <el-row :gutter="10">
                         <el-col span="8">
-                            <el-form-item label="福利节日">
-                                {{projectInfo.festival}}
-                            </el-form-item>
+                            <el-form-item label="福利节日">{{projectInfo.festival}}</el-form-item>
                         </el-col>
                         <el-col span="8" v-if="!projectInfo.flexible">
-                            <el-form-item label="福利礼品">
-                                {{projectInfo.gift}}
-                            </el-form-item>
+                            <el-form-item label="福利礼品">{{projectInfo.gift}}</el-form-item>
                         </el-col>
                         <el-col span="8">
-
-                            <el-form-item label="选择形式">
-                                {{projectInfo.isCheckBox==='checkBox'?'多选':'单选'}}
-                            </el-form-item>
+                            <el-form-item label="选择形式">{{projectInfo.isCheckBox==='checkBox'?'多选':'单选'}}</el-form-item>
                         </el-col>
                         <el-col span="8" v-if="projectInfo.isCheckBox==='checkBox'">
-                            <el-form-item label="最多选几个">
-                                {{projectInfo.multiSelectNum}}个
-                            </el-form-item>
+                            <el-form-item label="最多选几个">{{projectInfo.multiSelectNum}}个</el-form-item>
                         </el-col>
                         <el-col span="8">
                             <el-form-item label="发放形式">
@@ -194,91 +187,76 @@ layout("/layouts/platform.html"){
                             </el-form-item>
                         </el-col>
                         <el-col span="8">
-                            <el-form-item label="选择时间">
-                                {{projectInfo.choiceTimeStart}}至{{projectInfo.choiceTimeEnd}}
-                            </el-form-item>
+                            <el-form-item label="选择时间">{{projectInfo.choiceTimeStart}}至{{projectInfo.choiceTimeEnd}}</el-form-item>
                         </el-col>
                     </el-row>
 
                     <el-form-item label="福利套餐">
                         <el-row :gutter="0">
-                            <div :key="subject.id"
-                                 v-for="subject in projectInfo.welfareProjectSubjects">
-                                <el-col :key="oidx" :span="8"
-                                        v-for="(option, oidx) in subject.options">
-                                    <el-card shadow="never"
-                                             style="margin: 5px;">
-
-                                        <div slot="header" style="display: flex;justify-content: space-between">
-                                            <div style="color:#000;font-size: 18px">
-                                                {{option.optionName}}
-                                            </div>
+                            <div :key="subject.id" v-for="subject in projectInfo.welfareProjectSubjects">
+                                <el-col :key="oidx" :span="8" v-for="(option, oidx) in subject.options">
+                                    <el-card shadow="never" style="margin: 5px">
+                                        <div slot="header" style="display: flex; justify-content: space-between">
+                                            <div style="color: #000; font-size: 18px">{{option.optionName}}</div>
                                             <div>
-                                                <el-button @click.stop="viewDesc(option)"
-                                                           type="text">套餐详情
-                                                </el-button>
+                                                <el-button @click.stop="viewDesc(option)" type="text">套餐详情</el-button>
                                             </div>
                                         </div>
 
-                                        <div style="display: flex">
-                                            <el-image
-                                                    style="width: 150px;height: 150px;"
+                                        <div style="display: grid; grid-template-rows: auto 1fr auto; height: 200px">
+                                            <div style="display: flex">
+                                                <el-image
+                                                    style="width: 150px; height: 150px"
                                                     :src="CREATE_PREVIEW_URL(option.imgUrl)"
                                                     fit="contain"
-                                            ></el-image>
-                                            <div style="width:calc(100% - 150px);padding-left: 20px;position: relative">
-                                                <div style="white-space: nowrap;display: flex">
-                                                    <span class="desc_label">服务专线</span>
-                                                    <el-tooltip placement="top" :content="option.supplier">
-                                                        <span class="desc_value"
-                                                              style="width: calc(100% - 80px);text-overflow: ellipsis;overflow: hidden">
-                                                            {{option.supplier}}
-                                                        </span>
-                                                    </el-tooltip>
-                                                </div>
-                                                <div v-if="option.simpleDesc">
-                                                    <span class="desc_label">备&emsp;&emsp;注</span>
-                                                    <span class="desc_value">
-                                                        {{option.simpleDesc}}
-                                                    </span>
-                                                </div>
-                                                <div>
-                                                    <el-input-number :disabled="isView"
-                                                                     :max="option.maxNum"
-                                                                     :min="0"
-                                                                     @change="numChange(option.selectNum,option,oidx)"
-                                                                     style="width: 150px;position: absolute;right: 0;bottom: 0;"
-                                                                     v-model="option.selectNum"></el-input-number>
+                                                ></el-image>
+
+                                                <div style="width: calc(100% - 150px); padding-left: 20px; position: relative">
+                                                    <div style="white-space: nowrap; display: flex">
+                                                        <span class="desc_label"></span>
+                                                        <el-tooltip placement="top" :content="option.supplier">
+                                                            <span
+                                                                class="desc_value"
+                                                                style="width: calc(100% - 80px); text-overflow: ellipsis; overflow: hidden"
+                                                            >
+                                                                {{ option.supplier }}
+                                                            </span>
+                                                        </el-tooltip>
+                                                    </div>
+                                                    <div v-if="option.simpleDesc">
+                                                        <span class="desc_label"></span>
+                                                        <span class="desc_value">{{ option.simpleDesc }}</span>
+                                                    </div>
+                                                    <div>
+                                                        <el-input-number
+                                                            :disabled="isView"
+                                                            :max="option.maxNum"
+                                                            :min="0"
+                                                            @keydown.native="onKeydown"
+                                                            @change="numChange(option.selectNum, option, oidx)"
+                                                            style="width: 150px; position: absolute; right: 0; bottom: 0"
+                                                            v-model="option.selectNum"
+                                                        ></el-input-number>
+                                                    </div>
                                                 </div>
                                             </div>
+                                            <div style="margin-top: 17px">
+                                                <el-select
+                                                    style="width: 100%"
+                                                    clearable
+                                                    :disabled="option.selectNum == 0"
+                                                    placeholder="请选择取货门店"
+                                                    v-model="option.receiveAddress"
+                                                >
+                                                    <el-option
+                                                        v-for="item in option.receiveAddressList"
+                                                        :key="item.address"
+                                                        :label="item.address"
+                                                        :value="item.address"
+                                                    ></el-option>
+                                                </el-select>
+                                            </div>
                                         </div>
-
-
-                                        <!--                                        <el-row :gutter="10">-->
-                                        <!--                                            <el-col :span="24">-->
-                                        <!--                                                <div class="optionImg">-->
-                                        <!--                                                    <el-image-->
-                                        <!--                                                            :src="CREATE_PREVIEW_URL(option.imgUrl)"-->
-                                        <!--                                                            fit="contain"-->
-                                        <!--                                                    ></el-image>-->
-                                        <!--                                                </div>-->
-
-                                        <!--                                            </el-col>-->
-                                        <!--                                        </el-row>-->
-
-                                        <!--                                        <div class="descriptionClass" style="white-space: pre-line">-->
-                                        <!--                                            {{option.supplier}}-->
-                                        <!--                                        </div>-->
-
-                                        <!--                                        <el-row style="text-align: right">-->
-                                        <!--                                            <el-input-number :disabled="isView"-->
-                                        <!--                                                             :max="option.maxNum"-->
-                                        <!--                                                             :min="0"-->
-                                        <!--                                                             @change="numChange(option.selectNum,option,oidx)"-->
-                                        <!--                                                             style="width: 50%"-->
-                                        <!--                                                             v-model="option.selectNum"></el-input-number>-->
-                                        <!--                                        </el-row>-->
-
                                     </el-card>
                                 </el-col>
                             </div>
@@ -291,58 +269,68 @@ layout("/layouts/platform.html"){
                                 <el-form-item label="收货地址" prop="receiveAddress">
                                     <div style="display: flex; column-gap: 10px">
                                         <div style="flex: 1">
-                                            <el-select @change="addressChange"
-                                                       filterable placeholder="请选择收货地址"
-                                                       style="width: 100%"
-                                                       v-model="formData.addressId">
+                                            <el-select
+                                                @change="addressChange"
+                                                filterable
+                                                placeholder="请选择收货地址"
+                                                style="width: 100%"
+                                                v-model="formData.addressId"
+                                            >
                                                 <el-option
-                                                        :key="item.id"
-                                                        :label="item.name+' '+item.defaultName"
-                                                        :value="item.id"
-                                                        v-for="item in addressOptions">
-                                                </el-option>
+                                                    :key="item.id"
+                                                    :label="item.name+' '+item.defaultName"
+                                                    :value="item.id"
+                                                    v-for="item in addressOptions"
+                                                ></el-option>
                                             </el-select>
                                         </div>
 
                                         <div>
-                                            <el-button
-                                                    @click="openAddress"
-                                                    type="primary">添加收货地址
-                                            </el-button>
+                                            <el-button @click="openAddress" type="primary">添加收货地址</el-button>
                                         </div>
-
                                     </div>
+                                    <span style="color: #ac3111">
+                                        温馨提示：填写默认收货地址后，系统会自动选择默认地址；如未设置默认，请您在添加收货地址后在此下拉框进行选择
+                                    </span>
                                 </el-form-item>
                             </el-col>
                             <el-col span="24">
                                 <el-form-item
-                                        :rules="{required:true,message: '请确认收货地址', trigger: 'blur'}"
-                                        label="请确认收货地址"
-                                        prop="receiveAddress">
-                                    <el-input :rows="4" disabled maxlength="100"
-                                              placeholder="选择收货地址联动" type="textarea"
-                                              v-model="formData.receiveAddress"></el-input>
+                                    :rules="{required:true,message: '请确认收货地址', trigger: 'blur'}"
+                                    label="请确认收货地址"
+                                    prop="receiveAddress"
+                                >
+                                    <el-input
+                                        :rows="4"
+                                        disabled
+                                        maxlength="100"
+                                        placeholder="选择收货地址联动"
+                                        type="textarea"
+                                        v-model="formData.receiveAddress"
+                                    ></el-input>
                                 </el-form-item>
                             </el-col>
                         </el-row>
                     </template>
 
-                    <el-form-item :rules="{required:true,message: '请签字', trigger: 'blur'}"
-                                  label="签字" prop="sign" v-if="projectInfo.signMode===2">
+                    <el-form-item
+                        :rules="{required:true,message: '请签字', trigger: 'blur'}"
+                        label="签字"
+                        prop="sign"
+                        v-if="projectInfo.signMode===2"
+                    >
                         <template v-if="isChoice===0||!isView">
-                            <sign :is_value_base64="false" :qz.sync="formData.sign"
-                                  prefix="welfare"
-                                  ref="sign"></sign>
+                            <sign :is_value_base64="false" :qz.sync="formData.sign" prefix="welfare" ref="sign"></sign>
                         </template>
                         <template v-else>
-                            <el-image :src="'/signature/getSignData?path=' +formData.imageUrl"
-                                      fit="contain"
-                                      style="height: 100px;width: 100%" v-if="formData.imageUrl">
-                            </el-image>
+                            <el-image
+                                :src="'/signature/getSignData?path=' +formData.imageUrl"
+                                fit="contain"
+                                style="height: 100px; width: 100%"
+                                v-if="formData.imageUrl"
+                            ></el-image>
                             <span v-else>暂无</span>
                         </template>
-
-
                     </el-form-item>
                 </el-form>
             </el-card>
@@ -354,85 +342,76 @@ layout("/layouts/platform.html"){
         </template>
     </guava>
 
-    <el-drawer
-            :visible.sync="descDialogVisible"
-            direction="rtl"
-            size="50%"
-            title="福利详情">
+    <el-drawer :visible.sync="descDialogVisible" direction="rtl" size="50%" title="福利详情">
         <el-card style="margin: 20px" shadow="never">
             <div v-html="descData"></div>
         </el-card>
     </el-drawer>
 
-    <el-dialog
-            :close-on-click-modal="false"
-            :visible.sync="addressDialogVisible"
-            title="收货地址"
-            width="30%">
-
-        <el-form :model="formData" label-position="right"
-                 label-suffix="：" label-width="120px" ref="addForm">
+    <el-dialog :close-on-click-modal="false" :visible.sync="addressDialogVisible" title="收货地址" width="40%">
+        <el-form :model="formData" label-position="right" :rules="formRules" label-suffix="：" label-width="120px" ref="addForm">
             <el-row :gutter="60">
                 <el-col :span="24">
-                    <el-form-item :rules="{required:true,message: '请选择地址信息', trigger: 'blur'}"
-                                  label="地址信息"
-                                  prop="addressList">
+                    <el-form-item label="地址信息" prop="addressList">
                         <el-cascader
-                                :options="dzOptions"
-                                :props="{ expandTrigger: 'hover' }"
-                                @change="handleChange"
-                                clearable
-                                placeholder="请选择地址信息"
-                                style="width: 100%"
-                                v-model="formData.addressList"></el-cascader>
+                            :options="dzOptions"
+                            :props="{ expandTrigger: 'hover' }"
+                            @change="handleChange"
+                            clearable
+                            placeholder="请选择地址信息"
+                            style="width: 100%"
+                            v-model="formData.addressList"
+                        ></el-cascader>
                     </el-form-item>
                 </el-col>
                 <el-col :span="24">
-                    <el-form-item
-                            :rules="{required:true,message: '请填写您的详细地址', trigger: 'blur'}"
-                            label="详细地址"
-                            prop="addressDetail">
-                        <el-input maxlength="100"
-                                  placeholder="请输入详细地址信息，如道路、门牌号、小区、楼栋号、单元等信息"
-                                  rows="3"
-                                  show-word-limit
-                                  type="textarea"
-                                  v-model="formData.addressDetail"></el-input>
+                    <el-form-item label="详细地址" prop="addressDetail">
+                        <el-input
+                            maxlength="100"
+                            placeholder="请输入详细地址信息，如道路、门牌号、小区、楼栋号、单元等信息"
+                            rows="3"
+                            show-word-limit
+                            type="textarea"
+                            v-model="formData.addressDetail"
+                        ></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="24">
-                    <el-form-item
-                            :rules="{required:true,message: '请填写收货人姓名', trigger: 'blur'}"
-                            label="收货人姓名"
-                            prop="userName">
-                        <el-input maxlength="11"
-                                  placeholder="请填写收货人姓名"
-                                  v-model="formData.userName"></el-input>
+                    <el-form-item label="收货人姓名" prop="userName">
+                        <el-input maxlength="11" placeholder="请填写收货人姓名" v-model="formData.userName"></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="24">
-                    <el-form-item
-                            :rules="{required:true,message: '请填写手机号码', trigger: 'blur'}"
-                            label="手机号码"
-                            prop="tel">
-                        <el-input maxlength="11" placeholder="请填写手机号码"
-                                  type="tel"
-                                  v-model="formData.tel"></el-input>
+                    <el-form-item label="手机号码" prop="tel">
+                        <el-input maxlength="11" placeholder="请填写手机号码" clearable v-model="formData.tel"></el-input>
+                    </el-form-item>
+                </el-col>
+
+                <el-col :span="24">
+                    <el-form-item label="是否默认" prop="isDefault">
+                        <el-switch
+                            v-model="formData.isDefault"
+                            active-color="#13ce66"
+                            inactive-color="#ff4949"
+                            active-value="1"
+                            inactive-value="0"
+                            active-text="是"
+                            inactive-text="否"
+                        ></el-switch>
                     </el-form-item>
                 </el-col>
             </el-row>
         </el-form>
 
         <span class="dialog-footer" slot="footer">
-    <el-button @click="addressDialogVisible = false">取 消</el-button>
-    <el-button @click="doSaveUserAddress" type="primary">保存</el-button>
-  </span>
+            <el-button @click="addressDialogVisible = false">取 消</el-button>
+            <el-button @click="doSaveUserAddress" type="primary">保存</el-button>
+        </span>
     </el-dialog>
-
 </div>
 <script>
     const vue = new Vue({
-        el: '#app',
+        el: "#app",
         mixins: [initTableMixins],
         data() {
             return {
@@ -450,56 +429,78 @@ layout("/layouts/platform.html"){
                 welfareSubject: {},
                 pageForm: {
                     isChoose: false,
-                    year: moment().format('YYYY')
+                    year: moment().format("YYYY")
                 },
                 tableColumns: [
-                    {prop: 'year', label: '年度'},
-                    {prop: 'name', label: '项目名称'},
-                    {prop: 'choiceTime', label: '选择时间'},
-                    {prop: 'isChoose', label: '是否选择'},
-                    {prop: 'gist_list', label: '所选福利'},
-                    {prop: 'receiveAddress', label: '收货地址'},
+                    { prop: "year", label: "年度" },
+                    { prop: "name", label: "项目名称" },
+                    { prop: "choiceTime", label: "选择时间" },
+                    { prop: "isChoose", label: "是否选择" },
+                    { prop: "gist_list", label: "所选福利" },
+                    { prop: "receiveAddress", label: "收货地址" }
                 ],
                 isView: false,
                 isChoice: false,
 
                 addressDialogVisible: false,
+
+                formRules: {
+                    addressList: [{ required: true, message: "请选择地址信息", trigger: ["blur", "change"] }],
+                    addressDetail: [{ required: true, message: "请填写您的详细地址", trigger: ["blur", "change"] }],
+                    userName: [{ required: true, message: "请填写收货人姓名", trigger: ["blur", "change"] }],
+                    tel: [
+                        { required: true, message: "必填", trigger: ["blur", "change"] },
+                        { pattern: /^1[3-9]\d{9}$/, message: "请输入正确的手机号" }
+                    ]
+                },
+
+                // 供应商
+                shoppingType: [],
+                // 门店地址
+                offlineStoresOption: []
             }
         },
         computed: {
             sumSelectNum() {
                 if (this.projectInfo && this.projectInfo.welfareProjectSubjects) {
-                    return this.projectInfo.welfareProjectSubjects[0].options.map(v => v.selectNum).reduce((accumulator, currentValue) => accumulator + currentValue, 0)
+                    return this.projectInfo.welfareProjectSubjects[0].options
+                        .map((v) => v.selectNum)
+                        .reduce((accumulator, currentValue) => accumulator + currentValue, 0)
                 }
                 return 0
-            },
+            }
         },
         methods: {
+            onKeydown(event) {
+                if (event.key !== "ArrowUp" && event.key !== "ArrowDown") {
+                    event.preventDefault()
+                }
+            },
             confirmButtonInfo(row) {
-                const {choiceTimeEnd, choiceTimeStart, overdueChoiceTimeEnd, isChoose, selectTime} = row
+                const { choiceTimeEnd, choiceTimeStart, overdueChoiceTimeEnd, isChoose, selectTime } = row
                 const now = moment().valueOf()
-                if (overdueChoiceTimeEnd == null || overdueChoiceTimeEnd === '') {
+                if (overdueChoiceTimeEnd == null || overdueChoiceTimeEnd === "") {
                     if (now > moment(choiceTimeStart).valueOf() && now < moment(choiceTimeEnd).valueOf()) {
-                        return {text: isChoose ? '确定修改' : '确定选择', disabled: false}
+                        return { text: isChoose ? "修改" : "选择", disabled: false }
                     } else if (now > moment(choiceTimeEnd).valueOf()) {
-                        return {text: '选择已结束', disabled: true}
+                        return { text: "选择已结束", disabled: true }
                     } else if (now < moment(choiceTimeStart).valueOf()) {
-                        return {text: '选择未开始', disabled: true}
+                        return { text: "选择未开始", disabled: true }
                     }
                 } else {
                     //已选择了不能再动了
                     if (isChoose) {
-                        if(moment(selectTime).valueOf() > moment(choiceTimeEnd).valueOf() && now < moment(overdueChoiceTimeEnd).valueOf()){
-                            return {text: '确定修改', disabled: false}
+                        if (moment(selectTime).valueOf() > moment(choiceTimeEnd).valueOf() && now < moment(overdueChoiceTimeEnd).valueOf()) {
+                            return { text: "修改", disabled: false }
                         }
-                        return {text: '选择已结束', disabled: true}
+                        return { text: "选择已结束", disabled: true }
                     } else {
                         if (now > moment(choiceTimeStart).valueOf() && now < moment(overdueChoiceTimeEnd).valueOf()) {
-                            return {text: isChoose ? '确定修改' : '确定选择', disabled: false}
+                            return { text: isChoose ? "修改" : "选择", disabled: false }
                         } else if (now > moment(overdueChoiceTimeEnd).valueOf()) {
-                            return {text: '选择已结束', disabled: true}
+                            return { text: "选择已结束", disabled: true }
                         } else if (now < moment(choiceTimeStart).valueOf()) {
-                            return {text: '选择未开始', disabled: true}
+                            return { text: "选择未开始", disabled: true }
                         }
                     }
                 }
@@ -509,12 +510,12 @@ layout("/layouts/platform.html"){
                     let provinceName = ""
                     let cityName = ""
                     let countyName = ""
-                    const province = this.dzOptions.find(c => c.value === val[0])
+                    const province = this.dzOptions.find((c) => c.value === val[0])
                     provinceName = province.label
-                    const city = province.children.find(p => p.value === val[1])
+                    const city = province.children.find((p) => p.value === val[1])
                     cityName = city.label
                     if (val.length === 3) {
-                        const county = city.children.find(p => p.value === val[2])
+                        const county = city.children.find((p) => p.value === val[2])
                         countyName = county.label
                         this.$set(this.formData, "areaCode", county.value)
                     } else {
@@ -523,7 +524,6 @@ layout("/layouts/platform.html"){
                     this.$set(this.formData, "province", provinceName)
                     this.$set(this.formData, "city", cityName)
                     this.$set(this.formData, "county", countyName)
-
                 }
             },
             openAddress() {
@@ -540,64 +540,56 @@ layout("/layouts/platform.html"){
                             this.doSearch()
                             this.$message({
                                 message: resp.msg,
-                                type: 'success'
-                            });
+                                type: "success"
+                            })
                             await this.selectUserAddress()
                             this.addressDialogVisible = false
                         } else {
-                            this.$message.error(resp.msg);
+                            this.$message.error(resp.msg)
                         }
                     }
                 })
             },
             //数量更改
             numChange(value, option, optionIndex) {
-
                 this.$nextTick(() => {
                     // 查找+1按钮
-                    const plusButton = document.querySelector('.el-input-number__increase');
+                    const plusButton = document.querySelector(".el-input-number__increase")
                     // 添加点击事件监听器
-                    plusButton.addEventListener('click', this.handlePlusButtonClick(value, option, optionIndex));
+                    plusButton.addEventListener("click", this.handlePlusButtonClick(value, option, optionIndex))
                 })
-
             },
             handlePlusButtonClick(value, option, optionIndex) {
-                const {
-                    isCheckBox,
-                    multiSelectNum,
-                    singleOptionSupportMultipleSelection
-                } = this.projectInfo
-                if (isCheckBox === 'checkBox') {
+                const { isCheckBox, multiSelectNum, singleOptionSupportMultipleSelection } = this.projectInfo
+                if (isCheckBox === "checkBox") {
                     //判断是否支持单个多选
                     if (!singleOptionSupportMultipleSelection && value > 1) {
-                        this.$set(this.projectInfo.welfareProjectSubjects[0].options[optionIndex], 'selectNum', 1)
-                        this.$message.warning('此套餐最多只能选择1份');
-                        return;
+                        this.$set(this.projectInfo.welfareProjectSubjects[0].options[optionIndex], "selectNum", 1)
+                        this.$message.warning("此套餐最多只能选择1份")
+                        return
                     }
                 }
                 //获取用户当前选择的数量
-                const selectNums = this.projectInfo.welfareProjectSubjects[0].options.map(v => v.selectNum)
+                const selectNums = this.projectInfo.welfareProjectSubjects[0].options.map((v) => v.selectNum)
                 const sum = selectNums.reduce((accumulator, currentValue) => accumulator + currentValue, 0)
 
                 if (sum > multiSelectNum) {
-                    this.$set(this.projectInfo.welfareProjectSubjects[0].options[optionIndex], 'selectNum', value - 1)
-                    this.$message.warning('此次福利最多只能选择' + multiSelectNum + '份');
+                    this.$set(this.projectInfo.welfareProjectSubjects[0].options[optionIndex], "selectNum", value - 1)
+                    this.$message.warning("此次福利最多只能选择" + multiSelectNum + "份")
                 }
-
-
             },
 
             async getProjectInfo(id) {
-                const resp = await $.get('/platform/welfare/common/findOne', {projectId: id})
+                const resp = await $.get("/platform/welfare/common/findOne", { projectId: id })
                 if (resp.code === 0) {
                     resp.data.multiSelectNum = resp.data.multiSelectNum ? resp.data.multiSelectNum : 1
                     this.projectInfo = resp.data
                     await this.getUserSelection(id)
                     await this.getChoice()
+                    await this.getShoppingType()
                 }
             },
 
-
             async openView(row) {
                 this.isView = true
                 await this.getProjectInfo(row.id)
@@ -611,7 +603,7 @@ layout("/layouts/platform.html"){
                 this.$refs.guava.edit()
             },
             addressChange(val) {
-                const address = this.addressOptions.find(a => a.id === val)
+                const address = this.addressOptions.find((a) => a.id === val)
                 if (address) {
                     this.$set(this.formData, "receiveAddress", address.name)
                 }
@@ -619,54 +611,76 @@ layout("/layouts/platform.html"){
             doChoose() {
                 this.$refs["addForm"].validate(async (valid) => {
                     if (valid) {
-                        const {
-                            isCheckBox,
-                            multiSelectNum,
-                            singleOptionSupportMultipleSelection
-                        } = this.projectInfo
+                        const { isCheckBox, multiSelectNum, singleOptionSupportMultipleSelection } = this.projectInfo
                         if (isCheckBox === "checkBox") {
                             if (this.sumSelectNum < multiSelectNum) {
                                 //用户没有选择完
-                                this.$message('一共可以选择' + multiSelectNum + '份,您目前只选择了' + this.sumSelectNum + '份，快去选择吧！')
+                                this.$message.warning("一共可以选择" + multiSelectNum + "份,您目前只选择了" + this.sumSelectNum + "份，快去选择吧！")
+                                return
+                            }
+                        } else {
+                            if (this.sumSelectNum === 0) {
+                                //用户选择了多份
+                                this.$message.warning("您还没有选择福利套餐，快去选择吧！")
                                 return
                             }
                         }
-                        if (this.formData.receiveAddress == null || this.formData.receiveAddress === '') {
-                            this.$message.warning('请填写收货地址')
-                            return
-                        }
-                        if (this.formData.sign == null || this.formData.sign === '') {
-                            this.$message.warning('请签字')
-                            return
-                        }
-                        const formData = this.projectInfo.welfareProjectSubjects[0].options.filter(v => v.selectNum >= 1).map(v => {
-                            return {
-                                welfareId: this.projectInfo.id,
-                                subjectId: v.subjectId,
-                                selectOptionId: v.id,
-                                receiveAddress: this.formData.receiveAddress,
-                                userSign: this.formData.sign,
-                                selectNum: v.selectNum
+
+                        // 判断门店是否选择
+                        const chooseOptions = this.projectInfo.welfareProjectSubjects[0].options
+                            .filter((v) => v.selectNum > 0)
+                            .map((item) => {
+                                return { optionName: item.optionName, selectNum: item.selectNum, receiveAddress: item.receiveAddress }
+                            })
+                        let isReceiveAddress = true
+                        for (const item of chooseOptions) {
+                            if (!item.receiveAddress) {
+                                this.$message.warning(item.optionName + "还没有选择收货门店哦")
+                                isReceiveAddress = false
+                                break
                             }
-                        })
-                        const {
-                            code,
-                            msg,
-                            data
-                        } = await $.post('/platform/welfare/userChoose/confirmSelect', {
+                        }
+                        if (!isReceiveAddress) {
+                            return
+                        }
+
+                        if (this.projectInfo.provideMode == 3) {
+                            if (this.formData.receiveAddress == null || this.formData.receiveAddress === "") {
+                                this.$message.warning("请填写收货地址")
+                                return
+                            }
+                        }
+
+                        if (![1, 4].includes(this.projectInfo.signMode)) {
+                            if (this.formData.sign == null || this.formData.sign === "") {
+                                this.$message.warning("请签字")
+                                return
+                            }
+                        }
+                        const formData = this.projectInfo.welfareProjectSubjects[0].options
+                            .filter((v) => v.selectNum >= 1)
+                            .map((v) => {
+                                return {
+                                    welfareId: this.projectInfo.id,
+                                    subjectId: v.subjectId,
+                                    selectOptionId: v.id,
+                                    receiveAddress: this.projectInfo.provideMode === 3 ? this.formData.receiveAddress : v.receiveAddress,
+                                    userSign: this.formData.sign,
+                                    selectNum: v.selectNum
+                                }
+                            })
+                        console.log(formData)
+                        const { code, msg, data } = await $.post("/platform/welfare/userChoose/confirmSelect", {
                             welfareUserSelections: JSON.stringify(formData),
                             projectId: this.projectInfo.id
                         })
                         if (code === 0) {
-                            this.$message({
-                                message: msg,
-                                type: 'success'
-                            });
+                            this.$message.success("您已完成本次福利选择。")
                         } else {
                             this.$message({
                                 message: msg,
-                                type: 'warning'
-                            });
+                                type: "warning"
+                            })
                         }
                         this.doSearch()
                         this.$refs.guava.index()
@@ -695,7 +709,7 @@ layout("/layouts/platform.html"){
                     this.$set(this.formData, "addressId", null)
                     this.$set(this.formData, "sign", this.userSelection[0].userSign)
                 } else {
-                    const address = this.addressOptions.find(a => a.isDefault)
+                    const address = this.addressOptions.find((a) => a.isDefault)
                     if (address) {
                         this.$set(this.formData, "receiveAddress", address.name)
                         this.$set(this.formData, "addressId", address.id)
@@ -705,58 +719,67 @@ layout("/layouts/platform.html"){
             },
             //获取用户选择的数据
             async getUserSelection(projectId) {
-                const resp = await $.get('/platform/welfare/mine/getUserSelection', {projectId: projectId})
+                const resp = await $.get("/platform/welfare/mine/getUserSelection", { projectId: projectId })
                 this.userSelection = resp.data
                 this.echoUserSelection()
             },
             //回显用户选择的数据
             echoUserSelection() {
                 //获取用户当前选择的数量
-                this.projectInfo.welfareProjectSubjects[0].options.forEach(v => {
-                    const option = this.userSelection.find(x => x.selectOptionId === v.id)
+                this.projectInfo.welfareProjectSubjects[0].options.forEach((v) => {
+                    const option = this.userSelection.find((x) => x.selectOptionId === v.id)
                     if (option) {
                         v.selectNum = option.selectNum
+                        this.$set(v, "receiveAddress", option.receiveAddress)
                     } else {
                         v.selectNum = 0
+                        this.$set(v, "receiveAddress", "")
                     }
                 })
             },
             async getChoice() {
-                const resp = await $.get('/mobile/welfare/mine/isChoice', {projectId: this.projectInfo.id})
+                const resp = await $.get("/mobile/welfare/mine/isChoice", { projectId: this.projectInfo.id })
                 this.isChoice = resp.data
             },
             async selectUserAddress() {
-                const resp = await $.get('/platform/welfare/addressManage/selectUserAddress')
-                resp.data.map(r => {
+                const resp = await $.get("/platform/welfare/addressManage/selectUserAddress")
+                resp.data.map((r) => {
                     let defaultName = r.isDefault ? "默认地址" : ""
                     r.defaultName = defaultName
                     r.name = "收货地址：" + r.province + r.city + r.county + r.addressDetail + "，收件人：" + r.userName + "，联系方式：" + r.tel
                 })
                 this.addressOptions = resp.data
+                this.$nextTick(() => {
+                    const address = this.addressOptions.find((v) => v.isDefault)
+                    if (address) {
+                        this.$set(this.formData, "addressId", address.id)
+                        this.$set(this.formData, "receiveAddress", address.name)
+                    }
+                })
             },
+            // 获取供应商
+            async getShoppingType() {
+                const { data } = await $.get("/platform/shoppingType/apply/getShoppingType")
+                this.projectInfo.welfareProjectSubjects[0].options.forEach((item) => {
+                    item.receiveAddressList = data.find((v) => v.id === item.shoppingId).offlineStores
+                })
+
+                console.log(this.projectInfo.welfareProjectSubjects[0])
+            }
         },
         async created() {
             this.pageData()
             this.selectUserAddress()
-            getEnumOptions("WelfareProvideMode").then(res => {
+            getEnumOptions("WelfareProvideMode").then((res) => {
                 this.welfareProvideMode = res
             })
-            getEnumOptions("WelfareSignMode").then(res => {
+            getEnumOptions("WelfareSignMode").then((res) => {
                 this.welfareSignMode = res
             })
-
-           /* if ("${@shiro.hasRole('sysadmin')}" === 'false') {
-                this.dzOptions = this.dzOptions.filter(d => d.label === "江苏省")
-                this.dzOptions[0].children = this.dzOptions[0].children.filter(d => d.label === "无锡市")
-            }*/
-
-
         }
     })
-
 </script>
 
-
 <!--#
 }
 #-->

From 8b795f834346960d9bb4cf20804d117667ed55fb Mon Sep 17 00:00:00 2001
From: Paidax <paidax.422@qq.com>
Date: Mon, 10 Mar 2025 11:27:58 +0800
Subject: [PATCH 06/17] =?UTF-8?q?=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v/nutz/base/annontation/RepeatSubmit.java |  23 ++++
 .../v/nutz/base/constant/RedisConstant.java   |   4 +
 .../v/nutz/base/exception/BaseException.java  |  16 +++
 .../RepeatSubmitAopConfiguration.java         |  19 +++
 .../RepeatSubmitAopInterceptor.java           |  51 ++++++++
 .../controller/AlipayClientController.java    |   4 +-
 .../alipay/service/AlipayClientConfig.java    |   2 +-
 .../payment/alipay/service/AlipayService.java |   2 +-
 .../service/impl/AlipayNewServiceImpl.java    |   6 +-
 .../payment/enums/RefundStateEnum.java        |   4 +-
 .../payment/enums/TradingChannelEnum.java     |   4 +-
 .../payment/enums/TradingStateEnum.java       |   4 +-
 .../payment/enums/TradingTypeEnum.java        |   4 +-
 .../base/payment/enums/WxPayResultCode.java   |  30 +++++
 .../payment/model/PaymentTransaction.java     |   8 +-
 .../payment/model/RefundRecord.java           |   6 +-
 .../payment/wxpay/bean/WxPayV3Bean.java       |   2 +-
 .../payment/wxpay/pem/apiclient_cert.pem      |   0
 .../payment/wxpay/pem/apiclient_key.pem       |   0
 .../payment/wxpay/pem/wechatpay.pem           |   0
 .../wxpay/service/WxPayCommonService.java     |  13 +-
 .../service/impl/WxPayCommonServiceImpl.java  | 117 +++++++++++++-----
 .../payment/wxpay/vo/WxPayNeedParamVo.java    |   2 +-
 .../java/io/v/nutz/base/utils/WebUtil.java    |  33 +++++
 .../web/commons/proc/WkFailProcessor.java     |  15 ++-
 .../MemberPaymentMineController.java          |  19 ++-
 26 files changed, 334 insertions(+), 54 deletions(-)
 create mode 100644 src/main/java/io/v/nutz/base/annontation/RepeatSubmit.java
 create mode 100644 src/main/java/io/v/nutz/base/exception/BaseException.java
 create mode 100644 src/main/java/io/v/nutz/base/interceptor/repeatSubmit/RepeatSubmitAopConfiguration.java
 create mode 100644 src/main/java/io/v/nutz/base/interceptor/repeatSubmit/RepeatSubmitAopInterceptor.java
 rename src/main/java/io/v/nutz/{zhgh/memberCost => base}/payment/alipay/controller/AlipayClientController.java (93%)
 rename src/main/java/io/v/nutz/{zhgh/memberCost => base}/payment/alipay/service/AlipayClientConfig.java (98%)
 rename src/main/java/io/v/nutz/{zhgh/memberCost => base}/payment/alipay/service/AlipayService.java (85%)
 rename src/main/java/io/v/nutz/{zhgh/memberCost => base}/payment/alipay/service/impl/AlipayNewServiceImpl.java (96%)
 rename src/main/java/io/v/nutz/{zhgh/memberCost => base}/payment/enums/RefundStateEnum.java (80%)
 rename src/main/java/io/v/nutz/{zhgh/memberCost => base}/payment/enums/TradingChannelEnum.java (79%)
 rename src/main/java/io/v/nutz/{zhgh/memberCost => base}/payment/enums/TradingStateEnum.java (79%)
 rename src/main/java/io/v/nutz/{zhgh/memberCost => base}/payment/enums/TradingTypeEnum.java (75%)
 create mode 100644 src/main/java/io/v/nutz/base/payment/enums/WxPayResultCode.java
 rename src/main/java/io/v/nutz/{zhgh/memberCost => base}/payment/model/PaymentTransaction.java (91%)
 rename src/main/java/io/v/nutz/{zhgh/memberCost => base}/payment/model/RefundRecord.java (87%)
 rename src/main/java/io/v/nutz/{zhgh/memberCost => base}/payment/wxpay/bean/WxPayV3Bean.java (95%)
 rename src/main/java/io/v/nutz/{zhgh/memberCost => base}/payment/wxpay/pem/apiclient_cert.pem (100%)
 rename src/main/java/io/v/nutz/{zhgh/memberCost => base}/payment/wxpay/pem/apiclient_key.pem (100%)
 rename src/main/java/io/v/nutz/{zhgh/memberCost => base}/payment/wxpay/pem/wechatpay.pem (100%)
 rename src/main/java/io/v/nutz/{zhgh/memberCost => base}/payment/wxpay/service/WxPayCommonService.java (84%)
 rename src/main/java/io/v/nutz/{zhgh/memberCost => base}/payment/wxpay/service/impl/WxPayCommonServiceImpl.java (81%)
 rename src/main/java/io/v/nutz/{zhgh/memberCost => base}/payment/wxpay/vo/WxPayNeedParamVo.java (94%)
 create mode 100644 src/main/java/io/v/nutz/base/utils/WebUtil.java

diff --git a/src/main/java/io/v/nutz/base/annontation/RepeatSubmit.java b/src/main/java/io/v/nutz/base/annontation/RepeatSubmit.java
new file mode 100644
index 0000000..1c2e698
--- /dev/null
+++ b/src/main/java/io/v/nutz/base/annontation/RepeatSubmit.java
@@ -0,0 +1,23 @@
+package io.v.nutz.base.annontation;
+
+import java.lang.annotation.*;
+
+/**
+ * 自定义注解防止表单重复提交
+ *
+ * @author ruoyi
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface RepeatSubmit {
+    /**
+     * 间隔时间(ms)，小于此时间视为重复提交
+     */
+    public int interval() default 5000;
+
+    /**
+     * 提示消息
+     */
+    public String message() default "请求过于频繁，请稍后再试";
+}
\ No newline at end of file
diff --git a/src/main/java/io/v/nutz/base/constant/RedisConstant.java b/src/main/java/io/v/nutz/base/constant/RedisConstant.java
index 8978298..6d464bf 100644
--- a/src/main/java/io/v/nutz/base/constant/RedisConstant.java
+++ b/src/main/java/io/v/nutz/base/constant/RedisConstant.java
@@ -22,4 +22,8 @@ public class RedisConstant {
     //健步走小程序TOKEN
     public final static String REDIS_KEY_WE_APP_ACCESS_TOKEN = "weapp:token:";
 
+    /**
+     * 接口重复提交前缀
+     */
+    public static final String REPEAT_SUBMIT_PREFIX = PLATFORM_REDIS_PREFIX + "repeat_submit:";
 }
diff --git a/src/main/java/io/v/nutz/base/exception/BaseException.java b/src/main/java/io/v/nutz/base/exception/BaseException.java
new file mode 100644
index 0000000..e982c60
--- /dev/null
+++ b/src/main/java/io/v/nutz/base/exception/BaseException.java
@@ -0,0 +1,16 @@
+package io.v.nutz.base.exception;
+
+import cn.hutool.core.util.StrUtil;
+
+public class BaseException extends RuntimeException{
+
+    private static final long serialVersionUID = 7192152812384031563L;
+
+    public BaseException(String message) {
+        super(message);
+    }
+
+    public BaseException(String message, Object... arguments) {
+        super(StrUtil.format(message, arguments));
+    }
+}
diff --git a/src/main/java/io/v/nutz/base/interceptor/repeatSubmit/RepeatSubmitAopConfiguration.java b/src/main/java/io/v/nutz/base/interceptor/repeatSubmit/RepeatSubmitAopConfiguration.java
new file mode 100644
index 0000000..2aad748
--- /dev/null
+++ b/src/main/java/io/v/nutz/base/interceptor/repeatSubmit/RepeatSubmitAopConfiguration.java
@@ -0,0 +1,19 @@
+package io.v.nutz.base.interceptor.repeatSubmit;
+
+import io.v.nutz.base.annontation.RepeatSubmit;
+import org.nutz.aop.MethodInterceptor;
+import org.nutz.ioc.Ioc;
+import org.nutz.ioc.aop.SimpleAopMaker;
+import org.nutz.ioc.loader.annotation.IocBean;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+@IocBean(name = "$aop_repeatSubmit")
+public class RepeatSubmitAopConfiguration extends SimpleAopMaker<RepeatSubmit> {
+
+    @Override
+    public List<? extends MethodInterceptor> makeIt(RepeatSubmit repeatSubmit, Method method, Ioc ioc) {
+        return List.of(new RepeatSubmitAopInterceptor(ioc, repeatSubmit, method));
+    }
+}
diff --git a/src/main/java/io/v/nutz/base/interceptor/repeatSubmit/RepeatSubmitAopInterceptor.java b/src/main/java/io/v/nutz/base/interceptor/repeatSubmit/RepeatSubmitAopInterceptor.java
new file mode 100644
index 0000000..d1800f3
--- /dev/null
+++ b/src/main/java/io/v/nutz/base/interceptor/repeatSubmit/RepeatSubmitAopInterceptor.java
@@ -0,0 +1,51 @@
+package io.v.nutz.base.interceptor.repeatSubmit;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONUtil;
+import io.v.nutz.base.annontation.RepeatSubmit;
+import io.v.nutz.base.constant.RedisConstant;
+import io.v.nutz.base.exception.BaseException;
+import io.v.nutz.web.commons.utils.ShiroUtil;
+import org.nutz.aop.InterceptorChain;
+import org.nutz.aop.MethodInterceptor;
+import org.nutz.integration.jedis.RedisService;
+import org.nutz.ioc.Ioc;
+import org.nutz.mvc.Mvcs;
+
+import java.lang.reflect.Method;
+
+public class RepeatSubmitAopInterceptor implements MethodInterceptor {
+
+    protected Ioc ioc;
+
+    public RepeatSubmitAopInterceptor(Ioc ioc, RepeatSubmit repeatSubmit, Method method) {
+        RedisService redisService = ioc.get(RedisService.class);
+    }
+
+    @Override
+    public void filter(InterceptorChain chain) throws Throwable {
+        Method method = chain.getCallingMethod();
+        RepeatSubmit annotation = method.getAnnotation(RepeatSubmit.class);
+        int interval = annotation.interval();
+        RedisService redisService = Mvcs.getIoc().get(RedisService.class);
+        String source = method.getDeclaringClass().getName() + "#" + method.getName();
+        Object[] args = chain.getArgs();
+        String parameterJson = "";
+        if (ObjectUtil.isNotEmpty(args)) {
+            parameterJson = JSONUtil.toJsonStr(args); // 序列化实际参数
+        }
+        String key = RedisConstant.REPEAT_SUBMIT_PREFIX + ShiroUtil.getUserId() + ":" + source;
+
+        Boolean exists = redisService.exists(key);
+        if (exists) {
+            // 判断
+            String oldParameterJson = redisService.get(key);
+            if (oldParameterJson != null && oldParameterJson.equalsIgnoreCase(parameterJson)) {
+                throw new BaseException(annotation.message());
+            }
+        } else {
+            redisService.setex(key, interval / 1000, parameterJson);
+        }
+        chain.doChain();
+    }
+}
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/alipay/controller/AlipayClientController.java b/src/main/java/io/v/nutz/base/payment/alipay/controller/AlipayClientController.java
similarity index 93%
rename from src/main/java/io/v/nutz/zhgh/memberCost/payment/alipay/controller/AlipayClientController.java
rename to src/main/java/io/v/nutz/base/payment/alipay/controller/AlipayClientController.java
index abc1f68..3a20c7c 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/payment/alipay/controller/AlipayClientController.java
+++ b/src/main/java/io/v/nutz/base/payment/alipay/controller/AlipayClientController.java
@@ -1,6 +1,6 @@
-package io.v.nutz.zhgh.memberCost.payment.alipay.controller;
+package io.v.nutz.base.payment.alipay.controller;
 
-import io.v.nutz.zhgh.memberCost.payment.alipay.service.AlipayService;
+import io.v.nutz.base.payment.alipay.service.AlipayService;
 import lombok.extern.slf4j.Slf4j;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/alipay/service/AlipayClientConfig.java b/src/main/java/io/v/nutz/base/payment/alipay/service/AlipayClientConfig.java
similarity index 98%
rename from src/main/java/io/v/nutz/zhgh/memberCost/payment/alipay/service/AlipayClientConfig.java
rename to src/main/java/io/v/nutz/base/payment/alipay/service/AlipayClientConfig.java
index 0594c7c..243fa05 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/payment/alipay/service/AlipayClientConfig.java
+++ b/src/main/java/io/v/nutz/base/payment/alipay/service/AlipayClientConfig.java
@@ -1,4 +1,4 @@
-package io.v.nutz.zhgh.memberCost.payment.alipay.service;
+package io.v.nutz.base.payment.alipay.service;
 
 /**
  * @ClassName AlipayClientConfig
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/alipay/service/AlipayService.java b/src/main/java/io/v/nutz/base/payment/alipay/service/AlipayService.java
similarity index 85%
rename from src/main/java/io/v/nutz/zhgh/memberCost/payment/alipay/service/AlipayService.java
rename to src/main/java/io/v/nutz/base/payment/alipay/service/AlipayService.java
index f0fe4d8..255d7db 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/payment/alipay/service/AlipayService.java
+++ b/src/main/java/io/v/nutz/base/payment/alipay/service/AlipayService.java
@@ -1,4 +1,4 @@
-package io.v.nutz.zhgh.memberCost.payment.alipay.service;
+package io.v.nutz.base.payment.alipay.service;
 
 
 import io.v.nutz.base.service.ViService;
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/alipay/service/impl/AlipayNewServiceImpl.java b/src/main/java/io/v/nutz/base/payment/alipay/service/impl/AlipayNewServiceImpl.java
similarity index 96%
rename from src/main/java/io/v/nutz/zhgh/memberCost/payment/alipay/service/impl/AlipayNewServiceImpl.java
rename to src/main/java/io/v/nutz/base/payment/alipay/service/impl/AlipayNewServiceImpl.java
index b78cd14..2c99caa 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/payment/alipay/service/impl/AlipayNewServiceImpl.java
+++ b/src/main/java/io/v/nutz/base/payment/alipay/service/impl/AlipayNewServiceImpl.java
@@ -1,4 +1,4 @@
-package io.v.nutz.zhgh.memberCost.payment.alipay.service.impl;
+package io.v.nutz.base.payment.alipay.service.impl;
 
 import com.alipay.api.AlipayApiException;
 import com.alipay.api.AlipayConstants;
@@ -7,11 +7,11 @@ import com.alipay.api.domain.AlipayTradeWapPayModel;
 import com.alipay.api.internal.util.AlipaySignature;
 import com.alipay.api.request.AlipayTradeWapPayRequest;
 import com.alipay.api.response.AlipayTradeWapPayResponse;
+import io.v.nutz.base.payment.alipay.service.AlipayClientConfig;
+import io.v.nutz.base.payment.alipay.service.AlipayService;
 import io.v.nutz.base.service.impl.ViServiceImpl;
 import io.v.nutz.web.commons.utils.ShiroUtil;
-import io.v.nutz.zhgh.memberCost.payment.alipay.service.AlipayClientConfig;
 import io.v.nutz.zhgh.memberCost.model.MemberPaymentInfo;
-import io.v.nutz.zhgh.memberCost.payment.alipay.service.AlipayService;
 import lombok.extern.slf4j.Slf4j;
 import org.nutz.dao.Chain;
 import org.nutz.dao.Cnd;
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/enums/RefundStateEnum.java b/src/main/java/io/v/nutz/base/payment/enums/RefundStateEnum.java
similarity index 80%
rename from src/main/java/io/v/nutz/zhgh/memberCost/payment/enums/RefundStateEnum.java
rename to src/main/java/io/v/nutz/base/payment/enums/RefundStateEnum.java
index 3e54d0a..33b6b38 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/payment/enums/RefundStateEnum.java
+++ b/src/main/java/io/v/nutz/base/payment/enums/RefundStateEnum.java
@@ -1,6 +1,8 @@
-package io.v.nutz.zhgh.memberCost.payment.enums;
+package io.v.nutz.base.payment.enums;
 
 import io.v.nutz.base.annontation.SelectEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
 
 /**
  * 退款状态枚举
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/enums/TradingChannelEnum.java b/src/main/java/io/v/nutz/base/payment/enums/TradingChannelEnum.java
similarity index 79%
rename from src/main/java/io/v/nutz/zhgh/memberCost/payment/enums/TradingChannelEnum.java
rename to src/main/java/io/v/nutz/base/payment/enums/TradingChannelEnum.java
index 2f1ea6c..9939c3b 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/payment/enums/TradingChannelEnum.java
+++ b/src/main/java/io/v/nutz/base/payment/enums/TradingChannelEnum.java
@@ -1,6 +1,8 @@
-package io.v.nutz.zhgh.memberCost.payment.enums;
+package io.v.nutz.base.payment.enums;
 
 import io.v.nutz.base.annontation.SelectEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
 
 /**
  * 交易渠道枚举
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/enums/TradingStateEnum.java b/src/main/java/io/v/nutz/base/payment/enums/TradingStateEnum.java
similarity index 79%
rename from src/main/java/io/v/nutz/zhgh/memberCost/payment/enums/TradingStateEnum.java
rename to src/main/java/io/v/nutz/base/payment/enums/TradingStateEnum.java
index 17c7c9f..95703dc 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/payment/enums/TradingStateEnum.java
+++ b/src/main/java/io/v/nutz/base/payment/enums/TradingStateEnum.java
@@ -1,6 +1,8 @@
-package io.v.nutz.zhgh.memberCost.payment.enums;
+package io.v.nutz.base.payment.enums;
 
 import io.v.nutz.base.annontation.SelectEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
 
 
 /**
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/enums/TradingTypeEnum.java b/src/main/java/io/v/nutz/base/payment/enums/TradingTypeEnum.java
similarity index 75%
rename from src/main/java/io/v/nutz/zhgh/memberCost/payment/enums/TradingTypeEnum.java
rename to src/main/java/io/v/nutz/base/payment/enums/TradingTypeEnum.java
index 31865e4..174dd6a 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/payment/enums/TradingTypeEnum.java
+++ b/src/main/java/io/v/nutz/base/payment/enums/TradingTypeEnum.java
@@ -1,6 +1,8 @@
-package io.v.nutz.zhgh.memberCost.payment.enums;
+package io.v.nutz.base.payment.enums;
 
 import io.v.nutz.base.annontation.SelectEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
 
 /**
  * 交易类型枚举
diff --git a/src/main/java/io/v/nutz/base/payment/enums/WxPayResultCode.java b/src/main/java/io/v/nutz/base/payment/enums/WxPayResultCode.java
new file mode 100644
index 0000000..2a9e741
--- /dev/null
+++ b/src/main/java/io/v/nutz/base/payment/enums/WxPayResultCode.java
@@ -0,0 +1,30 @@
+package io.v.nutz.base.payment.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @version 1.0
+ * @Author zzr
+ * @name：WxPayResultCode
+ * @Date 2025/3/10 10:27
+ * @注释 微信支付返回码
+ */
+@Getter
+@AllArgsConstructor
+public enum WxPayResultCode {
+
+    SUCCESS(200, "操作成功"),
+    APPID_MCHID_NOT_MATCH(400, "商户ID和服务号或企业微信号不匹配"),
+    INVALID_REQUEST(400, "无效请求"),
+    MCH_NOT_EXISTS(400, "商户号不存在"),
+    PARAM_ERROR(400, "参数错误"),
+    SIGN_ERROR(401, "签名错误"),
+    NO_AUTH(403, "商户无权限"),
+    OUT_TRADE_NO_USED(403, "商户订单号重复"),
+    FREQUENCY_LIMITED(429, "频率超限"),
+    SYSTEM_ERROR(500, "系统错误");
+
+    final int code;
+    final String msg;
+}
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/model/PaymentTransaction.java b/src/main/java/io/v/nutz/base/payment/model/PaymentTransaction.java
similarity index 91%
rename from src/main/java/io/v/nutz/zhgh/memberCost/payment/model/PaymentTransaction.java
rename to src/main/java/io/v/nutz/base/payment/model/PaymentTransaction.java
index 1a9c092..12ec042 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/payment/model/PaymentTransaction.java
+++ b/src/main/java/io/v/nutz/base/payment/model/PaymentTransaction.java
@@ -1,6 +1,10 @@
-package io.v.nutz.zhgh.memberCost.payment.model;
+package io.v.nutz.base.payment.model;
 
 import io.v.nutz.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
 
 import java.math.BigDecimal;
 
@@ -83,7 +87,7 @@ public class PaymentTransaction extends BaseModel {
     @Column
     @Comment("退款金额")
     @ColDefine(customType = "decimal")
-    private String refundAmount;
+    private BigDecimal refundAmount;
 
     @Column
     @Comment("订单描述")
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/model/RefundRecord.java b/src/main/java/io/v/nutz/base/payment/model/RefundRecord.java
similarity index 87%
rename from src/main/java/io/v/nutz/zhgh/memberCost/payment/model/RefundRecord.java
rename to src/main/java/io/v/nutz/base/payment/model/RefundRecord.java
index d65049f..a8757ca 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/payment/model/RefundRecord.java
+++ b/src/main/java/io/v/nutz/base/payment/model/RefundRecord.java
@@ -1,6 +1,10 @@
-package io.v.nutz.zhgh.memberCost.payment.model;
+package io.v.nutz.base.payment.model;
 
 import io.v.nutz.base.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
 
 import java.math.BigDecimal;
 
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/bean/WxPayV3Bean.java b/src/main/java/io/v/nutz/base/payment/wxpay/bean/WxPayV3Bean.java
similarity index 95%
rename from src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/bean/WxPayV3Bean.java
rename to src/main/java/io/v/nutz/base/payment/wxpay/bean/WxPayV3Bean.java
index 4999027..ea01f2f 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/bean/WxPayV3Bean.java
+++ b/src/main/java/io/v/nutz/base/payment/wxpay/bean/WxPayV3Bean.java
@@ -1,4 +1,4 @@
-package io.v.nutz.zhgh.memberCost.payment.wxpay.bean;
+package io.v.nutz.base.payment.wxpay.bean;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/pem/apiclient_cert.pem b/src/main/java/io/v/nutz/base/payment/wxpay/pem/apiclient_cert.pem
similarity index 100%
rename from src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/pem/apiclient_cert.pem
rename to src/main/java/io/v/nutz/base/payment/wxpay/pem/apiclient_cert.pem
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/pem/apiclient_key.pem b/src/main/java/io/v/nutz/base/payment/wxpay/pem/apiclient_key.pem
similarity index 100%
rename from src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/pem/apiclient_key.pem
rename to src/main/java/io/v/nutz/base/payment/wxpay/pem/apiclient_key.pem
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/pem/wechatpay.pem b/src/main/java/io/v/nutz/base/payment/wxpay/pem/wechatpay.pem
similarity index 100%
rename from src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/pem/wechatpay.pem
rename to src/main/java/io/v/nutz/base/payment/wxpay/pem/wechatpay.pem
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/service/WxPayCommonService.java b/src/main/java/io/v/nutz/base/payment/wxpay/service/WxPayCommonService.java
similarity index 84%
rename from src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/service/WxPayCommonService.java
rename to src/main/java/io/v/nutz/base/payment/wxpay/service/WxPayCommonService.java
index 60d8689..25215d9 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/service/WxPayCommonService.java
+++ b/src/main/java/io/v/nutz/base/payment/wxpay/service/WxPayCommonService.java
@@ -1,6 +1,7 @@
-package io.v.nutz.zhgh.memberCost.payment.wxpay.service;
+package io.v.nutz.base.payment.wxpay.service;
 
-import io.v.nutz.zhgh.memberCost.payment.wxpay.vo.WxPayNeedParamVo;
+import io.v.nutz.base.payment.wxpay.vo.WxPayNeedParamVo;
+import io.v.nutz.base.result.Result;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -21,7 +22,7 @@ public interface WxPayCommonService {
      *                注意Amount的总价total是int类型，会自动乘以0.01，例如传递100元，会自动转换为1元
      * @return
      */
-    String nativePay(WxPayNeedParamVo paramVo);
+    Result nativePay(WxPayNeedParamVo paramVo);
 
 
     /**
@@ -31,7 +32,7 @@ public interface WxPayCommonService {
      *                JsAPI支付，需要传递openId，请自行获取
      * @return
      */
-    String jsApiPay(WxPayNeedParamVo paramVo);
+    Result jsApiPay(WxPayNeedParamVo paramVo);
 
     /**
      * WAP支付，返回支付参数
@@ -39,7 +40,7 @@ public interface WxPayCommonService {
      *                注意Amount的总价total是int类型，会自动乘以0.01，例如传递100元，会自动转换为1元
      * @return
      */
-    String wapPay(WxPayNeedParamVo paramVo);
+    Result wapPay(WxPayNeedParamVo paramVo);
 
 
     /**
@@ -56,7 +57,7 @@ public interface WxPayCommonService {
      * @param outTradeNo 商户订单号
      * @return
      */
-    String refund(String transactionId, String outTradeNo);
+    Result refund(String transactionId, String outTradeNo);
 
 
     /**
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/service/impl/WxPayCommonServiceImpl.java b/src/main/java/io/v/nutz/base/payment/wxpay/service/impl/WxPayCommonServiceImpl.java
similarity index 81%
rename from src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/service/impl/WxPayCommonServiceImpl.java
rename to src/main/java/io/v/nutz/base/payment/wxpay/service/impl/WxPayCommonServiceImpl.java
index 8d2a0a0..66c294a 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/service/impl/WxPayCommonServiceImpl.java
+++ b/src/main/java/io/v/nutz/base/payment/wxpay/service/impl/WxPayCommonServiceImpl.java
@@ -1,4 +1,4 @@
-package io.v.nutz.zhgh.memberCost.payment.wxpay.service.impl;
+package io.v.nutz.base.payment.wxpay.service.impl;
 
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
@@ -19,16 +19,29 @@ import com.ijpay.wxpay.WxPayApi;
 import com.ijpay.wxpay.enums.WxDomainEnum;
 import com.ijpay.wxpay.enums.v3.BasePayApiEnum;
 import com.ijpay.wxpay.model.v3.*;
-import io.v.nutz.zhgh.memberCost.payment.wxpay.bean.WxPayV3Bean;
-import io.v.nutz.zhgh.memberCost.payment.wxpay.service.WxPayCommonService;
-import io.v.nutz.zhgh.memberCost.payment.wxpay.vo.WxPayNeedParamVo;
+import io.v.nutz.base.payment.enums.TradingChannelEnum;
+import io.v.nutz.base.payment.enums.TradingTypeEnum;
+import io.v.nutz.base.payment.enums.WxPayResultCode;
+import io.v.nutz.base.payment.model.PaymentTransaction;
+import io.v.nutz.base.payment.wxpay.bean.WxPayV3Bean;
+import io.v.nutz.base.payment.wxpay.service.WxPayCommonService;
+import io.v.nutz.base.payment.wxpay.vo.WxPayNeedParamVo;
+import io.v.nutz.base.result.Result;
+import io.v.nutz.sys.models.User;
+import io.v.nutz.sys.services.SysUserService;
+import io.v.nutz.web.commons.utils.ShiroUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.nutz.dao.Cnd;
+import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.random.R;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayInputStream;
 import java.io.FileWriter;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.nio.charset.StandardCharsets;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
@@ -50,14 +63,15 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
     // 判断下单接口成功返回码
     private final static int OK = 200;
 
+    // 1666930980 商户号
     // 微信V3必要的支付参数，后期优化
     private final static WxPayV3Bean WX_PAY_V3_BEAN = new WxPayV3Bean(
             "ww3eda050a1b5ad96e",
-            "src/main/java/io/v/nutz/zhgh/memberCost/wxpay/pem/apiclient_key.pem",
-            "src/main/java/io/v/nutz/zhgh/memberCost/wxpay/pem/apiclient_key.pem",
-            "src/main/java/io/v/nutz/zhgh/memberCost/wxpay/pem/apiclient_cert.pem",
-            "src/main/java/io/v/nutz/zhgh/memberCost/wxpay/pem/apiclient_cert.pem",
-            "src/main/java/io/v/nutz/zhgh/memberCost/wxpay/pem/wechatpay.pem",
+            "src/main/java/io/v/nutz/base/payment/wxpay/pem/apiclient_key.pem",
+            "src/main/java/io/v/nutz/base/payment/wxpay/wxpay/pem/apiclient_key.pem",
+            "src/main/java/io/v/nutz/base/payment/wxpay/pem/apiclient_cert.pem",
+            "src/main/java/io/v/nutz/base/payment/wxpay/pem/apiclient_cert.pem",
+            "src/main/java/io/v/nutz/base/payment/wxpay/pem/wechatpay.pem",
             "1666930980",
             "",
             "4ebd020883285d698c44ec50939c0967",
@@ -65,9 +79,12 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
             "");
 
     // 自定义参数，内容是统一的，但会被多次调用，直接声明
-    String serialNo;
-    String platSerialNo;
-    String payNotifyUrl = WX_PAY_V3_BEAN.getDomain().concat("/wxPay/notifyMessage");
+    private String serialNo;
+    private String platSerialNo;
+    private final String payNotifyUrl = WX_PAY_V3_BEAN.getDomain().concat("/wxPay/notifyMessage");
+
+    @Inject
+    private SysUserService sysUserService;
 
     /**
      * 微信扫描二维码支付
@@ -76,7 +93,7 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
      * @return
      */
     @Override
-    public String nativePay(WxPayNeedParamVo paramVo) {
+    public Result nativePay(WxPayNeedParamVo paramVo) {
         try {
             // 商户订单号，存储当前用户的订单
             String outTradeNo = PayKit.generateStr();
@@ -113,20 +130,25 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
             // 下单返回数据
             String result = response.getBody();
 
-            if (result != null) {
-                // 向数据库插入订单记录
-            }
+            JSONObject jsonObject = JSONUtil.parseObj(result);
 
-            return result;
+            if (response.getStatus() == OK) {
+                // 统一下单成功，向数据库插入订单记录
+                insertTradingOrder(paramVo, outTradeNo, result);
+                return Result.success("请在三分钟内完成支付，超时将自动取消订单").addData(result);
+            } else {
+                WxPayResultCode code = WxPayResultCode.valueOf(WxPayResultCode.class, jsonObject.getStr("code"));
+                return Result.error(code.getMsg());
+            }
         } catch (Exception e) {
             log.error("系统异常", e);
-            return e.getMessage();
+            return Result.error(e.getMessage());
         }
     }
 
 
     @Override
-    public String jsApiPay(WxPayNeedParamVo paramVo) {
+    public Result jsApiPay(WxPayNeedParamVo paramVo) {
         try {
             // 商户订单号，存储当前用户的订单
             String outTradeNo = PayKit.generateStr();
@@ -166,18 +188,19 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
                 log.info("唤起支付参数:{}", map);
                 // 唤起支付成功，向数据库插入订单参数
 
-                return JSONUtil.toJsonStr(map);
+                return Result.success(JSONUtil.toJsonStr(map));
             }
-            return JSONUtil.toJsonStr(response);
+//            return JSONUtil.toJsonStr(response);
+            return null;
         } catch (Exception e) {
             log.error("系统异常", e);
-            return e.getMessage();
+            return Result.error(e.getMessage());
         }
     }
 
 
     @Override
-    public String wapPay(WxPayNeedParamVo paramVo) {
+    public Result wapPay(WxPayNeedParamVo paramVo) {
         try {
             // 商户订单号，存储当前用户的订单
             String outTradeNo = PayKit.generateStr();
@@ -215,12 +238,13 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
             log.info("verifySignature: {}", verifySignature);
             if (response.getStatus() == OK && verifySignature) {
                 String body = response.getBody();
-                return JSONUtil.toJsonStr(body);
+                return Result.success(JSONUtil.toJsonStr(body));
             }
-            return JSONUtil.toJsonStr(response);
+//            return JSONUtil.toJsonStr(response);
+            return null;
         } catch (Exception e) {
             log.error("系统异常", e);
-            return e.getMessage();
+            return Result.error(e.getMessage());
         }
     }
 
@@ -278,7 +302,7 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
      * @return
      */
     @Override
-    public String refund(String transactionId, String outTradeNo) {
+    public Result refund(String transactionId, String outTradeNo) {
         try {
             String outRefundNo = PayKit.generateStr();
             log.info("商户退款单号: {}", outRefundNo);
@@ -324,11 +348,11 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
             log.info("退款响应 {}", response);
 
             if (verifySignature) {
-                return response.getBody();
+                return Result.success(response.getBody());
             }
         } catch (Exception e) {
             log.error("系统异常", e);
-            return e.getMessage();
+            return Result.error(e.getMessage());
         }
         return null;
     }
@@ -476,4 +500,39 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
         DateTime dateTime = DateUtil.date(currentTimeMillis);
         return DateUtil.format(dateTime, "yyyy-MM-dd'T'HH:mm:ssXXX");
     }
+
+
+    /**
+     * 公共方法，插入交易订单
+     * @param paramVo       交易必填参数Vo
+     * @param outTradeNo    商户交易号
+     * @param result        下单返回结构
+     */
+    private void insertTradingOrder(WxPayNeedParamVo paramVo, String outTradeNo, String result){
+        User user = sysUserService.dao().fetch(User.class, Cnd.where("id", "=", ShiroUtil.getUserId()));
+        PaymentTransaction transaction = new PaymentTransaction();
+        transaction.setId(R.UU32());
+        transaction.setMchId(WX_PAY_V3_BEAN.getMchId());
+        transaction.setOutTradeNo(outTradeNo);
+        transaction.setTradingOrderNo(null);
+        transaction.setTradingChannel(TradingChannelEnum.WX_PAY.name());
+        transaction.setTradingType(TradingTypeEnum.PAYMENT.name());
+        transaction.setUserId(user.getId());
+        transaction.setLoginName(user.getLoginname());
+        transaction.setUserName(user.getUsername());
+        transaction.setUnitName(user.getUnitname());
+        transaction.setUnionName(user.getUnionname());
+        // 获取订单金额
+        int total = paramVo.getAmount().getTotal();
+        BigDecimal bigDecimalValue  = new BigDecimal(String.valueOf(total));
+        BigDecimal resultTotal =  bigDecimalValue.divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP);
+        transaction.setTradingAmount(resultTotal);
+        transaction.setIsRefund(false);
+        transaction.setRefundAmount(null);
+        transaction.setDescription(paramVo.getDescription());
+        transaction.setAttach(paramVo.getAttach());
+        transaction.setOpenId(null);
+        transaction.setResultJson(result);
+        sysUserService.dao().insert(transaction);
+    }
 }
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/vo/WxPayNeedParamVo.java b/src/main/java/io/v/nutz/base/payment/wxpay/vo/WxPayNeedParamVo.java
similarity index 94%
rename from src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/vo/WxPayNeedParamVo.java
rename to src/main/java/io/v/nutz/base/payment/wxpay/vo/WxPayNeedParamVo.java
index 58977a1..8b374a0 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/payment/wxpay/vo/WxPayNeedParamVo.java
+++ b/src/main/java/io/v/nutz/base/payment/wxpay/vo/WxPayNeedParamVo.java
@@ -1,4 +1,4 @@
-package io.v.nutz.zhgh.memberCost.payment.wxpay.vo;
+package io.v.nutz.base.payment.wxpay.vo;
 
 import com.ijpay.wxpay.model.v3.Amount;
 import com.ijpay.wxpay.model.v3.Payer;
diff --git a/src/main/java/io/v/nutz/base/utils/WebUtil.java b/src/main/java/io/v/nutz/base/utils/WebUtil.java
new file mode 100644
index 0000000..7bd68e7
--- /dev/null
+++ b/src/main/java/io/v/nutz/base/utils/WebUtil.java
@@ -0,0 +1,33 @@
+package io.v.nutz.base.utils;
+
+import org.nutz.json.JsonFormat;
+import org.nutz.lang.Encoding;
+import org.nutz.mvc.view.UTF8JsonView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * @author wizzer@qq.com
+ */
+public class WebUtil {
+
+    public static String AjaxEncode = Encoding.UTF8;
+
+    public static boolean isAjax(HttpServletRequest req) {
+        String value = req.getHeader("X-Requested-With");
+        return value != null && "XMLHttpRequest".equalsIgnoreCase(value.trim());
+    }
+
+    public static void rendAjaxResp(HttpServletRequest req, HttpServletResponse resp, Object re) {
+        try {
+            if (AjaxEncode != null) {
+                resp.setCharacterEncoding(AjaxEncode);
+            }
+            (new UTF8JsonView(JsonFormat.compact())).render(req, resp, re);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/src/main/java/io/v/nutz/web/commons/proc/WkFailProcessor.java b/src/main/java/io/v/nutz/web/commons/proc/WkFailProcessor.java
index 34e5cd9..5707521 100644
--- a/src/main/java/io/v/nutz/web/commons/proc/WkFailProcessor.java
+++ b/src/main/java/io/v/nutz/web/commons/proc/WkFailProcessor.java
@@ -1,6 +1,8 @@
 package io.v.nutz.web.commons.proc;
 
+import io.v.nutz.base.exception.BaseException;
 import io.v.nutz.base.result.Result;
+import io.v.nutz.base.utils.WebUtil;
 import org.nutz.integration.shiro.NutShiro;
 import org.nutz.ioc.IocException;
 import org.nutz.log.Log;
@@ -27,13 +29,24 @@ public class WkFailProcessor extends ViewProcessor {
             String uri = Mvcs.getRequestPath(ac.getRequest());
             log.warn(String.format("Error@%s :", uri), ac.getError());
         }
-        if (ac.getError() instanceof IocException) {
+        Throwable e = ac.getError();
+        if (e instanceof IocException) {
             if (NutShiro.isAjax(ac.getRequest())) {
                 NutShiro.rendAjaxResp(ac.getRequest(), ac.getResponse(), Result.error(Mvcs.getMessage(ac.getRequest(), "system.exception")));
             } else {
                 ac.getRequest().setAttribute("original_request_uri",ac.getRequest().getRequestURI());
                 new ForwardView(errorUri).render(ac.getRequest(), ac.getResponse(), Mvcs.getMessage(ac.getRequest(), "system.exception"));
             }
+        } else if (e instanceof BaseException) {
+            if (WebUtil.isAjax(ac.getRequest())) {
+//                WebUtil.rendAjaxResp(ac.getRequest(), ac.getResponse(), Result.error(ResultCode.FAILURE.getCode(), !log.isDebugEnabled() ? ResultCode.FAILURE.getMsg() : e.getMessage()));
+                WebUtil.rendAjaxResp(ac.getRequest(), ac.getResponse(), Result.error(400, e.getMessage()));
+            } else {
+                ac.getRequest().setAttribute("original_request_uri", ac.getRequest().getRequestURI());
+                ac.getRequest().setAttribute("error_message", Mvcs.getMessage(ac.getRequest(), "业务异常"));
+//                new ForwardView(errorUri).render(ac.getRequest(), ac.getResponse(), null);
+            }
+            return;
         }
         super.process(ac);
     }
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentMineController.java b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentMineController.java
index 84b8f67..eccff62 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentMineController.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentMineController.java
@@ -1,6 +1,9 @@
 package io.v.nutz.zhgh.memberCost.controller;
 
-import io.v.nutz.zhgh.memberCost.payment.wxpay.service.WxPayCommonService;
+import com.ijpay.wxpay.model.v3.Amount;
+import io.v.nutz.base.annontation.RepeatSubmit;
+import io.v.nutz.base.payment.wxpay.service.WxPayCommonService;
+import io.v.nutz.base.payment.wxpay.vo.WxPayNeedParamVo;
 import io.v.nutz.zhgh.memberCost.service.MemberPaymentService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -29,12 +32,24 @@ public class MemberPaymentMineController {
 
     @At("")
     @Ok("beetl:/platform/membercost/mine/index.html")
-    @RequiresPermissions("member.payment.project")
+    @RequiresPermissions("member.payment.mine")
     public void index() {
     }
 
 
+    @At
     public Object pageData(){
         return null;
     }
+
+
+    @At
+    @RepeatSubmit
+    public Object pcOrderPay(){
+        WxPayNeedParamVo paramVo = new WxPayNeedParamVo();
+        paramVo.setDescription("会费缴纳支付");
+        paramVo.setAttach("");
+        paramVo.setAmount(new Amount().setTotal(1));
+        return wxPayCommonService.nativePay(paramVo);
+    }
 }

From d0f6bcb3f417fe17c179f1c79ea3d1fac02d073a Mon Sep 17 00:00:00 2001
From: Paidax <paidax.422@qq.com>
Date: Mon, 10 Mar 2025 11:49:42 +0800
Subject: [PATCH 07/17] =?UTF-8?q?=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/{RefundRecord.java => PaymentRefundRecord.java}       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/main/java/io/v/nutz/base/payment/model/{RefundRecord.java => PaymentRefundRecord.java} (96%)

diff --git a/src/main/java/io/v/nutz/base/payment/model/RefundRecord.java b/src/main/java/io/v/nutz/base/payment/model/PaymentRefundRecord.java
similarity index 96%
rename from src/main/java/io/v/nutz/base/payment/model/RefundRecord.java
rename to src/main/java/io/v/nutz/base/payment/model/PaymentRefundRecord.java
index a8757ca..064b6ff 100644
--- a/src/main/java/io/v/nutz/base/payment/model/RefundRecord.java
+++ b/src/main/java/io/v/nutz/base/payment/model/PaymentRefundRecord.java
@@ -15,7 +15,7 @@ import java.math.BigDecimal;
 @Table
 @Comment("退款记录表")
 @EqualsAndHashCode(callSuper = true)
-public class RefundRecord extends BaseModel {
+public class PaymentRefundRecord extends BaseModel {
 
     @Column
     @Name

From 0ec1c55038a615fd868228cf9b5fb9b12ab42041 Mon Sep 17 00:00:00 2001
From: zhouhefeng <zhouhefeng915@163.com>
Date: Mon, 10 Mar 2025 19:25:57 +0800
Subject: [PATCH 08/17] commit

---
 .../MemberPaymentMineController.java          |  60 +++-
 .../mobile/svg/memberPay/pcPaySuccess.svg     |   1 +
 .../assets/mobile/svg/memberPay/wx_img.png    | Bin 0 -> 62232 bytes
 .../views/platform/membercost/mine/index.html | 305 +++++++++++++++++-
 4 files changed, 357 insertions(+), 9 deletions(-)
 create mode 100644 src/main/resources/static/assets/mobile/svg/memberPay/pcPaySuccess.svg
 create mode 100644 src/main/resources/static/assets/mobile/svg/memberPay/wx_img.png

diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentMineController.java b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentMineController.java
index eccff62..3e46303 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentMineController.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentMineController.java
@@ -1,12 +1,22 @@
 package io.v.nutz.zhgh.memberCost.controller;
 
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.wizzer.framework.base.Result;
 import com.ijpay.wxpay.model.v3.Amount;
 import io.v.nutz.base.annontation.RepeatSubmit;
+import io.v.nutz.base.annontation.ViReturn;
 import io.v.nutz.base.payment.wxpay.service.WxPayCommonService;
 import io.v.nutz.base.payment.wxpay.vo.WxPayNeedParamVo;
+import io.v.nutz.base.query.PageForm;
+import io.v.nutz.web.commons.utils.ShiroUtil;
+import io.v.nutz.zhgh.memberCost.model.MemberPaymentInfo;
 import io.v.nutz.zhgh.memberCost.service.MemberPaymentService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.mvc.annotation.At;
@@ -38,18 +48,60 @@ public class MemberPaymentMineController {
 
 
     @At
-    public Object pageData(){
-        return null;
+    @ViReturn
+    @RequiresPermissions("member.payment.mine")
+    public Object pageData(PageForm pageForm, Integer year, Integer isPay) {
+        Sql sql = Sqls.create("""
+                SELECT
+                	
+                	mpp.`year`,
+                	mpp.projectName,
+                	mpp.startTime,
+                	mpp.endTime,
+                	mpi.id,
+                	mpi.payId,
+                	mpi.isPayment,
+                	mpi.payPersonnel,
+                	mpi.personType,
+                	mpi.paymentMonth,
+                	mpc.paymentStartMonth,
+                	mpc.paymentEndMonth,
+                	mpc.payStandards
+                FROM
+                	`member_payment_info` mpi
+                	LEFT JOIN member_payment_project mpp ON mpi.paymentProjectId = mpp.id
+                	LEFT JOIN member_payment_config mpc ON mpc.id = mpp.configId
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.andEX("YEAR(mpp.createTime)", "=", year);
+        cnd.andEX("mpi.userId", "=", ShiroUtil.getUserId());
+        cnd.andEX("mpp.isDisabled", "=", 0);
+        if (ObjectUtil.isNotNull(isPay)) {
+            cnd.and("mpi.isPayment", "=", isPay);
+        }
+        sql.setCondition(cnd);
+        return memberPaymentService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
     }
 
 
     @At
     @RepeatSubmit
-    public Object pcOrderPay(){
+    @RequiresPermissions("member.payment.mine")
+    public Object pcOrderPay(Integer paymentMoney) {
         WxPayNeedParamVo paramVo = new WxPayNeedParamVo();
         paramVo.setDescription("会费缴纳支付");
         paramVo.setAttach("");
-        paramVo.setAmount(new Amount().setTotal(1));
+        paramVo.setAmount(new Amount().setTotal(paymentMoney));
         return wxPayCommonService.nativePay(paramVo);
     }
+
+
+    @At
+    @RequiresPermissions("member.payment.mine")
+    public Object getIsPay(String paymentInfoId) {
+        MemberPaymentInfo info = memberPaymentService.dao().fetch(MemberPaymentInfo.class,
+                Cnd.where("id", "=", paymentInfoId).and("isPayment", "=", 1));
+        return Result.success(info);
+    }
 }
diff --git a/src/main/resources/static/assets/mobile/svg/memberPay/pcPaySuccess.svg b/src/main/resources/static/assets/mobile/svg/memberPay/pcPaySuccess.svg
new file mode 100644
index 0000000..57ee4a3
--- /dev/null
+++ b/src/main/resources/static/assets/mobile/svg/memberPay/pcPaySuccess.svg
@@ -0,0 +1 @@
+<svg t="1741604634908" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5087" width="32" height="32"><path d="M501.009067 0C224.50176 0 0.395947 229.198507 0.395947 512s224.105813 512 500.626773 512c276.514133 0 500.619947-229.198507 500.619947-512S777.434453 0 501.015893 0z m-39.103147 732.99968L257.938773 514.300587l52.210347-44.305067L428.168533 567.405227c48.011947-60.299947 155.56608-180.599467 303.506774-276.39808l12.417706 30.399146c-135.816533 131.50208-247.186773 316.798293-282.187093 411.600214z" fill="#06B464" p-id="5088"></path></svg>
diff --git a/src/main/resources/static/assets/mobile/svg/memberPay/wx_img.png b/src/main/resources/static/assets/mobile/svg/memberPay/wx_img.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd3d9e2f0f302231c66adb477aab22573f86b629
GIT binary patch
literal 62232
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

literal 0
HcmV?d00001

diff --git a/src/main/resources/views/platform/membercost/mine/index.html b/src/main/resources/views/platform/membercost/mine/index.html
index f8f080a..21a7412 100644
--- a/src/main/resources/views/platform/membercost/mine/index.html
+++ b/src/main/resources/views/platform/membercost/mine/index.html
@@ -1,15 +1,310 @@
 <!--#
 layout("/layouts/platform.html"){
 #-->
-<div id="app" v-cloak></div>
+<style>
+    .payForm .el-form-item__label {
+        font-weight: bold;
+    }
+</style>
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <template>
+            <el-card shadow="never">
+                <div class="search">
+                    <div class="search-item">
+                        <div class="search-item-label">年度：</div>
+                        <div class="search-item-option">
+                            <el-date-picker
+                                :clearable="false"
+                                @change="doSearch();getProjectList()"
+                                placeholder="选择年度"
+                                type="year"
+                                style="width: 100%"
+                                v-model="pageForm.year"
+                                value-format="yyyy"
+                            ></el-date-picker>
+                        </div>
+                    </div>
+                </div>
+            </el-card>
+            <el-card shadow="never">
+                <table-tool label="缴费列表" :app="this">
+                    <template #func>
+                        <el-radio-group @change="doSearch" class="mr10" size="small"
+                                        v-model="pageForm.isPay">
+                            <el-radio-button :label="null">全部</el-radio-button>
+                            <el-radio-button :label="true">已缴</el-radio-button>
+                            <el-radio-button :label="false">未缴</el-radio-button>
+                        </el-radio-group>
+                    </template>
+                </table-tool>
+                <el-table
+                    :data="tableData"
+                    :size="tableSize"
+                    @sort-change="pageOrder"
+                    class="vi-table"
+                    ref="table"
+                    row-key="id"
+                    style="width: 100%"
+                    v-loading="tableLoading"
+                >
+                    <el-table-column
+                        :index="indexMethod"
+                        align="center"
+                        header-align="center"
+                        label="序号"
+                        type="index"
+                        width="80px"
+                    ></el-table-column>
+                    <el-table-column
+                        :label="column.label"
+                        :prop="column.prop"
+                        :sortable="column.sortable"
+                        align="center"
+                        header-align="center"
+                        show-overflow-tooltip
+                        v-for="column in tableColumns"
+                    >
+                        <template scope="{row}" v-if="column.prop==='isPayment'">
+                            <span style="color: #00aa3a" v-if="row.isPayment">已缴</span>
+                            <span style="color: red" v-else>未缴</span>
+                        </template>
+                        <template scope="{row}" v-else-if="column.prop==='paymentStartMonth'">
+                            {{row.paymentStartMonth}}至{{row.paymentEndMonth}}
+                        </template>
+                    </el-table-column>
+                    <el-table-column align="center" header-align="center" label="操作"
+                                     prop="userOnline" width="200px">
+                        <template scope="{row}">
+                            <el-button :disabled="row.isPayment" @click="openPay(row)"
+                                       size="mini" type="primary">缴费
+                            </el-button>
+                            <el-button @click="openPay(row)"
+                                       size="mini" type="primary">缴费
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <!--#include("/layouts/pagination.html"){}#-->
+            </el-card>
+        </template>
+    </guava>
+
+    <el-diaLog :close-on-click-modal="false" :visible.sync="payVisible" title="缴费" width="50%"
+               :before-close="clickClose">
+        <el-form ref="form" :model="formData" :rules="formRules" label-width="170px"
+                 label-suffix="：" class="payForm">
+
+            <el-steps :active="payActive" finish-status="success">
+                <el-step title="计算缴费金额"></el-step>
+                <el-step title="生成缴费二维码"></el-step>
+                <el-step title="完成"></el-step>
+            </el-steps>
+            <div v-if="payActive===0" class="mt25">
+                <el-form-item label="缴费所属时间">
+                    <div>{{formData.paymentStartMonth}}至{{formData.paymentEndMonth}}</div>
+                </el-form-item>
+                <el-form-item label="缴费标准">
+                    <div style="color: red"
+                         v-if="formData.payModeValueList&&formData.payModeValueList.length>0">
+                        (
+                        <template v-for="(o,i) in formData.payModeValueList">
+                            {{o.name}}
+                            <template v-if="i !=formData.payModeValueList.length-1">+</template>
+                        </template>
+                        ) * 0.5% * {{formData.paymentMonth}}个月
+                    </div>
+                    <div v-else>固定金额缴费</div>
+                </el-form-item>
+                <!--如果是根据比例算的-->
+                <div v-if="formData.payModeValueList&&formData.payModeValueList.length>0">
+
+                    <template v-for="(o,i) in formData.payModeValueList" :key="i">
+                        <el-form-item :label="o.name">
+                            <el-input-number v-model="o.value" :min="0" :max="1000000"
+                                             :precision="2"
+                                             placeholder="请输入缴费金额"
+                                             @change="changePayModeValue(o)"></el-input-number>
+                        </el-form-item>
+                    </template>
+                </div>
+                <el-form-item label="支付金额">
+                    <div style="color: #2cd000;font-size: 25px">¥ {{formData.paymentMoney}}</div>
+                </el-form-item>
+            </div>
+
+            <div v-if="payActive===1" class="mt25">
+                <el-form-item label="商品订单">
+                    {{formData.tradingOrderNo}}
+                </el-form-item>
+                <el-form-item label="支付金额">
+                    <div style="color: #2cd000;font-size: 25px">¥ {{formData.paymentMoney}}</div>
+                </el-form-item>
+                <div style="width: 100%;">
+                    <el-row :gutter="20">
+                        <el-col :span="12" v-loading="qrcodeLoading">
+                            <div id="qrcode" style="width: 60%;left: 0;right: 0;margin: auto"></div>
+                            <div style="display: flex;justify-content: center">
+                                <span
+                                    style="font-weight: bold;
+                                    font-size: 15px;
+                                    color: #fbfbfb;
+                                    background-color: rgb(44, 208, 0);
+                                    height: 30px;
+                                    width: 60%;
+                                    display: flex;
+                                    justify-content: center;
+                                    align-items: center;">
+                                    请打开手机微信，扫一扫完成支付</span>
+                            </div>
+                        </el-col>
+                        <el-col :span="12">
+                            <div>
+                                <el-image src="/assets/mobile/svg/memberPay/wx_img.png"></el-image>
+                            </div>
+                        </el-col>
+                    </el-row>
+                </div>
+            </div>
+            <div v-if="payActive===3">
+
+                <div
+                    style="margin-top: 35px;background-color: RGB(245, 254, 243);height: 100px;display: flex;align-items: center;justify-content: center">
+                    <div>
+                        <el-image
+                            src="/assets/mobile/svg/memberPay/pcPaySuccess.svg"></el-image>
+                    </div>
+                    <div style="font-weight: bold;font-size: 25px">支付成功!</div>
+                </div>
+                <el-form-item label="商品订单">
+                    {{viewInfo.tradingOrderNo}}
+                </el-form-item>
+                <el-form-item label="支付金额">
+                    <div style="color: #2cd000;font-size: 25px">¥ {{viewInfo.paymentMoney}}</div>
+                </el-form-item>
+
+            </div>
+        </el-form>
+        <div style="text-align: right">
+            <span>
+                <el-button @click="clickClose">关 闭</el-button>
+                <el-button @click="next" v-if="payActive===0"
+                           type="primary">下一步</el-button>
+            </span>
+        </div>
+    </el-diaLog>
+
+</div>
 <script>
-    new Vue({
+    const vue = new Vue({
         el: "#app",
+        mixins: [initTableMixins],
         data() {
-            return {}
+            return {
+                tableColumns: [
+                    { prop: "year", label: "年度", sortable: true },
+                    { prop: "projectName", label: "项目名称", sortable: true },
+                    { prop: "startTime", label: "缴费开始时间", sortable: true },
+                    { prop: "endTime", label: "缴费截止时间", sortable: true },
+                    { prop: "paymentStartMonth", label: "缴费所属时间", sortable: true },
+                    { prop: "isPayment", label: "是否缴费", sortable: true }
+                ],
+                pageForm: {
+                    isPay: false,
+                    year: moment().format("YYYY")
+                },
+                payVisible: false,
+                payActive: 0,
+                intervalTimer: null,
+                qrcodeLoading: false,
+                payInfo: {}
+            }
         },
-        methods: {},
-        created() {}
+        methods: {
+            clickClose() {
+                if (this.payActive === 3) {
+                    this.payVisible = false
+                } else {
+                    this.$confirm("您确定要关闭当前缴费吗?关闭后将不会保存当前数据", "提示", {
+                        confirmButtonText: "确定",
+                        cancelButtonText: "取消",
+                        type: "warning"
+                    }).then(() => {
+                        this.payVisible = false
+                    })
+                }
+                clearInterval(this.intervalTimer)
+            },
+            next() {
+                this.$confirm("您确定要生成缴费二维码吗?当前需缴费【" + this.formData.paymentMoney + "】元", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(async () => {
+                    this.qrcodeLoading = true
+                    const paymentMoney = Math.floor(this.formData.paymentMoney * 100)
+                    this.payActive = this.payActive + 1
+                    const resp = await $.post("/platform/member/payment/mine/pcOrderPay", { paymentMoney })
+                    if (resp.code === 0) {
+                        const data = JSON.parse(resp.data)
+                        this.$nextTick(() => {
+                            $("#qrcode").html("")
+                            $("#qrcode").qrcode({ //设置css
+                                render: "canvas", //二维码的生成方式
+                                width: $("#qrcode").width(), //生成二维码的宽度
+                                height: $("#qrcode").width(), //生成二维码的高度
+                                text: data.code_url,
+                                correctLevel: 3 //容错级别，默认为2，最高为3，为了让用户扫码最快，容错级别应当设为最低
+                            })
+                        })
+                        await this.getIsPay()
+                    }
+                    this.qrcodeLoading = false
+                })
+            },
+            async getIsPay() {
+                this.intervalTimer = setInterval(async () => {
+                    const resp = await $.get(loc() + "/getIsPay", { paymentInfoId: this.formData.paymentInfoId })
+                    if (resp.code === 0) {
+                        if (resp.data) {
+                            this.payInfo = resp.data
+                            this.payActive = 3
+                            clearInterval(this.intervalTimer)
+                        }
+                    }
+
+                }, 4000)
+            },
+            changePayModeValue() {
+                let paymentMoney = this.formData.payModeValueList.reduce((a, b) => {
+                    return a + b.value
+                }, 0)
+                this.$set(this.formData, "paymentMoney", parseFloat((paymentMoney * 0.005 * this.formData.paymentMonth).toFixed(2)))
+            },
+            openPay(row) {
+                const payStandards = JSON.parse(row.payStandards)
+                const payStandard = payStandards.find(p => p.payPersonnel === row.payPersonnel && p.personType === row.personType)
+                this.$set(this.formData, "paymentMonth", row.paymentMonth)
+                this.$set(this.formData, "paymentStartMonth", row.paymentStartMonth)
+                this.$set(this.formData, "paymentEndMonth", row.paymentEndMonth)
+                this.$set(this.formData, "paymentInfoId", row.id)
+                if (payStandard.payModeValue) {
+                    this.$set(this.formData, "payModeValueList", [])
+                    this.$set(this.formData, "paymentMoney", payStandard.payModeValue)
+                } else {
+                    this.$set(this.formData, "payModeValueList", payStandard.payModeValueList)
+                    this.$set(this.formData, "paymentMoney", 0)
+                }
+
+
+                this.payVisible = true
+            },
+            doSubmit() {
+            }
+        },
+        created() {
+            this.pageData()
+        }
     })
 </script>
 <!--#

From 7f02dffebeafc7a19b42531655ee73dce29bde30 Mon Sep 17 00:00:00 2001
From: zhouhefeng <zhouhefeng915@163.com>
Date: Mon, 10 Mar 2025 20:08:15 +0800
Subject: [PATCH 09/17] commit

---
 .../MemberPaymentMineController.java          |  6 +-
 .../views/platform/membercost/mine/index.html | 56 ++++++++++---------
 2 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentMineController.java b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentMineController.java
index 3e46303..4ba5373 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentMineController.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentMineController.java
@@ -90,7 +90,7 @@ public class MemberPaymentMineController {
     @RequiresPermissions("member.payment.mine")
     public Object pcOrderPay(Integer paymentMoney) {
         WxPayNeedParamVo paramVo = new WxPayNeedParamVo();
-        paramVo.setDescription("会费缴纳支付");
+        paramVo.setDescription(ShiroUtil.getPlatformUsername() + "会费缴纳支付");
         paramVo.setAttach("");
         paramVo.setAmount(new Amount().setTotal(paymentMoney));
         return wxPayCommonService.nativePay(paramVo);
@@ -100,8 +100,8 @@ public class MemberPaymentMineController {
     @At
     @RequiresPermissions("member.payment.mine")
     public Object getIsPay(String paymentInfoId) {
-        MemberPaymentInfo info = memberPaymentService.dao().fetch(MemberPaymentInfo.class,
+        int count = memberPaymentService.dao().count(MemberPaymentInfo.class,
                 Cnd.where("id", "=", paymentInfoId).and("isPayment", "=", 1));
-        return Result.success(info);
+        return Result.success().addData(count);
     }
 }
diff --git a/src/main/resources/views/platform/membercost/mine/index.html b/src/main/resources/views/platform/membercost/mine/index.html
index 21a7412..6e97877 100644
--- a/src/main/resources/views/platform/membercost/mine/index.html
+++ b/src/main/resources/views/platform/membercost/mine/index.html
@@ -79,9 +79,6 @@ layout("/layouts/platform.html"){
                             <el-button :disabled="row.isPayment" @click="openPay(row)"
                                        size="mini" type="primary">缴费
                             </el-button>
-                            <el-button @click="openPay(row)"
-                                       size="mini" type="primary">缴费
-                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -167,28 +164,33 @@ layout("/layouts/platform.html"){
                 </div>
             </div>
             <div v-if="payActive===3">
-
-                <div
-                    style="margin-top: 35px;background-color: RGB(245, 254, 243);height: 100px;display: flex;align-items: center;justify-content: center">
-                    <div>
-                        <el-image
-                            src="/assets/mobile/svg/memberPay/pcPaySuccess.svg"></el-image>
+                <div v-loading="submitLoading">
+                    <div style="margin-top: 35px;background-color: RGB(245, 254, 243);">
+                        <div
+                            style="display: flex;align-items: center;height: 100px;margin-left: 10%">
+                            <div>
+                                <el-image
+                                    src="/assets/mobile/svg/memberPay/pcPaySuccess.svg"></el-image>
+                            </div>
+                            <div style="font-weight: bold;font-size: 25px;margin-left: 10px;">
+                                支付成功!
+                            </div>
+                        </div>
                     </div>
-                    <div style="font-weight: bold;font-size: 25px">支付成功!</div>
+                    <el-form-item label="商品订单">
+                        {{formData.tradingOrderNo}}
+                    </el-form-item>
+                    <el-form-item label="支付金额">
+                        <div style="color: #2cd000;font-size: 25px">¥ {{formData.paymentMoney}}
+                        </div>
+                    </el-form-item>
                 </div>
-                <el-form-item label="商品订单">
-                    {{viewInfo.tradingOrderNo}}
-                </el-form-item>
-                <el-form-item label="支付金额">
-                    <div style="color: #2cd000;font-size: 25px">¥ {{viewInfo.paymentMoney}}</div>
-                </el-form-item>
-
             </div>
         </el-form>
         <div style="text-align: right">
             <span>
                 <el-button @click="clickClose">关 闭</el-button>
-                <el-button @click="next" v-if="payActive===0"
+                <el-button @click="next" v-if="payActive===0&&formData.paymentMoney>0"
                            type="primary">下一步</el-button>
             </span>
         </div>
@@ -249,14 +251,15 @@ layout("/layouts/platform.html"){
                         const data = JSON.parse(resp.data)
                         this.$nextTick(() => {
                             $("#qrcode").html("")
-                            $("#qrcode").qrcode({ //设置css
-                                render: "canvas", //二维码的生成方式
-                                width: $("#qrcode").width(), //生成二维码的宽度
-                                height: $("#qrcode").width(), //生成二维码的高度
+                            $("#qrcode").qrcode({
+                                render: "canvas",
+                                width: $("#qrcode").width(),
+                                height: $("#qrcode").width(),
                                 text: data.code_url,
-                                correctLevel: 3 //容错级别，默认为2，最高为3，为了让用户扫码最快，容错级别应当设为最低
+                                correctLevel: 3
                             })
                         })
+                        this.formData.tradingOrderNo = data.tradingOrderNo
                         await this.getIsPay()
                     }
                     this.qrcodeLoading = false
@@ -267,12 +270,14 @@ layout("/layouts/platform.html"){
                     const resp = await $.get(loc() + "/getIsPay", { paymentInfoId: this.formData.paymentInfoId })
                     if (resp.code === 0) {
                         if (resp.data) {
-                            this.payInfo = resp.data
                             this.payActive = 3
+                            this.submitLoading = true
                             clearInterval(this.intervalTimer)
+                            setTimeout(() => {
+                                this.submitLoading = false
+                            }, 1500)
                         }
                     }
-
                 }, 4000)
             },
             changePayModeValue() {
@@ -282,6 +287,7 @@ layout("/layouts/platform.html"){
                 this.$set(this.formData, "paymentMoney", parseFloat((paymentMoney * 0.005 * this.formData.paymentMonth).toFixed(2)))
             },
             openPay(row) {
+                this.payActive = 0
                 const payStandards = JSON.parse(row.payStandards)
                 const payStandard = payStandards.find(p => p.payPersonnel === row.payPersonnel && p.personType === row.personType)
                 this.$set(this.formData, "paymentMonth", row.paymentMonth)

From f822ef20465b3e940673342c25aa44c73eb8b8a6 Mon Sep 17 00:00:00 2001
From: Paidax <paidax.422@qq.com>
Date: Tue, 11 Mar 2025 08:42:14 +0800
Subject: [PATCH 10/17] =?UTF-8?q?=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v/nutz/base/constant/RedisConstant.java   |   2 +
 .../payment/model/PaymentTransaction.java     |   5 +
 .../base/payment/wxpay/bean/WxPayV3Bean.java  |   6 +
 .../controller/WxPayCommonController.java     |  37 ++++
 .../wxpay/service/WxPayCommonService.java     |   8 +
 .../service/impl/WxPayCommonServiceImpl.java  |  44 +++-
 .../base/payment/wxpay/util/WeChatUtils.java  | 109 ++++++++++
 .../payment/wxpay/vo/WxPayNeedParamVo.java    |   5 +
 .../platform/sys/SysWechatController.java     | 193 ++++++++++++++++++
 .../java/io/v/nutz/sys/models/Sys_user.java   |   5 +
 .../MemberPaymentTestController.java          |  82 ++++++++
 .../views/platform/membercost/test/index.html |  48 +++++
 12 files changed, 541 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/io/v/nutz/base/payment/wxpay/controller/WxPayCommonController.java
 create mode 100644 src/main/java/io/v/nutz/base/payment/wxpay/util/WeChatUtils.java
 create mode 100644 src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentTestController.java
 create mode 100644 src/main/resources/views/platform/membercost/test/index.html

diff --git a/src/main/java/io/v/nutz/base/constant/RedisConstant.java b/src/main/java/io/v/nutz/base/constant/RedisConstant.java
index 6d464bf..54137ba 100644
--- a/src/main/java/io/v/nutz/base/constant/RedisConstant.java
+++ b/src/main/java/io/v/nutz/base/constant/RedisConstant.java
@@ -18,6 +18,8 @@ public class RedisConstant {
 
     //企业微信TOKEN
     public final static String REDIS_KEY_QIYE_WECHAT_ACCESS_TOKEN = "qiyewx:token:";
+    // 微信公众号TOKEN
+    public final static String REDIS_KEY_WECHAT_ACCESS_TOKEN = "wechat:token:";
 
     //健步走小程序TOKEN
     public final static String REDIS_KEY_WE_APP_ACCESS_TOKEN = "weapp:token:";
diff --git a/src/main/java/io/v/nutz/base/payment/model/PaymentTransaction.java b/src/main/java/io/v/nutz/base/payment/model/PaymentTransaction.java
index 12ec042..9b17168 100644
--- a/src/main/java/io/v/nutz/base/payment/model/PaymentTransaction.java
+++ b/src/main/java/io/v/nutz/base/payment/model/PaymentTransaction.java
@@ -49,6 +49,11 @@ public class PaymentTransaction extends BaseModel {
     @ColDefine(type = ColType.VARCHAR,width = 30)
     private String tradingType;
 
+    @Column
+    @Comment("交易状态")
+    @ColDefine(type = ColType.VARCHAR,width = 50)
+    private String tradingState;
+
     @Column
     @Comment("用户ID")
     @ColDefine(type = ColType.VARCHAR,width = 32)
diff --git a/src/main/java/io/v/nutz/base/payment/wxpay/bean/WxPayV3Bean.java b/src/main/java/io/v/nutz/base/payment/wxpay/bean/WxPayV3Bean.java
index ea01f2f..2f9c1e0 100644
--- a/src/main/java/io/v/nutz/base/payment/wxpay/bean/WxPayV3Bean.java
+++ b/src/main/java/io/v/nutz/base/payment/wxpay/bean/WxPayV3Bean.java
@@ -16,6 +16,12 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class WxPayV3Bean {
 
+    /**
+     * 服务号
+     * appid: wxf12fa6175ec7c75f
+     * app_secret: f65bbb41d3de4a93c8c93d8e2fd50369
+     */
+
     private String appId;
     private String keyPath;
     private String publicKeyPath;
diff --git a/src/main/java/io/v/nutz/base/payment/wxpay/controller/WxPayCommonController.java b/src/main/java/io/v/nutz/base/payment/wxpay/controller/WxPayCommonController.java
new file mode 100644
index 0000000..5084140
--- /dev/null
+++ b/src/main/java/io/v/nutz/base/payment/wxpay/controller/WxPayCommonController.java
@@ -0,0 +1,37 @@
+package io.v.nutz.base.payment.wxpay.controller;
+
+import io.v.nutz.base.annontation.ViReturn;
+import io.v.nutz.base.payment.wxpay.service.WxPayCommonService;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @version 1.0
+ * @Author zzr
+ * @name：WxPayCommonController
+ * @Date 2025/3/10 19:28
+ * @注释
+ */
+@Slf4j
+@IocBean
+@Ok("json:full")
+@At("/platform/wxPay")
+public class WxPayCommonController {
+
+    @Inject
+    private WxPayCommonService wxPayCommonService;
+
+
+    @At
+    @Ok("void")
+    @ViReturn
+    public void notifyMessage(HttpServletRequest request, HttpServletResponse response){
+        wxPayCommonService.payNotify(request, response);
+    }
+}
diff --git a/src/main/java/io/v/nutz/base/payment/wxpay/service/WxPayCommonService.java b/src/main/java/io/v/nutz/base/payment/wxpay/service/WxPayCommonService.java
index 25215d9..d02e506 100644
--- a/src/main/java/io/v/nutz/base/payment/wxpay/service/WxPayCommonService.java
+++ b/src/main/java/io/v/nutz/base/payment/wxpay/service/WxPayCommonService.java
@@ -66,4 +66,12 @@ public interface WxPayCommonService {
      * @param response 响应
      */
     void refundNotify(HttpServletRequest request, HttpServletResponse response);
+
+
+    /**
+     * 获取openId
+     * @param code 用户授权后的Code，可以获取用户信息
+     * @return
+     */
+    String getOpenId(String code);
 }
diff --git a/src/main/java/io/v/nutz/base/payment/wxpay/service/impl/WxPayCommonServiceImpl.java b/src/main/java/io/v/nutz/base/payment/wxpay/service/impl/WxPayCommonServiceImpl.java
index 66c294a..3a8b02e 100644
--- a/src/main/java/io/v/nutz/base/payment/wxpay/service/impl/WxPayCommonServiceImpl.java
+++ b/src/main/java/io/v/nutz/base/payment/wxpay/service/impl/WxPayCommonServiceImpl.java
@@ -20,18 +20,24 @@ import com.ijpay.wxpay.enums.WxDomainEnum;
 import com.ijpay.wxpay.enums.v3.BasePayApiEnum;
 import com.ijpay.wxpay.model.v3.*;
 import io.v.nutz.base.payment.enums.TradingChannelEnum;
+import io.v.nutz.base.payment.enums.TradingStateEnum;
 import io.v.nutz.base.payment.enums.TradingTypeEnum;
 import io.v.nutz.base.payment.enums.WxPayResultCode;
 import io.v.nutz.base.payment.model.PaymentTransaction;
 import io.v.nutz.base.payment.wxpay.bean.WxPayV3Bean;
 import io.v.nutz.base.payment.wxpay.service.WxPayCommonService;
+import io.v.nutz.base.payment.wxpay.util.WeChatUtils;
 import io.v.nutz.base.payment.wxpay.vo.WxPayNeedParamVo;
 import io.v.nutz.base.result.Result;
 import io.v.nutz.sys.models.User;
 import io.v.nutz.sys.services.SysUserService;
 import io.v.nutz.web.commons.utils.ShiroUtil;
+import io.v.nutz.zhgh.memberCost.model.MemberPaymentInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.nutz.aop.interceptor.ioc.TransAop;
+import org.nutz.dao.Chain;
 import org.nutz.dao.Cnd;
+import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.random.R;
@@ -85,6 +91,8 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
 
     @Inject
     private SysUserService sysUserService;
+    @Inject
+    private WeChatUtils weChatUtils;
 
     /**
      * 微信扫描二维码支付
@@ -93,6 +101,7 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
      * @return
      */
     @Override
+    @Aop(TransAop.READ_COMMITTED)
     public Result nativePay(WxPayNeedParamVo paramVo) {
         try {
             // 商户订单号，存储当前用户的订单
@@ -148,6 +157,7 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
 
 
     @Override
+    @Aop(TransAop.READ_COMMITTED)
     public Result jsApiPay(WxPayNeedParamVo paramVo) {
         try {
             // 商户订单号，存储当前用户的订单
@@ -187,7 +197,7 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
                 Map<String, String> map = WxPayKit.jsApiCreateSign(WX_PAY_V3_BEAN.getAppId(), prepayId, WX_PAY_V3_BEAN.getKeyPath());
                 log.info("唤起支付参数:{}", map);
                 // 唤起支付成功，向数据库插入订单参数
-
+                insertTradingOrder(paramVo, outTradeNo, body);
                 return Result.success(JSONUtil.toJsonStr(map));
             }
 //            return JSONUtil.toJsonStr(response);
@@ -200,6 +210,7 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
 
 
     @Override
+    @Aop(TransAop.READ_COMMITTED)
     public Result wapPay(WxPayNeedParamVo paramVo) {
         try {
             // 商户订单号，存储当前用户的订单
@@ -238,10 +249,11 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
             log.info("verifySignature: {}", verifySignature);
             if (response.getStatus() == OK && verifySignature) {
                 String body = response.getBody();
+                insertTradingOrder(paramVo, outTradeNo, body);
                 return Result.success(JSONUtil.toJsonStr(body));
             }
 //            return JSONUtil.toJsonStr(response);
-            return null;
+            return Result.error();
         } catch (Exception e) {
             log.error("系统异常", e);
             return Result.error(e.getMessage());
@@ -276,8 +288,21 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
 //                        WX_PAY_V3_BEAN.getApiKey3(), WX_PAY_V3_BEAN.getPlatformCertPath());
 //            }
             log.info("支付通知明文 {}", plainText);
-
             if (StrUtil.isNotEmpty(plainText)) {
+                // 支付结果
+                JSONObject jsonResult = JSONUtil.parseObj(plainText);
+                // 获取缴费记录,并修改缴费结果
+                PaymentTransaction transaction = sysUserService.dao().fetch(PaymentTransaction.class, Cnd.where("outTradeNo", "=", jsonResult.getStr("out_trade_no")));
+                transaction.setTradingState(TradingStateEnum.PAY_SUCCESS.getTrdingStateName());
+                transaction.setTradingOrderNo(jsonResult.getStr("transaction_id"));
+                sysUserService.dao().update(transaction);
+
+                sysUserService.dao().update(MemberPaymentInfo.class,
+                        Chain.make("isPayment", true).add("paymentTime", DateUtil.date(jsonResult.getLong("success_time")))
+                                .add("paymentMoney", String.valueOf(transaction.getTradingOrderNo())),
+                        Cnd.where("payId", "=", transaction.getId())
+                );
+
                 response.setStatus(200);
                 map.put("code", "SUCCESS");
                 map.put("message", "SUCCESS");
@@ -285,7 +310,10 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
                 response.setStatus(500);
                 map.put("code", "ERROR");
                 map.put("message", "签名错误");
+                log.error("签名错误");
             }
+
+            // 支付回调，返回给微信，自己也接收不到结果，这里的返回完全没用
             response.setHeader("Content-type", ContentType.JSON.toString());
             response.getOutputStream().write(JSONUtil.toJsonStr(map).getBytes(StandardCharsets.UTF_8));
             response.flushBuffer();
@@ -404,6 +432,12 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
     }
 
 
+    @Override
+    public String getOpenId(String code) {
+        JSONObject jsonObject = weChatUtils.getWebAccessTokenAndOpenid(code);
+        return jsonObject.getStr("openid");
+    }
+
     /**
      * 公共方法，获取证书序列号
      * @return
@@ -522,6 +556,7 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
         transaction.setUserName(user.getUsername());
         transaction.setUnitName(user.getUnitname());
         transaction.setUnionName(user.getUnionname());
+        transaction.setTradingState(TradingStateEnum.WAITING_FOR_PAYMENT.name());
         // 获取订单金额
         int total = paramVo.getAmount().getTotal();
         BigDecimal bigDecimalValue  = new BigDecimal(String.valueOf(total));
@@ -534,5 +569,8 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
         transaction.setOpenId(null);
         transaction.setResultJson(result);
         sysUserService.dao().insert(transaction);
+
+        sysUserService.dao().update(MemberPaymentInfo.class,
+                Chain.make("payId", transaction.getId()), Cnd.where("id", "=", paramVo.getMemberPaymentInfoId()));
     }
 }
diff --git a/src/main/java/io/v/nutz/base/payment/wxpay/util/WeChatUtils.java b/src/main/java/io/v/nutz/base/payment/wxpay/util/WeChatUtils.java
new file mode 100644
index 0000000..e1dd698
--- /dev/null
+++ b/src/main/java/io/v/nutz/base/payment/wxpay/util/WeChatUtils.java
@@ -0,0 +1,109 @@
+package io.v.nutz.base.payment.wxpay.util;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import io.v.nutz.base.constant.RedisConstant;
+import lombok.extern.slf4j.Slf4j;
+import org.nutz.http.Http;
+import org.nutz.integration.jedis.RedisService;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.json.Json;
+import org.nutz.lang.util.NutMap;
+
+import java.net.URLEncoder;
+
+/**
+ * @version 1.0
+ * @Author zzr
+ * @name：WeChatUtils
+ * @Date 2025/3/10 14:13
+ * @注释
+ */
+@Slf4j
+@IocBean
+public class WeChatUtils {
+
+    @Inject
+    private RedisService redisService;
+
+    public static final String APPID = "wxf12fa6175ec7c75f";
+
+    public static final String SECRET = "f65bbb41d3de4a93c8c93d8e2fd50369";
+
+    // 获取code
+    public final static String CODE_URL = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=APPID&redirect_uri=REDIRECT_URI&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect";
+
+    //获取网页access_token的接口地址
+    public final static String WEB_ACCESS_TOKEN_URL = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=APPID&secret=APPSECRET&code=CODE&grant_type=authorization_code";
+
+
+    //获取用户信息地址
+    public final static String USERINFO_URL = "https://api.weixin.qq.com/sns/userinfo?access_token=ACCESS_TOKEN&openid=OPENID&lang=zh_CN";
+
+    // 获取access_token的接口地址（GET） 限2000（次/天）
+    public final static String ACCESS_TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=APPID&secret=APPSECRET";
+    // 发送模板消息
+    public static final String SEND_MESSAGE_URL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=ACCESS_TOKEN";
+
+
+    /**
+     * 生成获取code的url
+     *
+     * @param redirectUrl
+     * @return
+     */
+    public String getCodeUrl(String redirectUrl, String state) {
+        String requestUrl = null;
+        state = state == null ? "" : state;
+        try {
+            requestUrl = CODE_URL.replace("APPID", APPID).replace("REDIRECT_URI", URLEncoder.encode(redirectUrl, "UTF-8")).replace("STATE", state);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return requestUrl;
+    }
+
+    /**
+     * 获取微信网页access_token 和 openid
+     *
+     * @param code
+     * @return
+     */
+    public JSONObject getWebAccessTokenAndOpenid(String code) {
+        String requestUrl = WEB_ACCESS_TOKEN_URL.replace("APPID", APPID).replace("APPSECRET", SECRET).replace("CODE", code);
+        return JSONUtil.parseObj(HttpUtil.post(requestUrl, new JSONObject()));
+    }
+
+    /**
+     * 网页授权作用域为snsapi_userinfo，则此时开发者可以通过access_token和openid拉取用户信息了
+     * <a href="https://developers.weixin.qq.com/doc/offiaccount/OA_Web_Apps/Wechat_webpage_authorization.html">...</a>
+     *
+     * @param webAccessToken
+     * @param openid
+     * @return
+     */
+    public JSONObject getUserInfo(String webAccessToken, String openid) {
+        String requestUrl = USERINFO_URL.replace("ACCESS_TOKEN", webAccessToken).replace("OPENID", openid);
+        return JSONUtil.parseObj(HttpUtil.post(requestUrl, new JSONObject()));
+    }
+
+    /**
+     * 获取access_token 先从Redis获取，如果没有再调微信获取并存Redis
+     *
+     * @return
+     */
+    public String getAccessToken() {
+        String token = redisService.get(RedisConstant.REDIS_KEY_WECHAT_ACCESS_TOKEN);
+        if (StrUtil.isNotBlank(token)) {
+            return token;
+        }
+        String accessTokenUrl = ACCESS_TOKEN_URL.formatted(APPID, SECRET);
+        String accessToken = Json.fromJson(NutMap.class, Http.get(accessTokenUrl).getContent()).getString("access_token");
+        redisService.setex(RedisConstant.REDIS_KEY_WECHAT_ACCESS_TOKEN, 60 * 60 * 2, accessToken);
+        return accessToken;
+    }
+
+}
diff --git a/src/main/java/io/v/nutz/base/payment/wxpay/vo/WxPayNeedParamVo.java b/src/main/java/io/v/nutz/base/payment/wxpay/vo/WxPayNeedParamVo.java
index 8b374a0..d1c0009 100644
--- a/src/main/java/io/v/nutz/base/payment/wxpay/vo/WxPayNeedParamVo.java
+++ b/src/main/java/io/v/nutz/base/payment/wxpay/vo/WxPayNeedParamVo.java
@@ -36,4 +36,9 @@ public class WxPayNeedParamVo {
      * 其余参数可忽略
      */
     private Payer payer;
+
+    /**
+     * 会员支付信息ID，必填
+     */
+    private String memberPaymentInfoId;
 }
diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/SysWechatController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/SysWechatController.java
index 6b7ca00..81e217b 100644
--- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/SysWechatController.java
+++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/SysWechatController.java
@@ -1,6 +1,37 @@
 package io.v.nutz.sys.controllers.platform.sys;
 
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpUtil;
+import cn.hutool.socket.SocketUtil;
+import io.v.nutz.base.payment.wxpay.util.WeChatUtils;
+import io.v.nutz.base.utils.LoginUtil;
+import io.v.nutz.sys.models.Sys_user;
+import io.v.nutz.sys.services.SysUserService;
+import io.v.nutz.web.commons.base.Globals;
+import io.v.nutz.web.commons.slog.SLogService;
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.authc.AuthenticationToken;
+import org.apache.shiro.authc.LockedAccountException;
+import org.apache.shiro.authc.UnknownAccountException;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
+import org.nutz.integration.jedis.RedisService;
+import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.json.Json;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Attr;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Optional;
 
 /**
  * 微信公众号
@@ -9,5 +40,167 @@ import org.nutz.ioc.loader.annotation.IocBean;
  * @date 2023/07/06
  */
 @IocBean
+@At("/platform/wechat")
 public class SysWechatController {
+
+    private static String ACCESS_TOKEN_URL = "https://%s/sns/oauth2/access_token?appid=%s&secret=%s&code=%s&grant_type=authorization_code";
+
+    private static final String APPID = "wxf12fa6175ec7c75f";
+
+    private static final String SECRET = "f65bbb41d3de4a93c8c93d8e2fd50369";
+
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private WeChatUtils weChatUtils;
+    @Inject
+    private SysUserService sysUserService;
+    @Inject
+    private RedisService redisService;
+    @Inject
+    private SLogService sLogService;
+    @Inject
+    private LoginUtil loginUtil;
+
+    /**
+     * oauth
+     *
+     * @return {@link String}
+     */
+    @At
+    @Ok("re")
+    public String oauth(@Param("redirectUrl") String redirectUrl) {
+        String redirect = Globals.AppDomain + "/platform/wechat/getCode";
+        if (StrUtil.isNotBlank(redirect)) {
+            redirect += "?redirect=" + redirect;
+        }
+        String codeUrl = weChatUtils.getCodeUrl(redirect, "");
+        return "redirect:" + codeUrl;
+    }
+
+    /**
+     * 获取code 登录用户
+     *
+     * @param code 代码
+     * @return {@link String}
+     */
+    @At
+    @Ok("re")
+    public String getCode(@Param("code") String code, @Param("redirect") String redirect, HttpSession session, HttpServletRequest request) {
+        String host;
+        try {
+            Socket socket = SocketUtil.connect("api.weixin.qq.com", 443, 1000);
+            if (socket.isConnected()) {
+                host = "api.weixin.qq.com";
+            } else {
+                InetAddress inetAddress = InetAddress.getLocalHost();
+                host = inetAddress.getHostAddress();
+            }
+        } catch (Exception e) {
+            host = "api.weixin.qq.com";
+        }
+        String tokenUrl = ACCESS_TOKEN_URL.formatted(host, APPID, SECRET, code);
+
+        NutMap resMap = Json.fromJson(NutMap.class, HttpUtil.get(tokenUrl));
+        String openid = resMap.getString("openid");
+        Sys_user sysUser = dao.fetch(Sys_user.class, Cnd.where("openId", "=", openid));
+
+        if (sysUser == null) {
+            String s = Globals.AppDomain + "/platform/wechat/doLogin?openid=" + openid;
+            if (StrUtil.isNotBlank(redirect)) {
+                s += "&redirect=" + URLEncoder.encode(redirect, StandardCharsets.UTF_8);
+            }
+//            return ">>:" + Globals.CasAddress + "/login?service=" + URLEncoder.encode(s, StandardCharsets.UTF_8);
+            return ">>:" + s;
+        }
+
+        String loginName = Optional.ofNullable(sysUser).map(x -> x.getLoginname()).orElse(null);
+
+        try {
+            loginUtil.doLogin(loginName, request, session, LoginUtil.LoginOrigin.WEI_XIN);
+            if (StrUtil.isNotBlank(redirect)) {
+                return ">>:" + redirect;
+            }
+            return ">>:" + Globals.AppDomain + "/platform/home";
+        } catch (LockedAccountException e) {
+            request.setAttribute("errMsg", "帐号被锁定，请5分钟后再试");
+            return ">>:" + Globals.AppDomain + "/platform/home/LockedAccountError";
+        } catch (UnknownAccountException e) {
+            request.setAttribute("errMsg", "系统中没有此用户");
+            return ">>:" + Globals.AppDomain + "/error/UnknownAccountError.html";
+        } catch (AuthenticationException e) {
+            request.setAttribute("errMsg", "系统中没有此用户");
+            return ">>:" + Globals.AppDomain + "/error/UnknownAccountError.html";
+        } catch (Exception e) {
+            request.setAttribute("errMsg", "用户名或密码错误");
+            return ">>:" + Globals.AppDomain + "/error/500.html";
+        }
+    }
+
+
+    @At
+    @Ok("re")
+    public Object doLogin(@Attr("platformLoginToken") AuthenticationToken token,
+                          HttpServletRequest request, HttpSession session,
+                          @Param("redirect") String redirect, @Param("openid") String openid) {
+//        int errCount = NumberUtils.toInt(Strings.sNull(SecurityUtils.getSubject().getSession(true).getAttribute("platformErrCount")));
+//        try {
+//            loginUtil.doLogin(token, request, session, LoginUtil.LoginOrigin.WEI_XIN);
+//
+//            return Result.success("login.success");
+//        } catch (CaptchaIncorrectException e) {
+//            return Result.error(1, "login.error.captcha");
+//        } catch (CaptchaEmptyException e) {
+//            return Result.error(2, "login.error.captcha");
+//        } catch (LockedAccountException e) {
+//            return Result.error(3, "login.error.locked");
+//        } catch (UnknownAccountException e) {
+//            errCount++;
+//            SecurityUtils.getSubject().getSession(true).setAttribute("platformErrCount", errCount);
+//            return Result.error(4, "login.error.user");
+//        } catch (AuthenticationException e) {
+//            errCount++;
+//            SecurityUtils.getSubject().getSession(true).setAttribute("platformErrCount", errCount);
+//            return Result.error(5, "login.error.user");
+//        } catch (Exception e) {
+//            errCount++;
+//            SecurityUtils.getSubject().getSession(true).setAttribute("platformErrCount", errCount);
+//            return Result.error(6, "login.error.system");
+//        }
+
+
+//        Assertion assertion = (Assertion) request.getSession().getAttribute(AbstractCasFilter.CONST_CAS_ASSERTION);
+//        if (assertion == null) {
+//            return ">>:" + Globals.AppDomain + "/platform/home/UnknownAccountError";
+//        }
+//
+//        String principal = assertion.getPrincipal().toString();
+//        //工号 手机号 身份证
+//        Sys_user user = dao.fetch(Sys_user.class, Cnd.NEW().and("loginname", "=", principal).or("mobile", "=", principal).or("idcard", "=", principal));
+//        String loginName = Optional.ofNullable(user).map(v -> v.getLoginname()).orElse(null);
+//
+//        try {
+//            loginUtil.doLogin(loginName, request, session, LoginUtil.LoginOrigin.WEI_XIN);
+//            //绑定openId
+//            if (StrUtil.isNotBlank(openid)) {
+//                dao.update(Sys_user.class, Chain.make("openId", openid), Cnd.where("loginName", "=", loginName));
+//            }
+//            if (StrUtil.isNotBlank(redirect)) {
+//                return ">>:" + redirect;
+//            }
+//            return ">>:" + Globals.AppDomain + "/mobile/index";
+//        } catch (LockedAccountException e) {
+//            request.setAttribute("errMsg", "帐号被锁定，请5分钟后再试");
+//            return ">>:" + Globals.AppDomain + "/platform/home/LockedAccountError";
+//        } catch (UnknownAccountException e) {
+//            request.setAttribute("errMsg", "系统中没有此用户");
+//            return ">>:" + Globals.AppDomain + "/platform/home/UnknownAccountError";
+//        } catch (Exception e) {
+//            request.setAttribute("errMsg", "用户名或密码错误");
+//            return ">>:" + Globals.AppDomain + "/platform/home/500";
+//        }
+        return null;
+    }
+
 }
diff --git a/src/main/java/io/v/nutz/sys/models/Sys_user.java b/src/main/java/io/v/nutz/sys/models/Sys_user.java
index a38395e..3fbe0b4 100644
--- a/src/main/java/io/v/nutz/sys/models/Sys_user.java
+++ b/src/main/java/io/v/nutz/sys/models/Sys_user.java
@@ -626,6 +626,11 @@ public class Sys_user extends BaseModel implements Serializable {
     @ColDefine(type = ColType.VARCHAR, width = 300)
     private String weAppOpenid;
 
+    @Column
+    @Comment("微信openId")
+    @ColDefine(type = ColType.VARCHAR, width = 300)
+    private String openId;
+
     /**
      * 2021-05-18 end
      */
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentTestController.java b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentTestController.java
new file mode 100644
index 0000000..5a52550
--- /dev/null
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentTestController.java
@@ -0,0 +1,82 @@
+package io.v.nutz.zhgh.memberCost.controller;
+
+import io.v.nutz.base.payment.wxpay.service.WxPayCommonService;
+import io.v.nutz.base.payment.wxpay.util.WeChatUtils;
+import io.v.nutz.zhgh.memberCost.service.MemberPaymentService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.nutz.dao.Dao;
+import org.nutz.integration.jedis.RedisService;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+/**
+ * @version 1.0
+ * @Author zzr
+ * @name：MemberPaymentTestController
+ * @Date 2025/3/10 14:55
+ * @注释
+ */
+@Slf4j
+@IocBean
+@Ok("json:full")
+@At("/platform/member/payment/test")
+public class MemberPaymentTestController {
+
+    @Inject
+    private Dao dao;
+    @Inject
+    private WeChatUtils weChatUtils;
+    @Inject
+    private RedisService redisService;
+    @Inject
+    private WxPayCommonService wxPayCommonService;
+    @Inject
+    private MemberPaymentService memberPaymentService;
+
+    @At("")
+    @Ok("beetl:/platform/membercost/test/index.html")
+    @RequiresPermissions("member.payment.test")
+    public void index() {
+    }
+
+
+    /**
+     * 微信jsapi支付需要网页授权认证
+     * @param redirect
+     * @param userId
+     * @return
+     */
+    @At
+    @Ok("re")
+    public String oauth(String redirect, String userId){
+        String url = weChatUtils.getCodeUrl("https://schoolhd.top/platform/wxPay/getCode", userId);
+        redisService.setex("wx_pay_redirect_url", 60 * 60, "https://schoolhd.top/" + redirect);
+        return "redirect:" + url;
+    }
+
+    /**
+     * 上面授权后会转到这个地址，然后去改数据库的openId，
+     * 后续对微信做一个免登录
+     * @param code
+     * @param state
+     * @return
+     */
+    @At
+    @Ok("re")
+    public String getCode(@Param("code") String code, @Param("state") String state){
+        String openId = wxPayCommonService.getOpenId(code);
+//        WxPayNeedParamVo paramVo = new WxPayNeedParamVo();
+//        paramVo.setDescription("支付");
+//        paramVo.setAttach("");
+//        paramVo.setAmount(new Amount().setTotal(1));
+//        paramVo.setPayer(new Payer().setOpenid(openId));
+//        Result result = wxPayCommonService.jsApiPay(paramVo);
+        return null;
+//        return "redirect:" + redisService.get("wx_pay_redirect_url");
+    }
+
+}
diff --git a/src/main/resources/views/platform/membercost/test/index.html b/src/main/resources/views/platform/membercost/test/index.html
new file mode 100644
index 0000000..2bd49b8
--- /dev/null
+++ b/src/main/resources/views/platform/membercost/test/index.html
@@ -0,0 +1,48 @@
+<!--#
+layout("/mobile/platform.html"){
+#-->
+<div id="app" v-cloak>
+    <!-- 微信唤起jsapi支付的HTML方法 -->
+</div>
+<script src="https://res2.wx.qq.com/open/js/jweixin-1.4.0.js"></script>
+<script>
+    function onBridgeReady(json) {
+        // const data = JSON.parse(json)
+        WeixinJSBridge.invoke("getBrandWCPayRequest", JSON.parse(json), function (res) {
+            if (res.err_msg == "get_brand_wcpay_request:ok") {
+                // 使用以上方式判断前端返回,微信团队郑重提示：
+                //res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
+            }
+        })
+    }
+    new Vue({
+        el: "#app",
+        data() {
+            return {}
+        },
+        methods: {
+            async initData() {
+                const resp = await $.post("/platform/member/payment/test/getCode")
+                debugger
+                if (resp.code === 0) {
+                    if (typeof WeixinJSBridge == "undefined") {
+                        if (document.addEventListener) {
+                            document.addEventListener("WeixinJSBridgeReady", onBridgeReady(resp.data))
+                        } else if (document.attachEvent) {
+                            document.attachEvent("WeixinJSBridgeReady", onBridgeReady(resp.data))
+                            document.attachEvent("onWeixinJSBridgeReady", onBridgeReady(resp.data))
+                        }
+                    } else {
+                        onBridgeReady(resp.data)
+                    }
+                }
+            }
+        },
+        created() {
+            // this.initData()
+        }
+    })
+</script>
+<!--#
+}
+#-->

From 3d92f0df29db2ed5123a19aef922fdae94fc4a03 Mon Sep 17 00:00:00 2001
From: Paidax <paidax.422@qq.com>
Date: Tue, 11 Mar 2025 10:22:25 +0800
Subject: [PATCH 11/17] =?UTF-8?q?=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment/model/PaymentRefundRecord.java    | 10 +--
 .../payment/model/PaymentTransaction.java     | 17 ++--
 .../wxpay/service/WxPayCommonService.java     |  7 --
 .../service/impl/WxPayCommonServiceImpl.java  | 85 ++++++++++---------
 4 files changed, 59 insertions(+), 60 deletions(-)

diff --git a/src/main/java/io/v/nutz/base/payment/model/PaymentRefundRecord.java b/src/main/java/io/v/nutz/base/payment/model/PaymentRefundRecord.java
index 064b6ff..105940f 100644
--- a/src/main/java/io/v/nutz/base/payment/model/PaymentRefundRecord.java
+++ b/src/main/java/io/v/nutz/base/payment/model/PaymentRefundRecord.java
@@ -6,8 +6,6 @@ import lombok.EqualsAndHashCode;
 import org.nutz.dao.entity.annotation.*;
 import org.nutz.dao.interceptor.annotation.PrevInsert;
 
-import java.math.BigDecimal;
-
 /**
  * 退款记录表
  */
@@ -46,13 +44,13 @@ public class PaymentRefundRecord extends BaseModel {
 
     @Column
     @Comment("本次退款金额")
-    @ColDefine(customType = "decimal")
-    private BigDecimal refundAmount;
+    @ColDefine(type = ColType.INT)
+    private Integer refundAmount;
 
     @Column
     @Comment("原订单金额")
-    @ColDefine(customType = "decimal")
-    private BigDecimal total;
+    @ColDefine(type = ColType.INT)
+    private Integer total;
 
     @Column
     @Comment("交易返回数据")
diff --git a/src/main/java/io/v/nutz/base/payment/model/PaymentTransaction.java b/src/main/java/io/v/nutz/base/payment/model/PaymentTransaction.java
index 9b17168..be51975 100644
--- a/src/main/java/io/v/nutz/base/payment/model/PaymentTransaction.java
+++ b/src/main/java/io/v/nutz/base/payment/model/PaymentTransaction.java
@@ -6,8 +6,6 @@ import lombok.EqualsAndHashCode;
 import org.nutz.dao.entity.annotation.*;
 import org.nutz.dao.interceptor.annotation.PrevInsert;
 
-import java.math.BigDecimal;
-
 /**
  * 交易单表
  */
@@ -37,7 +35,7 @@ public class PaymentTransaction extends BaseModel {
     @Column
     @Comment("交易系统交易号")
     @ColDefine(type = ColType.VARCHAR,width = 128)
-    private String tradingOrderNo;
+    private String transactionId;
 
     @Column
     @Comment("交易渠道")
@@ -81,8 +79,8 @@ public class PaymentTransaction extends BaseModel {
 
     @Column
     @Comment("交易金额")
-    @ColDefine(customType = "decimal")
-    private BigDecimal tradingAmount;
+    @ColDefine(type = ColType.INT)
+    private Integer tradingAmount;
 
     @Column
     @Comment("是否退款")
@@ -91,8 +89,8 @@ public class PaymentTransaction extends BaseModel {
 
     @Column
     @Comment("退款金额")
-    @ColDefine(customType = "decimal")
-    private BigDecimal refundAmount;
+    @ColDefine(type = ColType.INT)
+    private Integer refundAmount;
 
     @Column
     @Comment("订单描述")
@@ -113,4 +111,9 @@ public class PaymentTransaction extends BaseModel {
     @Comment("交易返回数据")
     @ColDefine(type = ColType.MYSQL_JSON)
     private String resultJson;
+
+    @Column
+    @Comment("交易名单的主键id")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private String memberPaymentInfoId;
 }
diff --git a/src/main/java/io/v/nutz/base/payment/wxpay/service/WxPayCommonService.java b/src/main/java/io/v/nutz/base/payment/wxpay/service/WxPayCommonService.java
index d02e506..bc29ee1 100644
--- a/src/main/java/io/v/nutz/base/payment/wxpay/service/WxPayCommonService.java
+++ b/src/main/java/io/v/nutz/base/payment/wxpay/service/WxPayCommonService.java
@@ -67,11 +67,4 @@ public interface WxPayCommonService {
      */
     void refundNotify(HttpServletRequest request, HttpServletResponse response);
 
-
-    /**
-     * 获取openId
-     * @param code 用户授权后的Code，可以获取用户信息
-     * @return
-     */
-    String getOpenId(String code);
 }
diff --git a/src/main/java/io/v/nutz/base/payment/wxpay/service/impl/WxPayCommonServiceImpl.java b/src/main/java/io/v/nutz/base/payment/wxpay/service/impl/WxPayCommonServiceImpl.java
index 3a8b02e..b719fcd 100644
--- a/src/main/java/io/v/nutz/base/payment/wxpay/service/impl/WxPayCommonServiceImpl.java
+++ b/src/main/java/io/v/nutz/base/payment/wxpay/service/impl/WxPayCommonServiceImpl.java
@@ -19,14 +19,11 @@ import com.ijpay.wxpay.WxPayApi;
 import com.ijpay.wxpay.enums.WxDomainEnum;
 import com.ijpay.wxpay.enums.v3.BasePayApiEnum;
 import com.ijpay.wxpay.model.v3.*;
-import io.v.nutz.base.payment.enums.TradingChannelEnum;
-import io.v.nutz.base.payment.enums.TradingStateEnum;
-import io.v.nutz.base.payment.enums.TradingTypeEnum;
-import io.v.nutz.base.payment.enums.WxPayResultCode;
+import io.v.nutz.base.payment.enums.*;
+import io.v.nutz.base.payment.model.PaymentRefundRecord;
 import io.v.nutz.base.payment.model.PaymentTransaction;
 import io.v.nutz.base.payment.wxpay.bean.WxPayV3Bean;
 import io.v.nutz.base.payment.wxpay.service.WxPayCommonService;
-import io.v.nutz.base.payment.wxpay.util.WeChatUtils;
 import io.v.nutz.base.payment.wxpay.vo.WxPayNeedParamVo;
 import io.v.nutz.base.result.Result;
 import io.v.nutz.sys.models.User;
@@ -37,6 +34,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Chain;
 import org.nutz.dao.Cnd;
+import org.nutz.dao.Dao;
 import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
@@ -46,13 +44,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayInputStream;
 import java.io.FileWriter;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.nio.charset.StandardCharsets;
 import java.security.cert.X509Certificate;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -90,9 +84,9 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
     private final String payNotifyUrl = WX_PAY_V3_BEAN.getDomain().concat("/wxPay/notifyMessage");
 
     @Inject
-    private SysUserService sysUserService;
+    private Dao dao;
     @Inject
-    private WeChatUtils weChatUtils;
+    private SysUserService sysUserService;
 
     /**
      * 微信扫描二维码支付
@@ -294,12 +288,12 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
                 // 获取缴费记录,并修改缴费结果
                 PaymentTransaction transaction = sysUserService.dao().fetch(PaymentTransaction.class, Cnd.where("outTradeNo", "=", jsonResult.getStr("out_trade_no")));
                 transaction.setTradingState(TradingStateEnum.PAY_SUCCESS.getTrdingStateName());
-                transaction.setTradingOrderNo(jsonResult.getStr("transaction_id"));
+                transaction.setTransactionId(jsonResult.getStr("transaction_id"));
                 sysUserService.dao().update(transaction);
 
                 sysUserService.dao().update(MemberPaymentInfo.class,
                         Chain.make("isPayment", true).add("paymentTime", DateUtil.date(jsonResult.getLong("success_time")))
-                                .add("paymentMoney", String.valueOf(transaction.getTradingOrderNo())),
+                                .add("paymentMoney", String.valueOf(transaction.getTransactionId())),
                         Cnd.where("payId", "=", transaction.getId())
                 );
 
@@ -332,24 +326,27 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
     @Override
     public Result refund(String transactionId, String outTradeNo) {
         try {
+            // 查询商户订单
+            PaymentTransaction transaction = sysUserService.dao().fetch(PaymentTransaction.class, Cnd.where("outTradeNo", "=", outTradeNo));
+            Integer tradingAmount = transaction.getTradingAmount();
             String outRefundNo = PayKit.generateStr();
             log.info("商户退款单号: {}", outRefundNo);
 
-            List<RefundGoodsDetail> list = new ArrayList<>();
-            RefundGoodsDetail refundGoodsDetail = new RefundGoodsDetail()
-                    .setMerchant_goods_id("123")
-                    .setGoods_name("IJPay 测试")
-                    .setUnit_price(1)
-                    .setRefund_amount(1)
-                    .setRefund_quantity(1);
-            list.add(refundGoodsDetail);
+//            List<RefundGoodsDetail> list = new ArrayList<>();
+//            RefundGoodsDetail refundGoodsDetail = new RefundGoodsDetail()
+//                    .setMerchant_goods_id("123")
+//                    .setGoods_name("IJPay 测试")
+//                    .setUnit_price(1)
+//                    .setRefund_amount(1)
+//                    .setRefund_quantity(1);
+//            list.add(refundGoodsDetail);
 
             RefundModel refundModel = new RefundModel()
                     .setOut_refund_no(outRefundNo)
-                    .setReason("IJPay 测试退款")
-                    .setNotify_url(WX_PAY_V3_BEAN.getDomain().concat("/v3/refundNotify"))
-                    .setAmount(new RefundAmount().setRefund(1).setTotal(1).setCurrency("CNY"))
-                    .setGoods_detail(list);
+                    .setReason("用户发起退款")
+                    .setNotify_url(payNotifyUrl)
+                    .setAmount(new RefundAmount().setRefund(tradingAmount).setTotal(tradingAmount).setCurrency("CNY"));
+//                    .setGoods_detail(list);
 
             if (StrUtil.isNotEmpty(transactionId)) {
                 refundModel.setTransaction_id(transactionId);
@@ -376,7 +373,20 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
             log.info("退款响应 {}", response);
 
             if (verifySignature) {
-                return Result.success(response.getBody());
+                // 用户发起退款，存一个退款记录
+                PaymentRefundRecord record = new PaymentRefundRecord();
+                record.setId(R.UU32());
+                record.setPaymentTransactionId(transaction.getId());
+                record.setOutRefundTradeNo(outRefundNo);
+                record.setRefundNo(null);
+                record.setRefundState(RefundStateEnum.REFUNDING.getRefundStateName());
+                record.setRefundAmount(tradingAmount);
+                record.setTotal(tradingAmount);
+                record.setResultJson(response.getBody());
+                sysUserService.dao().insert(record);
+
+                // 返回退款下单结果
+                return Result.success().addData(response.getBody());
             }
         } catch (Exception e) {
             log.error("系统异常", e);
@@ -415,6 +425,12 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
             log.info("退款通知明文 {}", plainText);
 
             if (StrUtil.isNotEmpty(plainText)) {
+                // 取出明文，修改退款的结果
+                JSONObject jsonObject = JSONUtil.parseObj(plainText);
+                // 查询出退款记录
+                PaymentRefundRecord record = dao.fetch(PaymentRefundRecord.class, Cnd.where("outRefundTradeNo", "=", jsonObject.getStr("out_refund_no")));
+                record.setRefundNo(jsonObject.getStr("refund_id"));
+
                 response.setStatus(200);
                 map.put("code", "SUCCESS");
                 map.put("message", "SUCCESS");
@@ -432,12 +448,6 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
     }
 
 
-    @Override
-    public String getOpenId(String code) {
-        JSONObject jsonObject = weChatUtils.getWebAccessTokenAndOpenid(code);
-        return jsonObject.getStr("openid");
-    }
-
     /**
      * 公共方法，获取证书序列号
      * @return
@@ -548,7 +558,7 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
         transaction.setId(R.UU32());
         transaction.setMchId(WX_PAY_V3_BEAN.getMchId());
         transaction.setOutTradeNo(outTradeNo);
-        transaction.setTradingOrderNo(null);
+        transaction.setTransactionId(null);
         transaction.setTradingChannel(TradingChannelEnum.WX_PAY.name());
         transaction.setTradingType(TradingTypeEnum.PAYMENT.name());
         transaction.setUserId(user.getId());
@@ -558,19 +568,14 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
         transaction.setUnionName(user.getUnionname());
         transaction.setTradingState(TradingStateEnum.WAITING_FOR_PAYMENT.name());
         // 获取订单金额
-        int total = paramVo.getAmount().getTotal();
-        BigDecimal bigDecimalValue  = new BigDecimal(String.valueOf(total));
-        BigDecimal resultTotal =  bigDecimalValue.divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP);
-        transaction.setTradingAmount(resultTotal);
+        transaction.setTradingAmount(paramVo.getAmount().getTotal());
         transaction.setIsRefund(false);
         transaction.setRefundAmount(null);
         transaction.setDescription(paramVo.getDescription());
         transaction.setAttach(paramVo.getAttach());
         transaction.setOpenId(null);
         transaction.setResultJson(result);
+        transaction.setMemberPaymentInfoId(paramVo.getMemberPaymentInfoId());
         sysUserService.dao().insert(transaction);
-
-        sysUserService.dao().update(MemberPaymentInfo.class,
-                Chain.make("payId", transaction.getId()), Cnd.where("id", "=", paramVo.getMemberPaymentInfoId()));
     }
 }

From 2909e011111b1a87de2ec2620f773bd58bc30d82 Mon Sep 17 00:00:00 2001
From: Paidax <paidax.422@qq.com>
Date: Tue, 11 Mar 2025 10:47:04 +0800
Subject: [PATCH 12/17] =?UTF-8?q?=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment/model/PaymentTransaction.java     |  2 +-
 .../controller/WxPayCommonController.java     | 11 +++++---
 .../service/impl/WxPayCommonServiceImpl.java  | 25 +++++++++++++------
 .../MemberPaymentTestController.java          |  2 +-
 4 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/main/java/io/v/nutz/base/payment/model/PaymentTransaction.java b/src/main/java/io/v/nutz/base/payment/model/PaymentTransaction.java
index be51975..1ee1810 100644
--- a/src/main/java/io/v/nutz/base/payment/model/PaymentTransaction.java
+++ b/src/main/java/io/v/nutz/base/payment/model/PaymentTransaction.java
@@ -114,6 +114,6 @@ public class PaymentTransaction extends BaseModel {
 
     @Column
     @Comment("交易名单的主键id")
-    @ColDefine(type = ColType.MYSQL_JSON)
+    @ColDefine(type = ColType.VARCHAR, width = 32)
     private String memberPaymentInfoId;
 }
diff --git a/src/main/java/io/v/nutz/base/payment/wxpay/controller/WxPayCommonController.java b/src/main/java/io/v/nutz/base/payment/wxpay/controller/WxPayCommonController.java
index 5084140..2fbb068 100644
--- a/src/main/java/io/v/nutz/base/payment/wxpay/controller/WxPayCommonController.java
+++ b/src/main/java/io/v/nutz/base/payment/wxpay/controller/WxPayCommonController.java
@@ -1,6 +1,5 @@
 package io.v.nutz.base.payment.wxpay.controller;
 
-import io.v.nutz.base.annontation.ViReturn;
 import io.v.nutz.base.payment.wxpay.service.WxPayCommonService;
 import lombok.extern.slf4j.Slf4j;
 import org.nutz.ioc.loader.annotation.Inject;
@@ -30,8 +29,14 @@ public class WxPayCommonController {
 
     @At
     @Ok("void")
-    @ViReturn
-    public void notifyMessage(HttpServletRequest request, HttpServletResponse response){
+    public void payNotify(HttpServletRequest request, HttpServletResponse response){
         wxPayCommonService.payNotify(request, response);
     }
+
+
+    @At
+    @Ok("void")
+    public void refundNotify(HttpServletRequest request, HttpServletResponse response){
+        wxPayCommonService.refundNotify(request, response);
+    }
 }
diff --git a/src/main/java/io/v/nutz/base/payment/wxpay/service/impl/WxPayCommonServiceImpl.java b/src/main/java/io/v/nutz/base/payment/wxpay/service/impl/WxPayCommonServiceImpl.java
index b719fcd..75d44e9 100644
--- a/src/main/java/io/v/nutz/base/payment/wxpay/service/impl/WxPayCommonServiceImpl.java
+++ b/src/main/java/io/v/nutz/base/payment/wxpay/service/impl/WxPayCommonServiceImpl.java
@@ -64,6 +64,8 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
     private final static int OK = 200;
 
     // 1666930980 商户号
+    // ww3eda050a1b5ad96e 企业微信
+    // wxf12fa6175ec7c75f 微信服务号
     // 微信V3必要的支付参数，后期优化
     private final static WxPayV3Bean WX_PAY_V3_BEAN = new WxPayV3Bean(
             "ww3eda050a1b5ad96e",
@@ -81,7 +83,8 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
     // 自定义参数，内容是统一的，但会被多次调用，直接声明
     private String serialNo;
     private String platSerialNo;
-    private final String payNotifyUrl = WX_PAY_V3_BEAN.getDomain().concat("/wxPay/notifyMessage");
+    private final String payNotifyUrl = WX_PAY_V3_BEAN.getDomain().concat("/wxPay/payNotify");
+    private final String refundNotifyUrl = WX_PAY_V3_BEAN.getDomain().concat("/wxPay/refundNotify");
 
     @Inject
     private Dao dao;
@@ -307,7 +310,7 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
                 log.error("签名错误");
             }
 
-            // 支付回调，返回给微信，自己也接收不到结果，这里的返回完全没用
+            // 支付回调，返回给微信，自己也接收不到结果，这里的返回没用
             response.setHeader("Content-type", ContentType.JSON.toString());
             response.getOutputStream().write(JSONUtil.toJsonStr(map).getBytes(StandardCharsets.UTF_8));
             response.flushBuffer();
@@ -332,10 +335,11 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
             String outRefundNo = PayKit.generateStr();
             log.info("商户退款单号: {}", outRefundNo);
 
+            // 没用
 //            List<RefundGoodsDetail> list = new ArrayList<>();
 //            RefundGoodsDetail refundGoodsDetail = new RefundGoodsDetail()
 //                    .setMerchant_goods_id("123")
-//                    .setGoods_name("IJPay 测试")
+//                    .setGoods_name("测试")
 //                    .setUnit_price(1)
 //                    .setRefund_amount(1)
 //                    .setRefund_quantity(1);
@@ -343,8 +347,8 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
 
             RefundModel refundModel = new RefundModel()
                     .setOut_refund_no(outRefundNo)
-                    .setReason("用户发起退款")
-                    .setNotify_url(payNotifyUrl)
+                    .setReason(transaction.getDescription() + "退款")
+                    .setNotify_url(refundNotifyUrl)
                     .setAmount(new RefundAmount().setRefund(tradingAmount).setTotal(tradingAmount).setCurrency("CNY"));
 //                    .setGoods_detail(list);
 
@@ -379,7 +383,7 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
                 record.setPaymentTransactionId(transaction.getId());
                 record.setOutRefundTradeNo(outRefundNo);
                 record.setRefundNo(null);
-                record.setRefundState(RefundStateEnum.REFUNDING.getRefundStateName());
+                record.setRefundState(RefundStateEnum.REFUNDING.name());
                 record.setRefundAmount(tradingAmount);
                 record.setTotal(tradingAmount);
                 record.setResultJson(response.getBody());
@@ -402,6 +406,7 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
      * @param response
      */
     @Override
+    @Aop(TransAop.READ_COMMITTED)
     public void refundNotify(HttpServletRequest request, HttpServletResponse response) {
         Map<String, String> map = new HashMap<>(12);
         try {
@@ -427,9 +432,14 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
             if (StrUtil.isNotEmpty(plainText)) {
                 // 取出明文，修改退款的结果
                 JSONObject jsonObject = JSONUtil.parseObj(plainText);
-                // 查询出退款记录
+                // 查询出退款记录，存储关键信息并修改
                 PaymentRefundRecord record = dao.fetch(PaymentRefundRecord.class, Cnd.where("outRefundTradeNo", "=", jsonObject.getStr("out_refund_no")));
                 record.setRefundNo(jsonObject.getStr("refund_id"));
+                record.setRefundState(RefundStateEnum.REFUND_SUCCESS.name());
+                // 到此是退款成功了，还要去修改订单表的数据
+                dao.update(PaymentTransaction.class, Chain.make("isRefund", true)
+                                .add("refundAmount", record.getRefundAmount()),
+                        Cnd.where("id", "=", record.getPaymentTransactionId()));
 
                 response.setStatus(200);
                 map.put("code", "SUCCESS");
@@ -439,6 +449,7 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
                 map.put("code", "ERROR");
                 map.put("message", "签名错误");
             }
+            // 没用
             response.setHeader("Content-type", ContentType.JSON.toString());
             response.getOutputStream().write(JSONUtil.toJsonStr(map).getBytes(StandardCharsets.UTF_8));
             response.flushBuffer();
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentTestController.java b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentTestController.java
index 5a52550..0e5d030 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentTestController.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentTestController.java
@@ -68,7 +68,7 @@ public class MemberPaymentTestController {
     @At
     @Ok("re")
     public String getCode(@Param("code") String code, @Param("state") String state){
-        String openId = wxPayCommonService.getOpenId(code);
+//        String openId = wxPayCommonService.getOpenId(code);
 //        WxPayNeedParamVo paramVo = new WxPayNeedParamVo();
 //        paramVo.setDescription("支付");
 //        paramVo.setAttach("");

From 4c58e0fbdb2fe5f956aee1119023d7956721f9cb Mon Sep 17 00:00:00 2001
From: Paidax <paidax.422@qq.com>
Date: Tue, 11 Mar 2025 15:52:04 +0800
Subject: [PATCH 13/17] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=85=8D=E5=AF=86?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v/nutz/web/commons/shiro/config/EasyCredentialsMatch.java | 3 ++-
 .../web/commons/shiro/realm/PlatformAuthorizingRealm.java     | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/v/nutz/web/commons/shiro/config/EasyCredentialsMatch.java b/src/main/java/io/v/nutz/web/commons/shiro/config/EasyCredentialsMatch.java
index aa81ce4..fe13696 100644
--- a/src/main/java/io/v/nutz/web/commons/shiro/config/EasyCredentialsMatch.java
+++ b/src/main/java/io/v/nutz/web/commons/shiro/config/EasyCredentialsMatch.java
@@ -7,6 +7,7 @@ import io.v.nutz.web.commons.shiro.token.PlatformCaptchaToken;
 import org.apache.shiro.authc.AuthenticationInfo;
 import org.apache.shiro.authc.AuthenticationToken;
 import org.apache.shiro.authc.credential.HashedCredentialsMatcher;
+
 import java.util.Arrays;
 
 public class EasyCredentialsMatch extends HashedCredentialsMatcher {
@@ -25,7 +26,7 @@ public class EasyCredentialsMatch extends HashedCredentialsMatcher {
         LoginUtil.LoginOrigin loginOrigin = platformCaptchaToken.getLoginOrigin();
 
         //cas和企业微信实现免密登录
-        if (loginOrigin.equals(LoginUtil.LoginOrigin.CAS) || loginOrigin.equals(LoginUtil.LoginOrigin.QI_YE_WEI_XIN)) {
+        if (loginOrigin.equals(LoginUtil.LoginOrigin.CAS) || loginOrigin.equals(LoginUtil.LoginOrigin.QI_YE_WEI_XIN) || !loginOrigin.equals(LoginUtil.LoginOrigin.WEI_XIN)) {
             return true;
         }
 
diff --git a/src/main/java/io/v/nutz/web/commons/shiro/realm/PlatformAuthorizingRealm.java b/src/main/java/io/v/nutz/web/commons/shiro/realm/PlatformAuthorizingRealm.java
index e97c3af..cc1effe 100644
--- a/src/main/java/io/v/nutz/web/commons/shiro/realm/PlatformAuthorizingRealm.java
+++ b/src/main/java/io/v/nutz/web/commons/shiro/realm/PlatformAuthorizingRealm.java
@@ -94,7 +94,7 @@ public class PlatformAuthorizingRealm extends AuthorizingRealm {
                     throw Lang.makeThrow(AuthenticationException.class, "验证码失效，请重新获取");
                 }
                 user = sysUserService.fetch(Cnd.NEW().and("mobile", "=", mobile));
-            }else if (!loginOrigin.equals(LoginUtil.LoginOrigin.CAS) && !loginOrigin.equals(LoginUtil.LoginOrigin.QI_YE_WEI_XIN)) {
+            }else if (!loginOrigin.equals(LoginUtil.LoginOrigin.CAS) && !loginOrigin.equals(LoginUtil.LoginOrigin.QI_YE_WEI_XIN) && !loginOrigin.equals(LoginUtil.LoginOrigin.WEI_XIN)) {
                 validateService.checkCode(key, captcha);
                 if (Strings.isBlank(loginname)) {
                     throw Lang.makeThrow(AuthenticationException.class, "登录账号不可为空");
@@ -116,7 +116,7 @@ public class PlatformAuthorizingRealm extends AuthorizingRealm {
                 throw Lang.makeThrow(LockedAccountException.class, "账号被禁用", loginname);
             }
 
-            if (!loginOrigin.equals(LoginUtil.LoginOrigin.CAS) && !loginOrigin.equals(LoginUtil.LoginOrigin.QI_YE_WEI_XIN)) {
+            if (!loginOrigin.equals(LoginUtil.LoginOrigin.CAS) && !loginOrigin.equals(LoginUtil.LoginOrigin.QI_YE_WEI_XIN) && !loginOrigin.equals(LoginUtil.LoginOrigin.WEI_XIN)) {
                 int errCount = NumberUtils.toInt(Strings.sNull(session.getAttribute("platformErrCount")));
                 if (errCount >= 4) {
                     //输错5次禁用账户10分钟

From e09d1e1649d2031a802f1fe23bb2244a135278cc Mon Sep 17 00:00:00 2001
From: "@jyuhsin" <729757837@qq.com>
Date: Tue, 11 Mar 2025 18:10:07 +0800
Subject: [PATCH 14/17] commit

---
 .../MobileMemberCostListController.java       |  16 +-
 .../assets/mobile/svg/memberPay/icon_xsgj.svg |   1 +
 .../mobile/memberCost/memberCostList.html     | 549 ++++++++++--------
 3 files changed, 330 insertions(+), 236 deletions(-)
 create mode 100644 src/main/resources/static/assets/mobile/svg/memberPay/icon_xsgj.svg

diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/h5controller/MobileMemberCostListController.java b/src/main/java/io/v/nutz/zhgh/memberCost/h5controller/MobileMemberCostListController.java
index d2ddeba..c2ca398 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/h5controller/MobileMemberCostListController.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/h5controller/MobileMemberCostListController.java
@@ -1,6 +1,10 @@
 package io.v.nutz.zhgh.memberCost.h5controller;
 
+import com.ijpay.wxpay.model.v3.Amount;
 import io.v.nutz.base.annontation.ViReturn;
+import io.v.nutz.base.payment.wxpay.service.WxPayCommonService;
+import io.v.nutz.base.payment.wxpay.vo.WxPayNeedParamVo;
+import io.v.nutz.base.result.Result;
 import io.v.nutz.web.commons.utils.ShiroUtil;
 import io.v.nutz.zhgh.memberCost.service.MemberPaymentService;
 import lombok.extern.slf4j.Slf4j;
@@ -25,6 +29,8 @@ public class MobileMemberCostListController {
 
     @Inject
     private MemberPaymentService memberPaymentService;
+    @Inject
+    private WxPayCommonService wxPayCommonService;
 
     @At("")
     @Ok("beetl:/mobile/memberCost/memberCostList.html")
@@ -41,7 +47,6 @@ public class MobileMemberCostListController {
     public void summary() {
     }
 
-
     @At
     @ViReturn
     public Object pageData(Integer memberActive) {
@@ -67,5 +72,12 @@ public class MobileMemberCostListController {
         return memberPaymentService.fetch(id);
     }
 
-
+    @At
+    public Object pullWeChatPay(Integer money, String busId) {
+        WxPayNeedParamVo wxPayNeedParamVo = new WxPayNeedParamVo();
+        wxPayNeedParamVo.setDescription("会费缴纳");
+        wxPayNeedParamVo.setMemberPaymentInfoId(busId);
+        wxPayNeedParamVo.setAmount(new Amount().setTotal(money));
+		return wxPayCommonService.jsApiPay(wxPayNeedParamVo);
+    }
 }
diff --git a/src/main/resources/static/assets/mobile/svg/memberPay/icon_xsgj.svg b/src/main/resources/static/assets/mobile/svg/memberPay/icon_xsgj.svg
new file mode 100644
index 0000000..967d95d
--- /dev/null
+++ b/src/main/resources/static/assets/mobile/svg/memberPay/icon_xsgj.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1741597488639" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3556" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M1007.00026 280.122039c-19.967068-135.446124-127.709596-243.188651-263.127276-263.15572A1592.10348 1592.10348 0 0 0 291.371434 15.373505a323.11381 323.11381 0 0 0-276.040452 276.040451 1594.549588 1594.549588 0 0 0 1.621258 452.444664c19.910182 135.446124 127.709596 243.217094 263.127276 263.155719a1591.705276 1591.705276 0 0 0 463.793468 0c135.389237-19.910182 243.188651-127.709596 263.098833-263.155719a1591.591504 1591.591504 0 0 0 0-463.736581" fill="#FFB123" p-id="3557"></path><path d="M668.413394 540.433446a156.437144 156.437144 0 1 1 0 312.874289 156.437144 156.437144 0 0 1 0-312.874289z m-56.089827 85.386238l-0.654192 0.398204-13.937127 15.131738c-0.369761 0.398204-0.511976 0.967066-0.36976 1.479042l0.36976 0.711078 37.061382 40.247011a1.621258 1.621258 0 0 1-0.170659 2.332335l-0.82485 0.284431h-24.517967c-0.568862 0-1.080838 1.877246-1.308384 3.157186l-0.113772 1.023953v21.389224c0 0.568862 0.284431 1.052395 0.711078 1.308383l0.711078 0.227545h46.44761a2.844312 2.844312 0 0 1 2.616767 1.848803l0.199101 1.194611v19.853295c0 0.568862-0.284431 1.052395-0.682634 1.336827l-0.711078 0.199102H609.25171a1.393713 1.393713 0 0 0-1.223054 0.767964l-0.199101 0.767964v21.389224c0 0.568862 0.284431 1.052395 0.711078 1.308383l0.711077 0.227545h47.869767c0.511976 0 0.967066 0.284431 1.223054 0.739521l0.170658 0.796408v30.946111c0 0.568862 0.284431 1.052395 0.711078 1.336827l0.711078 0.199101h19.71108c0.511976 0 0.967066-0.284431 1.223054-0.767964l0.170659-0.767964v-30.946111c0-0.568862 0.284431-1.052395 0.711078-1.336827l0.711078-0.199102h47.869766c0.511976 0 0.967066-0.312874 1.223054-0.767964l0.170659-0.767964v-21.389224c0-0.568862-0.284431-1.052395-0.682635-1.308383l-0.711078-0.227545h-47.869766a1.393713 1.393713 0 0 1-1.223054-0.767965l-0.199102-0.767964v-19.853295c0-1.251497 0.711078-2.360779 1.706587-2.815869l1.137725-0.227545h46.44761c0.511976 0 0.967066-0.312874 1.223054-0.767964l0.170659-0.767964v-21.389224a11.377247 11.377247 0 0 0-0.853294-3.669163l-0.568862-0.511976h-27.305393c-0.938623 0-1.535928-0.938623-1.393712-1.791916l0.398203-0.82485 37.061382-40.247011a1.649701 1.649701 0 0 0 0.398204-1.479042l-0.341318-0.711078-13.937127-15.131738a1.336827 1.336827 0 0 0-1.36527-0.398204l-0.625748 0.398204-50.799408 55.122761a5.318863 5.318863 0 0 1-6.513473 1.137724l-1.422156-1.137724-50.82785-55.122761c-0.369761-0.398204-0.853294-0.540419-1.336827-0.398204zM682.634953 256.002275a56.886234 56.886234 0 0 1 56.886234 56.886235v213.266492A184.880261 184.880261 0 0 0 497.726248 767.978383H312.87443a56.886234 56.886234 0 0 1-56.886234-56.886234V312.88851a56.886234 56.886234 0 0 1 56.886234-56.886235h369.760523z m-170.658703 199.10182h-142.215585a28.443117 28.443117 0 0 0-3.327845 56.687133L369.760665 511.990329h142.215585a28.443117 28.443117 0 0 0 0-56.886234z m113.772468-113.772468h-255.988053a28.443117 28.443117 0 0 0-3.327845 56.687132L369.760665 398.217861h255.988053a28.443117 28.443117 0 0 0 0-56.886234z" fill="#FFFFFF" p-id="3558"></path></svg>
\ No newline at end of file
diff --git a/src/main/resources/views/mobile/memberCost/memberCostList.html b/src/main/resources/views/mobile/memberCost/memberCostList.html
index 67937f0..6e631d4 100644
--- a/src/main/resources/views/mobile/memberCost/memberCostList.html
+++ b/src/main/resources/views/mobile/memberCost/memberCostList.html
@@ -3,45 +3,70 @@ layout("/mobile/platform.html"){
 #-->
 
 <style>
-    .module {
-        margin: 10px 10px 14px 10px;
-        box-shadow: 0 8px 12px #ebedf0;
+
+    .parent-card {
+        margin: 14px;
+        padding: 12px 12px;
+        background-color: #fff;
         border-radius: 10px;
+        box-shadow: 0 8px 12px #ebedf0;
+        line-height: 22px;
+        font-size: 13px;
+        position: relative;
     }
-
-    .menu {
-        display: flex;
-        flex-wrap: wrap;
-        row-gap: 10px;
-        background-color: white;
-        border-bottom-left-radius: 10px;
-        border-bottom-right-radius: 10px;
-        padding: 6px 0px;
-    }
-
-    .menu_img {
-        position: absolute;
-        right: 10px;
-        bottom: 0px;
-    }
-
-    .menu_img_yjf {
-        position: absolute;
-        right: 10px;
-        bottom: 10px;
-        width: 100px;
-        height: 60px;
-    }
-
-    .pay_img {
-        margin-right: 5px;
-        display: flex;
-    }
-
-    .member_cost .van-cell__title {
+    .content-card {
         display: flex;
         align-items: center;
     }
+    .left-child-card {
+        display: table;
+        margin-right: 8px;
+    }
+    .left-child-card img {
+        display: table-cell;
+        width: 40px;
+    }
+    .footer-card {
+        text-align: right;
+    }
+    .footer-card .van-button {
+        border-radius: 6px;
+        height: 28px;
+    }
+    .pay-content {
+
+    }
+    .pay-content  .van-cell {
+        align-items: center;
+        justify-content: space-between;
+    }
+    .pay-content  .van-cell__title {
+        color: #646566;
+    }
+    .pay_img {
+        display: table;
+    }
+    .pay_img img {
+        display: table-cell;
+    }
+    .costFormula {
+
+    }
+    .costFormula .van-cell__title {
+        max-width: 100px;
+    }
+    .van-action-sheet__content {
+        padding-bottom: 50px;
+    }
+    .van-dropdown-menu__bar {
+        box-shadow: none;
+    }
+    .van-empty {
+        position: relative;
+        transform: none;
+        left: 0;
+    }
+
 </style>
 
 <div id="app" v-cloak>
@@ -49,255 +74,311 @@ layout("/mobile/platform.html"){
         <van-nav-bar @click-left="pjaxReplace('/mobile/index')" left-arrow title="会费支付"></van-nav-bar>
     </van-sticky>
 
-    <div>
-        <van-tabs @change="pageData" v-model="memberActive">
-            <van-tab title="未缴费"></van-tab>
-            <van-tab title="已缴费"></van-tab>
-        </van-tabs>
+    <van-dropdown-menu active-color="#1989fa">
+        <van-dropdown-item v-model="pageForm.year" @change="doSearch" :options="yearList"></van-dropdown-item>
+        <van-dropdown-item v-model="pageForm.isPay" @change="doSearch" :options="payList"></van-dropdown-item>
+    </van-dropdown-menu>
 
-        <van-row class="module" v-for="p in payList">
-            <div class="menu">
-                <van-col :span="8" style="padding: 10px">
-                    <van-image height="6rem" round src="/assets/mobile/svg/memberPay/hf.svg" width="6rem"></van-image>
-                </van-col>
-                <van-col :span="16" style="position: relative">
-                    <div style="text-align: left">
-                        会费项目：
-                        <div style="font-weight: bold; font-size: 14px">{{p.projectName}}</div>
-                    </div>
-                    <div style="text-align: left">
-                        会费标准：
-                        <div v-if="p.selectMode==='1'" style="font-weight: bold; font-size: 14px">{{p.modeValue}}</div>
-                        <div v-if="p.selectMode==='2'" style="font-weight: bold; font-size: 14px">{{p.modeValueName}}</div>
-                    </div>
-                    <div style="text-align: left" v-if="p.paymentMoney&&p.isPayment">已缴费金额：{{p.paymentMoney}}</div>
-                    <div class="menu_img" v-if="!p.isPayment">
-                        <van-button @click.stop="openAlipay(p)" color="#1867b0" round size="mini" style="width: 75px; height: 30px" type="primary">
-                            我要缴费
-                        </van-button>
-                    </div>
-                    <div class="menu_img_yjf" v-if="p.isPayment">
-                        <van-image src="/assets/mobile/svg/memberPay/yjf.svg"></van-image>
-                    </div>
-                </van-col>
-                <el-col span="2"></el-col>
-            </div>
-        </van-row>
-
-        <van-action-sheet :close-on-click-overlay="false" :title="viewData.projectName" style="height: 60%" v-model="payShow">
-            <div class="member_cost">
-                <div v-if="viewData.selectMode==='2'">
-                    <van-cell :value="costFormula" title="会费计算公式"></van-cell>
-                    <van-cell-group>
-                        <van-field
-                            :label="o.name"
-                            :placeholder="'请输入'+o.name"
-                            @input="moneyInput"
-                            input-align="right"
-                            type="number"
-                            v-for="(o,index) in viewData.modeValueList"
-                            v-model="o.value"
-                        >
-                            <template #left-icon>
-                                <div class="pay_img">
-                                    <van-image src="/assets/mobile/svg/memberPay/money.svg"></van-image>
-                                </div>
-                            </template>
-                        </van-field>
-                    </van-cell-group>
+    <div class="parent-card">
+        <div v-for="item in tableData">
+            <div class="content-card">
+                <div class="left-child-card">
+                    <img src="/assets/mobile/svg/memberPay/icon_xsgj.svg"/>
                 </div>
-                <div>
-                    <van-radio-group checked-color="#1867b0" v-model="moneyModel">
-                        <van-cell-group>
-                            <van-cell @click="moneyModel = 1" clickable title="支付宝">
-                                <template #icon>
-                                    <div class="pay_img">
-                                        <van-image src="/assets/mobile/svg/memberPay/zfb.svg"></van-image>
-                                    </div>
-                                </template>
-                                <template #right-icon>
-                                    <van-radio :name="1"></van-radio>
-                                </template>
-                            </van-cell>
-                            <van-cell @click="moneyModel = 2" clickable title="微信">
-                                <template #icon>
-                                    <div class="pay_img">
-                                        <van-image src="/assets/mobile/svg/memberPay/wx.svg"></van-image>
-                                    </div>
-                                </template>
-                                <template #right-icon>
-                                    <van-radio :name="2"></van-radio>
-                                </template>
-                            </van-cell>
-                        </van-cell-group>
-                    </van-radio-group>
+                <div class="right-child-card">
+                    <div>
+                        <span>项目名称：</span>
+                        <span>{{item.projectName}}</span>
+                    </div>
+                    <div>
+                        <span>所属时间：</span>
+                        <span>{{item.paymentStartMonth}} 至 {{item.paymentEndMonth}}</span>
+                    </div>
+                    <div>
+                        <span>缴费时间：</span>
+                        <span>{{moment(item.startTime).format('MM-DD') + ' 至 ' + moment(item.endTime).format('MM-DD')}}</span>
+                    </div>
                 </div>
             </div>
-            <van-submit-bar :loading="loading" :price="money" @submit="doAlipay" button-color="#1867b0" button-text="支付"></van-submit-bar>
-        </van-action-sheet>
-
-        <van-popup :style="{ height: '100%', width: '100%'}" @close="imgClose" closeable position="right" v-model="zfImg">
-            <van-image src="/assets/mobile/svg/memberPay/zf_img.png" style="margin-top: 40px; height: 95%; width: 100%"></van-image>
-        </van-popup>
-
+            <div class="footer-card">
+                <van-button v-if="!item.isPayment" @click.stop="openPay(item)" color="#1867b0" size="small" type="primary">
+                    我要缴费
+                </van-button>
+                <van-button v-if="item.isPayment" size="small" type="primary" :disabled="true">
+                    您已缴费
+                </van-button>
+            </div>
+        </div>
         <van-empty
             class="custom-image"
             description="暂无缴费记录"
             image="https://img01.yzcdn.cn/vant/custom-empty-image.png"
-            v-if="payList&&payList.length===0"
+            v-if="tableData && tableData.length===0"
         ></van-empty>
     </div>
+
+    <van-action-sheet :close-on-click-overlay="false" :title="payInfo.projectName" style="height: 60%" v-model="payVisible" @close="payVisibleClose">
+        <div class="pay-content">
+            <template>
+                <van-cell class="costFormula" title="缴费所属时间">
+                    <template #right-icon>
+                        {{formData.paymentStartMonth}} 至 {{formData.paymentEndMonth}}
+                    </template>
+                </van-cell>
+                <van-cell class="costFormula" title="缴费标准">
+                    <template #right-icon>
+                        <div style="color: red"
+                             v-if="formData.payModeValueList&&formData.payModeValueList.length>0">
+                            (
+                            <template v-for="(o,i) in formData.payModeValueList">
+                                {{o.name}}
+                                <template v-if="i != formData.payModeValueList.length - 1">+</template>
+                            </template>
+                            ) * 0.5% * {{formData.paymentMonth}}个月
+                        </div>
+                        <div v-else>固定金额缴费</div>
+                    </template>
+                </van-cell>
+                <van-field
+                    :label="o.name"
+                    :placeholder="'请输入' + o.name"
+                    @input="moneyInput"
+                    input-align="right"
+                    type="number"
+                    v-for="(o,index) in formData.payModeValueList"
+                    v-model="o.value"
+                >
+                    <template #left-icon>
+                        <div class="pay_img">
+                            <img src="/assets/mobile/svg/memberPay/money.svg"/>
+                        </div>
+                    </template>
+                </van-field>
+            </template>
+
+            <van-radio-group checked-color="#1867b0" v-model="moneyModel">
+                <van-cell @click="moneyModel = 1" clickable title="支付宝">
+                    <template #icon>
+                        <div class="pay_img" style="margin-right: 4px">
+                            <img src="/assets/mobile/svg/memberPay/zfb.svg"/>
+                        </div>
+                    </template>
+                    <template #right-icon>
+                        <van-radio :name="1"></van-radio>
+                    </template>
+                </van-cell>
+                <van-cell @click="moneyModel = 2" clickable title="微信">
+                    <template #icon>
+                        <div class="pay_img" style="margin-right: 4px">
+                            <img src="/assets/mobile/svg/memberPay/wx.svg"/>
+                        </div>
+                    </template>
+                    <template #right-icon>
+                        <van-radio :name="2"></van-radio>
+                    </template>
+                </van-cell>
+            </van-radio-group>
+            <van-submit-bar :loading="loading" :price="formData.paymentMoney" @submit="doPay" button-color="#1867b0" button-text="支付"></van-submit-bar>
+        </div>
+
+    </van-action-sheet>
+
+    <van-popup :style="{ height: '100%', width: '100%'}" @close="imgClose" closeable position="right" v-model="payToOtherPage">
+        <van-image src="/assets/mobile/svg/memberPay/zf_img.png" style="margin-top: 40px; height: 95%; width: 100%"></van-image>
+    </van-popup>
+
 </div>
 
+<script src="https://res2.wx.qq.com/open/js/jweixin-1.4.0.js"></script>
 <script>
+    function onBridgeReady(json) {
+        // const data = JSON.parse(json)
+        WeixinJSBridge.invoke("getBrandWCPayRequest", JSON.parse(json), function (res) {
+            if (res.err_msg === "get_brand_wcpay_request:ok") {
+                // 使用以上方式判断前端返回,微信团队郑重提示：
+                //res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
+            }
+        })
+    }
     const vue = new Vue({
         el: "#app",
         mixins: [mobileMixins],
         data() {
             return {
-                zfImg: false,
+                payToOtherPage: false,
                 costFormula: "",
-                formData: {},
-                payShow: false,
+                payVisible: false,
                 loading: false,
-                moneyModel: "",
-                money: 0,
                 viewData: {},
-                configData: {},
-                payList: [],
-                memberActive: 0,
-                intervalTimer: null
+                tableData: [],
+                payList: [
+                    {text: '全部', value: null},
+                    {text: '已缴费', value: true},
+                    {text: '未缴费', value: false},
+                ],
+                pageForm: {
+                    year: new Date().getFullYear(),
+                    isPay: false
+                },
+                payInfo: {},
+                formData: {},
+                moneyModel: 2,
+                intervalTimer: null,
+                hasPayed: false,
             }
         },
         methods: {
-            imgClose() {
+            async payVisibleClose() {
                 clearInterval(this.intervalTimer)
+            },
+            doSearch() {
+                this.pageForm.pageNumber = 1
+                this.tableData = []
+                this.finished = false
+                this.pageData()
+            },
+            imgClose() {
                 this.loading = false
-                this.zfImg = false
+                this.payToOtherPage = false
             },
             moneyInput() {
-                const moneys = this.viewData.modeValueList.map((m) => Number(m.value))
-                let money = 0
-                moneys.forEach((m) => {
-                    money += m
-                })
-                if (money <= 10) {
-                    this.money = 1
-                } else {
-                    money = money.toFixed(2)
-                    this.money = (Number(money.replace(".", "")) * 0.5) / 100
-                }
+                let paymentMoney = this.formData.payModeValueList.reduce((a, b) => {
+                    return a + b.value
+                }, 0)
+                const pr = parseFloat((paymentMoney * 0.005 * this.formData.paymentMonth).toFixed(2))
+                this.$set(this.formData, "paymentMoney", pr * 100)
             },
-            async doAlipay() {
-                this.doIsPaySuccess()
-                if (!this.money) {
-                    vant.Toast("请计算会费金额")
+            async doPay() {
+                if (!this.formData.paymentMoney) {
+                    this.$toast('请计算会费金额')
                     return
                 }
                 if (!this.moneyModel) {
-                    vant.Toast("请选择支付方式")
+                    this.$toast('请选择支付方式')
                     return
                 }
-                this.loading = true
-                var u = navigator.userAgent
-                var isAndroid = u.indexOf("Android") > -1 || u.indexOf("Adr") > -1 //android终端
-                var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/) //ios终端
-                let money = 0
-                if (this.viewData.selectMode === "1") {
-                    money = this.viewData.modeValue
-                } else if (this.viewData.selectMode === "2") {
-                    const moneys = this.viewData.modeValueList.map((m) => Number(m.value))
-                    moneys.forEach((m) => {
-                        money += m
-                    })
-                    money = (money * 0.5) / 100
-                    money = money.toFixed(2)
+                if(this.moneyModel === 1) {
+                    this.$toast('暂未开通，敬请期待')
+                    return
                 }
-
+                const u = navigator.userAgent
+                const isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/) //ios终端
+                let userAgent = window.navigator.userAgent.toLowerCase()
                 if (this.moneyModel === 1) {
-                    let use = window.navigator.userAgent.toLowerCase()
                     //是否微信浏览器
-                    if (use.match(/MicroMessenger/i) && use.match(/MicroMessenger/i)[0] === "micromessenger") {
-                        this.zfImg = true
-                        return
+                    if (userAgent.match(/MicroMessenger/i) && userAgent.match(/MicroMessenger/i)[0] === "micromessenger") {
+                        this.payToOtherPage = true
                     } else {
-                        if (this.moneyModel === 1) {
-                            const resp = await $.get("/mobile/memberCost/AlipayClient/tradePagePay", {
-                                money: money,
-                                paymentProjectId: this.viewData.paymentProjectId
-                            })
-                            const div = document.createElement("div")
-                            div.innerHTML = resp // data就是接口返回的form 表单字符串
-                            document.body.appendChild(div)
-                            //如果是ios，不新开页面直接跳转
-                            if (isiOS) {
-                                document.forms[0].submit()
-                            } else {
-                                document.forms[0].setAttribute("target", "_blank") // 新开窗口跳转
-                                document.forms[0].submit()
-                            }
+                        const resp = await $.get("/mobile/memberCost/AlipayClient/tradePagePay", {
+                            money: paymentMoney,
+                            paymentProjectId: this.payInfo.id
+                        })
+                        const div = document.createElement("div")
+                        div.innerHTML = resp // data就是接口返回的form 表单字符串
+                        document.body.appendChild(div)
+                        //如果是ios，不新开页面直接跳转
+                        if (isiOS) {
+                            document.forms[0].submit()
+                        } else {
+                            document.forms[0].setAttribute("target", "_blank") // 新开窗口跳转
+                            document.forms[0].submit()
                         }
                     }
+                } else if(this.moneyModel === 2) {
+                    if (userAgent.match(/MicroMessenger/i) && userAgent.match(/MicroMessenger/i)[0] === "micromessenger") {
+                        const confirm = await this.$dialog.confirm({
+                            title: '温馨提示',
+                            message: '您确定要支付吗？',
+                        })
+                        if (confirm === 'confirm') {
+                            const loading = this.$toast.loading({
+                                message: '支付中...',
+                                forbidClick: true,
+                            })
+                            this.hasPayed = false
+                            await this.pullWeChatPay()
+                            await this.getIsPay(loading)
+                        }
+                    } else {
+                        this.$toast('微信支付只能在微信APP中使用，请切换支付方式')
+                    }
+                }
+            },
+            //拉起微信支付
+            async pullWeChatPay() {
+                const resp = await $.post("/mobile/memberCost/list/pullWeChatPay", {
+                    money: this.formData.paymentMoney,
+                    busId: this.payInfo.id
+                })
+                if (resp.code === 0) {
+                    if (typeof WeixinJSBridge == "undefined") {
+                        if (document.addEventListener) {
+                            document.addEventListener("WeixinJSBridgeReady", onBridgeReady(resp.data))
+                        } else if (document.attachEvent) {
+                            document.attachEvent("WeixinJSBridgeReady", onBridgeReady(resp.data))
+                            document.attachEvent("onWeixinJSBridgeReady", onBridgeReady(resp.data))
+                        }
+                    } else {
+                        onBridgeReady(resp.data)
+                    }
+                }
+            },
+            async getIsPay(loading) {
+                this.intervalTimer = setInterval(async () => {
+                    const resp = await $.get("/platform/member/payment/mine/getIsPay", { paymentInfoId: this.payInfo.id })
+                    if (resp.code === 0) {
+                        loading.close()
+                        if(resp.data > 0) {
+                            this.hasPayed = true
+                        }
+                    }
+                }, 2000)
+            },
+            async openPay(row) {
+                this.payInfo = row
+                const payStandards = JSON.parse(row.payStandards)
+                const payStandard = payStandards.find(p => p.payPersonnel === row.payPersonnel && p.personType === row.personType)
+                this.$set(this.formData, "paymentMonth", row.paymentMonth)
+                this.$set(this.formData, "paymentStartMonth", row.paymentStartMonth)
+                this.$set(this.formData, "paymentEndMonth", row.paymentEndMonth)
+                this.$set(this.formData, "paymentInfoId", row.id)
+                if (payStandard.payModeValue) {
+                    this.$set(this.formData, "payModeValueList", [])
+                    this.$set(this.formData, "paymentMoney", payStandard.payModeValue)
                 } else {
+                    this.$set(this.formData, "payModeValueList", payStandard.payModeValueList)
+                    this.$set(this.formData, "paymentMoney", 0)
                 }
-            },
-            async getConfig() {
-                const { data } = await $.get("/platform/member/payment/config/getPaymentConfig")
-                this.configData = data
-            },
-            async openAlipay(p) {
-                const data = clone(p)
-                this.money = 0
-                this.moneyModel = ""
-                this.viewData = data
-
-                if (this.viewData.selectMode === "1") {
-                    this.money = Number(data.modeValue + "00")
-                }
-                if (this.viewData.selectMode === "2") {
-                    const names = this.viewData.modeValueList.map((m) => m.name)
-                    this.costFormula = "（" + names.join("+") + "）" + "×0.5%"
-                }
-                this.payShow = true
+                this.payVisible = true
             },
             async pageData() {
-                const resp = await $.post("/mobile/memberCost/list/pageData", { memberActive: this.memberActive })
-                if (resp.code === 0) {
-                    const personType = "${@shiro.getPrincipalProperty('personType')}"
-                    const payStandards = this.configData.payStandards
-                    resp.data.forEach((r) => {
-                        payStandards.map((p) => {
-                            if (p.personType===personType) {
-                                r.selectMode = p.payMode
-                                if (p.c === "1") {
-                                    r.modeValue = p.payModeValue
-                                } else {
-                                    r.modeValueList = p.payModeValueList
-                                    const names = r.modeValueList.map((m) => m.name)
-                                    r.modeValueName = "(" + names.join("+") + ")" + "×0.5%"
-                                }
-                            }
-                        })
-                    })
-                    this.payList = resp.data
+                const res = await $.post("/platform/member/payment/mine/pageData", this.pageForm)
+                if (res.code === 0) {
+                    this.tableData = this.tableData.concat(res.data.list)
+                    if (this.tableData.length === res.data.totalCount) {
+                        this.finished = true
+                    } else {
+                        this.pageForm.pageNumber++
+                    }
                 }
             },
-            doIsPaySuccess() {
-                this.intervalTimer = setInterval(async () => {
-                    const resp = await $.get("/mobile/memberCost/list/getPayInfo", { id: this.viewData.id })
-                    if (resp.data.isPayment === true) {
-                        clearInterval(this.intervalTimer)
-                        this.doSearch()
-                        this.payShow = false
-                        this.loading = false
-                        this.zfImg = false
-                    }
-                }, 4000)
-            }
         },
         async created() {
-            await this.getConfig()
+            let nowYear = new Date().getFullYear()
+            for (let i = nowYear; i >= nowYear - 9; i--) {
+                this.yearList.push({ text: i, value: i })
+            }
             await this.pageData()
+        },
+        watch: {
+            "hasPayed"(val) {
+                if(val === true) {
+                    clearInterval(this.intervalTimer)
+                    this.$dialog.alert({title: '温馨提示', message: '支付成功'})
+                    this.doSearch()
+                    this.payVisible = false
+                }
+            }
         }
     })
 </script>

From 426f51ed7486177519223b4719131f8fc41b01d8 Mon Sep 17 00:00:00 2001
From: Paidax <paidax.422@qq.com>
Date: Tue, 11 Mar 2025 18:25:28 +0800
Subject: [PATCH 15/17] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/payment/model/PaymentTransaction.java   | 10 ++++++++++
 .../service/impl/WxPayCommonServiceImpl.java     | 11 +++++++++--
 .../base/payment/wxpay/vo/WxPayNeedParamVo.java  |  8 --------
 .../views/mobile/memberCost/query/index.html     | 16 ----------------
 4 files changed, 19 insertions(+), 26 deletions(-)
 delete mode 100644 src/main/resources/views/mobile/memberCost/query/index.html

diff --git a/src/main/java/io/v/nutz/base/payment/model/PaymentTransaction.java b/src/main/java/io/v/nutz/base/payment/model/PaymentTransaction.java
index 1ee1810..58f1cca 100644
--- a/src/main/java/io/v/nutz/base/payment/model/PaymentTransaction.java
+++ b/src/main/java/io/v/nutz/base/payment/model/PaymentTransaction.java
@@ -67,11 +67,21 @@ public class PaymentTransaction extends BaseModel {
     @ColDefine(type = ColType.VARCHAR,width = 50)
     private String userName;
 
+    @Column
+    @Comment("工会id")
+    @ColDefine(type = ColType.VARCHAR,width = 32)
+    private String unionId;
+
     @Column
     @Comment("用户工会")
     @ColDefine(type = ColType.VARCHAR,width = 50)
     private String unionName;
 
+    @Column
+    @Comment("单位id")
+    @ColDefine(type = ColType.VARCHAR,width = 32)
+    private String unitId;
+
     @Column
     @Comment("用户单位")
     @ColDefine(type = ColType.VARCHAR,width = 50)
diff --git a/src/main/java/io/v/nutz/base/payment/wxpay/service/impl/WxPayCommonServiceImpl.java b/src/main/java/io/v/nutz/base/payment/wxpay/service/impl/WxPayCommonServiceImpl.java
index 75d44e9..e3f122b 100644
--- a/src/main/java/io/v/nutz/base/payment/wxpay/service/impl/WxPayCommonServiceImpl.java
+++ b/src/main/java/io/v/nutz/base/payment/wxpay/service/impl/WxPayCommonServiceImpl.java
@@ -26,6 +26,7 @@ import io.v.nutz.base.payment.wxpay.bean.WxPayV3Bean;
 import io.v.nutz.base.payment.wxpay.service.WxPayCommonService;
 import io.v.nutz.base.payment.wxpay.vo.WxPayNeedParamVo;
 import io.v.nutz.base.result.Result;
+import io.v.nutz.sys.models.Sys_user;
 import io.v.nutz.sys.models.User;
 import io.v.nutz.sys.services.SysUserService;
 import io.v.nutz.web.commons.utils.ShiroUtil;
@@ -157,6 +158,10 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
     @Aop(TransAop.READ_COMMITTED)
     public Result jsApiPay(WxPayNeedParamVo paramVo) {
         try {
+            Sys_user user = dao.fetch(Sys_user.class, ShiroUtil.getUserId());
+            if (StrUtil.isBlank(user.getOpenId())) {
+                return Result.error("未获取到当前用户的openid，请重新登录");
+            }
             // 商户订单号，存储当前用户的订单
             String outTradeNo = PayKit.generateStr();
             // 订单关闭时间
@@ -170,7 +175,7 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
                     .setAttach(paramVo.getAttach())
                     .setNotify_url(payNotifyUrl)
                     .setAmount(paramVo.getAmount())
-                    .setPayer(paramVo.getPayer());
+                    .setPayer(new Payer().setOpenid(user.getOpenId()));
 
             log.info("统一下单参数 {}", JSONUtil.toJsonStr(unifiedOrderModel));
             IJPayHttpResponse response = WxPayApi.v3(
@@ -195,7 +200,7 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
                 log.info("唤起支付参数:{}", map);
                 // 唤起支付成功，向数据库插入订单参数
                 insertTradingOrder(paramVo, outTradeNo, body);
-                return Result.success(JSONUtil.toJsonStr(map));
+                return Result.success();
             }
 //            return JSONUtil.toJsonStr(response);
             return null;
@@ -575,7 +580,9 @@ public class WxPayCommonServiceImpl implements WxPayCommonService {
         transaction.setUserId(user.getId());
         transaction.setLoginName(user.getLoginname());
         transaction.setUserName(user.getUsername());
+        transaction.setUnitId(user.getUnitid());
         transaction.setUnitName(user.getUnitname());
+        transaction.setUnionId(user.getUnionid());
         transaction.setUnionName(user.getUnionname());
         transaction.setTradingState(TradingStateEnum.WAITING_FOR_PAYMENT.name());
         // 获取订单金额
diff --git a/src/main/java/io/v/nutz/base/payment/wxpay/vo/WxPayNeedParamVo.java b/src/main/java/io/v/nutz/base/payment/wxpay/vo/WxPayNeedParamVo.java
index d1c0009..c035812 100644
--- a/src/main/java/io/v/nutz/base/payment/wxpay/vo/WxPayNeedParamVo.java
+++ b/src/main/java/io/v/nutz/base/payment/wxpay/vo/WxPayNeedParamVo.java
@@ -1,7 +1,6 @@
 package io.v.nutz.base.payment.wxpay.vo;
 
 import com.ijpay.wxpay.model.v3.Amount;
-import com.ijpay.wxpay.model.v3.Payer;
 import lombok.Data;
 
 /**
@@ -30,13 +29,6 @@ public class WxPayNeedParamVo {
      */
     private Amount amount;
 
-    /**
-     * 支付者对象，JsApi支付是必填，其他支付方式忽略；
-     * openid 微信绑定的用户openid和小程序的openid相同，必填；
-     * 其余参数可忽略
-     */
-    private Payer payer;
-
     /**
      * 会员支付信息ID，必填
      */
diff --git a/src/main/resources/views/mobile/memberCost/query/index.html b/src/main/resources/views/mobile/memberCost/query/index.html
deleted file mode 100644
index 6f61605..0000000
--- a/src/main/resources/views/mobile/memberCost/query/index.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!--#
-layout("/mobile/platform.html"){
-#-->
-<div id="app" v-cloak></div>
-<script>
-    new Vue({
-        el: "#app",
-        mixins: [mobileMixins],
-        data() {
-            return {}
-        }
-    })
-</script>
-<!--#
-}
-#-->

From ec49bcfa8bd3725e68ce2e1028b9a8d2dd696d60 Mon Sep 17 00:00:00 2001
From: zhouhefeng <zhouhefeng915@163.com>
Date: Tue, 11 Mar 2025 19:09:45 +0800
Subject: [PATCH 16/17] commit

---
 .../MemberPaymentChartSummaryController.java  | 169 ++++++++
 .../MemberPaymentMineController.java          |   5 +-
 .../MemberPaymentRefundController.java        | 114 ++++++
 .../membercost/chartSummary/index.html        | 382 ++++++++++++++++++
 .../views/platform/membercost/mine/index.html |  21 +-
 .../platform/membercost/refund/index.html     | 210 ++++++++++
 6 files changed, 887 insertions(+), 14 deletions(-)
 create mode 100644 src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentChartSummaryController.java
 create mode 100644 src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentRefundController.java
 create mode 100644 src/main/resources/views/platform/membercost/chartSummary/index.html
 create mode 100644 src/main/resources/views/platform/membercost/refund/index.html

diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentChartSummaryController.java b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentChartSummaryController.java
new file mode 100644
index 0000000..32f698e
--- /dev/null
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentChartSummaryController.java
@@ -0,0 +1,169 @@
+package io.v.nutz.zhgh.memberCost.controller;
+
+import cn.wizzer.framework.base.Result;
+import io.v.nutz.zhgh.memberCost.model.MemberPaymentProject;
+import io.v.nutz.zhgh.memberCost.service.MemberPaymentService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.Static;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+import org.nutz.mvc.annotation.Param;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @ClassName MemberPaymentChartSummaryController
+ * @Description 图表汇总
+ * @Author zhf
+ * @Date 2025/3/11 下午3:20
+ */
+@IocBean
+@Slf4j
+@Ok("json:full")
+@At("/platform/member/payment/chartSummary")
+public class MemberPaymentChartSummaryController {
+
+
+    @Inject
+    private MemberPaymentService memberPaymentService;
+
+
+    @At("")
+    @Ok("beetl:/platform/membercost/chartSummary/index.html")
+    @RequiresPermissions("member.payment.chartSummary")
+    public void index() {
+    }
+
+
+    @At
+    @RequiresPermissions("member.payment.chartSummary")
+    public Object getPayProjectChart(@Param(value = "startYear", required = false) Integer startYear,
+                                     @Param(value = "endYear", required = false) Integer endYear) {
+        Sql sql = Sqls.create("""
+                SELECT
+                	mpp.projectName,
+                	COUNT( mpi.id ) AS num
+                FROM
+                	member_payment_project mpp
+                	LEFT JOIN member_payment_info mpi ON mpi.paymentProjectId = mpp.id
+                	AND mpi.isPayment = 1
+                WHERE
+                	YEAR ( mpp.createTime ) BETWEEN @startYear
+                	AND @endYear
+                GROUP BY
+                	mpp.id
+                """).setParam("startYear", startYear).setParam("endYear", endYear);
+        return Result.success(memberPaymentService.listMap(sql));
+    }
+
+    @At
+    @RequiresPermissions("member.payment.chartSummary")
+    public Object getRefundProjectChart(@Param(value = "startYear", required = false) Integer startYear,
+                                        @Param(value = "endYear", required = false) Integer endYear) {
+        Sql sql = Sqls.create("""
+                SELECT
+                	mpp.projectName,
+                	COUNT( pt.id ) AS num
+                FROM
+                	member_payment_project mpp
+                	LEFT JOIN member_payment_info mpi ON mpi.paymentProjectId = mpp.id
+                	LEFT JOIN payment_transaction pt ON pt.memberPaymentInfoId = mpi.id
+                	AND pt.isRefund = 1
+                WHERE
+                	YEAR ( mpp.createTime ) BETWEEN @startYear
+                	AND @endYear
+                GROUP BY
+                	mpp.id
+                """).setParam("startYear", startYear).setParam("endYear", endYear);
+        return Result.success(memberPaymentService.listMap(sql));
+    }
+
+    @At
+    @RequiresPermissions("member.payment.chartSummary")
+    public Object getPayMoneyChart(@Param(value = "startYear", required = false) Integer startYear,
+                                   @Param(value = "endYear", required = false) Integer endYear) {
+        Sql sql = Sqls.create("""
+                SELECT
+                	mpp.projectName,
+                	SUM( pt.tradingAmount * 0.01 ) AS money
+                FROM
+                	member_payment_project mpp
+                	LEFT JOIN member_payment_info mpi ON mpi.paymentProjectId = mpp.id
+                	AND mpi.isPayment = 1
+                	LEFT JOIN payment_transaction pt ON pt.memberPaymentInfoId = mpi.id
+                	AND pt.isRefund = 0
+                	AND pt.tradingState = 'PAY_SUCCESS'
+                WHERE
+                	YEAR ( mpp.createTime ) BETWEEN @startYear
+                	AND @endYear
+                GROUP BY
+                	mpp.id
+                """).setParam("startYear", startYear).setParam("endYear", endYear);
+        return Result.success(memberPaymentService.listMap(sql));
+    }
+
+
+    @At
+    @RequiresPermissions("member.payment.chartSummary")
+    public Object getNumData(@Param(value = "startYear", required = false) Integer startYear,
+                             @Param(value = "endYear", required = false) Integer endYear) {
+
+        Sql sql = Sqls.create("""
+                SELECT
+                	pt.tradingAmount * 0.01 AS money,
+                	pt.isRefund
+                FROM
+                	member_payment_project mpp
+                	LEFT JOIN member_payment_info mpi ON mpi.paymentProjectId = mpp.id
+                	AND mpi.isPayment = 1
+                	LEFT JOIN payment_transaction pt ON pt.memberPaymentInfoId = mpi.id
+                	AND pt.tradingState = 'PAY_SUCCESS'
+                 WHERE
+                	YEAR ( mpp.createTime ) BETWEEN @startYear
+                	AND @endYear
+                """).setParam("startYear", startYear).setParam("endYear", endYear);
+        List<NutMap> map = memberPaymentService.listMap(sql);
+
+        double payMoney = map.stream().filter(v -> !v.getBoolean("isRefund")).mapToDouble(v -> v.getDouble("money")).sum();
+        double refundMoney = map.stream().filter(v -> v.getBoolean("isRefund")).mapToDouble(v -> v.getDouble("money")).sum();
+        int refundSize = map.stream().filter(v -> v.getBoolean("isRefund")).collect(Collectors.toList()).size();
+        int paySize = map.stream().filter(v -> !v.getBoolean("isRefund")).collect(Collectors.toList()).size();
+        NutMap data = new NutMap();
+        data.put("payMoney", payMoney);
+        data.put("refundMoney", refundMoney);
+        data.put("paySize", paySize);
+        data.put("refundSize", refundSize);
+        return Result.success(data);
+    }
+
+
+    @At
+    @RequiresPermissions("member.payment.chartSummary")
+    public Object allUnionMoney(String paymentProjectId) {
+        Sql sql = Sqls.create("""
+                SELECT
+                	un.unionname,
+                	COALESCE ( SUM( pt.tradingAmount * 0.01 ), 0 ) AS money
+                FROM
+                	sys_union un
+                	LEFT JOIN payment_transaction pt ON pt.unionId = un.id
+                	AND pt.tradingState = 'PAY_SUCCESS'
+                	AND pt.isRefund = 0
+                	LEFT JOIN member_payment_info mpi ON mpi.id = pt.memberPaymentInfoId
+                    AND mpi.paymentProjectId=@paymentProjectId
+                GROUP BY
+                	un.id
+                ORDER BY
+                	un.unioncode
+                """).setParam("paymentProjectId", paymentProjectId);
+        return Result.success(memberPaymentService.listMap(sql));
+    }
+}
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentMineController.java b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentMineController.java
index 4ba5373..3626de7 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentMineController.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentMineController.java
@@ -53,13 +53,11 @@ public class MemberPaymentMineController {
     public Object pageData(PageForm pageForm, Integer year, Integer isPay) {
         Sql sql = Sqls.create("""
                 SELECT
-                	
                 	mpp.`year`,
                 	mpp.projectName,
                 	mpp.startTime,
                 	mpp.endTime,
                 	mpi.id,
-                	mpi.payId,
                 	mpi.isPayment,
                 	mpi.payPersonnel,
                 	mpi.personType,
@@ -88,10 +86,11 @@ public class MemberPaymentMineController {
     @At
     @RepeatSubmit
     @RequiresPermissions("member.payment.mine")
-    public Object pcOrderPay(Integer paymentMoney) {
+    public Object pcOrderPay(Integer paymentMoney, String paymentInfoId) {
         WxPayNeedParamVo paramVo = new WxPayNeedParamVo();
         paramVo.setDescription(ShiroUtil.getPlatformUsername() + "会费缴纳支付");
         paramVo.setAttach("");
+        paramVo.setMemberPaymentInfoId(paymentInfoId);
         paramVo.setAmount(new Amount().setTotal(paymentMoney));
         return wxPayCommonService.nativePay(paramVo);
     }
diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentRefundController.java b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentRefundController.java
new file mode 100644
index 0000000..8560d0d
--- /dev/null
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentRefundController.java
@@ -0,0 +1,114 @@
+package io.v.nutz.zhgh.memberCost.controller;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONObject;
+import io.v.nutz.base.annontation.RepeatSubmit;
+import io.v.nutz.base.annontation.Valid;
+import io.v.nutz.base.annontation.ViReturn;
+import io.v.nutz.base.payment.enums.TradingStateEnum;
+import io.v.nutz.base.payment.enums.WxPayResultCode;
+import io.v.nutz.base.payment.model.PaymentTransaction;
+import io.v.nutz.base.payment.wxpay.service.WxPayCommonService;
+import io.v.nutz.base.query.PageForm;
+import io.v.nutz.base.result.Result;
+import io.v.nutz.zhgh.memberCost.service.MemberPaymentService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.sql.Sql;
+import org.nutz.dao.util.cri.SqlExpressionGroup;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.json.Json;
+import org.nutz.lang.util.NutMap;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+import java.io.Reader;
+
+/**
+ * @ClassName MemberPaymentRefundController
+ * @Description 退款
+ * @Author zhf
+ * @Date 2025/3/11 上午8:51
+ */
+@Slf4j
+@IocBean
+@Ok("json:full")
+@At("/platform/member/payment/refund")
+public class MemberPaymentRefundController {
+
+    @Inject
+    private WxPayCommonService wxPayCommonService;
+    @Inject
+    private MemberPaymentService memberPaymentService;
+
+    @At("")
+    @Ok("beetl:/platform/membercost/refund/index.html")
+    @RequiresPermissions("member.payment.refund")
+    public void index() {
+    }
+
+    @At
+    @ViReturn
+    @RequiresPermissions("member.payment.refund")
+    public Object pageData(PageForm pageForm, String paymentProjectId, String transactionId, Integer isRefund) {
+        Sql sql = Sqls.create("""
+                SELECT
+                	mpp.`year`,
+                	mpp.projectName,
+                	mpp.startTime,
+                	mpp.endTime,
+                	mpi.isPayment,
+                	mpi.payPersonnel,
+                	mpi.personType,
+                	mpi.paymentMonth,
+                	mpi.paymentTime,
+                	pt.id,
+                	pt.outTradeNo,
+                	pt.transactionId,
+                	pt.userName,
+                	pt.loginName,
+                	pt.unitName,
+                	pt.unionName,
+                	pt.tradingAmount,
+                	pt.isRefund,
+                	prr.createdAt AS refundTime
+                FROM
+                	payment_transaction pt
+                	LEFT JOIN `member_payment_info` mpi ON pt.memberPaymentInfoId = mpi.id
+                	LEFT JOIN `payment_refund_record` prr ON pt.memberPaymentInfoId = mpi.id
+                	LEFT JOIN member_payment_project mpp ON mpi.paymentProjectId = mpp.id
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.andEX("mpi.paymentProjectId", "=", paymentProjectId);
+        cnd.andEX("pt.tradingState", "=", TradingStateEnum.PAY_SUCCESS);
+        cnd.and(Cnd.likeEX("pt.transactionId", transactionId));
+        if (isRefund != 3) {
+            cnd.andEX("pt.isRefund", "=", isRefund);
+        }
+        if (ObjectUtil.isNotEmpty(pageForm.getSearchKeyword())) {
+            SqlExpressionGroup group = new SqlExpressionGroup();
+            group.orLike("pt.userName", pageForm.getSearchKeyword());
+            group.orLike("pt.loginName", pageForm.getSearchKeyword());
+            cnd.and(group);
+        }
+        cnd.groupBy("pt.id");
+        sql.setCondition(cnd);
+        return memberPaymentService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
+    }
+
+
+    @At
+    @RepeatSubmit
+    @RequiresPermissions("member.payment.refund")
+    public Object doRefund(@Valid String id) {
+        PaymentTransaction transaction = memberPaymentService.dao().fetch(PaymentTransaction.class, id);
+        Result refund = wxPayCommonService.refund(transaction.getTransactionId(), transaction.getOutTradeNo());
+        return refund;
+    }
+
+
+}
diff --git a/src/main/resources/views/platform/membercost/chartSummary/index.html b/src/main/resources/views/platform/membercost/chartSummary/index.html
new file mode 100644
index 0000000..5c093e9
--- /dev/null
+++ b/src/main/resources/views/platform/membercost/chartSummary/index.html
@@ -0,0 +1,382 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+
+<style>
+    .top_block {
+        width: 100%;
+        padding: 20px 80px;
+        border-bottom: 10px solid rgb(240, 240, 240);
+    }
+
+    .top_title {
+        font-size: 14px;
+        color: #808492;
+        height: 30px;
+        line-height: 30px;
+        margin-bottom: 5px;
+    }
+
+    .top_num {
+        font-size: 26px;
+    }
+
+    .cut-off-line {
+        width: 1px;
+        height: 70%;
+        position: absolute;
+        right: 0;
+        top: 0;
+        bottom: 0;
+        margin: auto;
+        background-color: rgb(230, 230, 230);
+    }
+
+    .chartTitle {
+        font-size: 14px;
+        color: #808492;
+        margin-bottom: 20px;
+    }
+</style>
+
+<div id="app" v-cloak>
+
+    <div class="p10">
+        <el-card shadow="never">
+            <div class="top_block" v-loading="top_block_loading">
+                <el-row gutter="60">
+                    <div style="position: absolute; top: -35px; right: -8px">
+                        <el-date-picker
+                            class="year"
+                            style="width: 120px"
+                            size="mini"
+                            v-model="numForm.startYear"
+                            type="year"
+                            :clearable="false"
+                            value-format="yyyy"
+                            @change="if(numForm.endYear){getNumData();}"
+                            placeholder="选择年"
+                        ></el-date-picker>
+                        -
+                        <el-date-picker
+                            class="year"
+                            style="width: 120px"
+                            size="mini"
+                            v-model="numForm.endYear"
+                            type="year"
+                            :clearable="false"
+                            value-format="yyyy"
+                            @change="if(numForm.startYear){getNumData();}"
+                            placeholder="选择年"
+                        ></el-date-picker>
+                    </div>
+                    <el-col :span="6" style="position: relative">
+                        <div class="top_title">总缴费金额</div>
+                        <div class="top_num">{{numData.payMoney?numData.payMoney:'0'}}</div>
+                        <div class="cut-off-line"></div>
+                    </el-col>
+                    <el-col :span="6" style="position: relative">
+                        <div class="top_title">退款金额</div>
+                        <div class="top_num">{{numData.refundMoney?numData.refundMoney:'0'}}</div>
+                        <div class="cut-off-line"></div>
+                    </el-col>
+                    <el-col :span="6" style="position: relative">
+                        <div class="top_title">退款订单数</div>
+                        <div class="top_num">{{numData.refundSize?numData.refundSize:'0'}}</div>
+                        <div class="cut-off-line"></div>
+                    </el-col>
+                    <el-col :span="6" style="position: relative">
+                        <div class="top_title">总缴费人数</div>
+                        <div class="top_num">{{numData.paySize?numData.paySize:'0'}}</div>
+                    </el-col>
+                </el-row>
+            </div>
+            <el-row style="padding: 30px 0; border-bottom: 10px solid rgb(240, 240, 240)">
+                <div style="position: absolute; top: 25px; right: 40px; z-index: 200">
+                    <el-date-picker
+                        class="year"
+                        style="width: 120px"
+                        size="mini"
+                        v-model="oneForm.startYear"
+                        type="year"
+                        :clearable="false"
+                        value-format="yyyy"
+                        @change="if(oneForm.endYear){getPayProjectChart();getPayMoneyChart();}"
+                        placeholder="选择年"
+                    ></el-date-picker>
+                    -
+                    <el-date-picker
+                        class="year"
+                        style="width: 120px"
+                        size="mini"
+                        v-model="oneForm.endYear"
+                        type="year"
+                        :clearable="false"
+                        value-format="yyyy"
+                        @change="if(oneForm.startYear){getPayProjectChart();getPayMoneyChart();}"
+                        placeholder="选择年"
+                    ></el-date-picker>
+                </div>
+                <el-col :span="12" style="padding: 0 20px" v-loading="payProjectLoading">
+                    <div class="chartTitle">已缴人数</div>
+                    <div id="payProjectChart" style="width: 100%; height: 330px"></div>
+                </el-col>
+                <el-col :span="12" style="padding: 0 20px" v-loading="payMoneyLoading">
+                    <div class="chartTitle">已缴金额</div>
+                    <div id="payMoneyChart" style="width: 100%; height: 330px"></div>
+                </el-col>
+            </el-row>
+
+
+            <el-row style="padding: 30px 0; border-bottom: 10px solid rgb(240, 240, 240)">
+                <div style="position: absolute; top: 25px; right: 250px; z-index: 999">
+                    <el-date-picker
+                        class="year"
+                        style="width: 120px"
+                        size="mini"
+                        v-model="unionForm.year"
+                        type="year"
+                        :clearable="false"
+                        value-format="yyyy"
+                        @change="getProjectList"
+                        placeholder="选择年"
+                    ></el-date-picker>
+                </div>
+                <div style="position: absolute; top: 25px; right: 40px; z-index: 999">
+                    <el-select
+                        placeholder="请选择项目"
+                        v-model="unionForm.paymentProjectId"
+                        style="width: 100%"
+                        size="mini"
+                        :clearable="false"
+                        @change="doSearch"
+                        @clear="doSearch"
+                        filterable="true"
+                    >
+                        <el-option v-for="item in paymentProjectList"
+                                   :label="item.projectName" :value="item.id"></el-option>
+                    </el-select>
+                </div>
+                <el-col :span="24" style="padding: 0 20px" v-loading="all_union_loading">
+                    <div class="chartTitle" style="margin-bottom: 50px">
+                    </div>
+                    <div id="allUnionChart" style="width: 100%; height: 300px"></div>
+                </el-col>
+            </el-row>
+        </el-card>
+    </div>
+
+
+</div>
+
+<script>
+    new Vue({
+        el: "#app",
+        mixins: [initTableMixins],
+        data() {
+            return {
+                oneForm: {
+                    startYear: new Date().getFullYear() - 2 + "",
+                    endYear: new Date().getFullYear() + ""
+                },
+                twoForm: {
+                    startYear: new Date().getFullYear() - 2 + "",
+                    endYear: new Date().getFullYear() + ""
+                },
+                numForm: {
+                    startYear: new Date().getFullYear() - 2 + "",
+                    endYear: new Date().getFullYear() + ""
+                },
+                payProjectLoading: false,
+                refundProjectLoading: false,
+                payMoneyLoading: false,
+                top_block_loading: false,
+                numData: {},
+                all_union_loading: false,
+                unionForm: {
+                    year: new Date().getFullYear() + ""
+                },
+                paymentProjectList:[],
+            }
+        },
+        methods: {
+            async getNumData() {
+                this.top_block_loading = true
+                const resp = await $.post("/platform/member/payment/chartSummary/getNumData", this.numForm)
+                if (resp.code === 0) {
+                    this.numData = resp.data
+                }
+                this.top_block_loading = false
+            },
+            async getPayProjectChart() {
+                this.payProjectLoading = true
+                const resp = await $.post("/platform/member/payment/chartSummary/getPayProjectChart", this.oneForm)
+                if (resp.code === 0) {
+                    let { data } = resp
+
+                    document.getElementById("payProjectChart").innerHTML = ""
+                    const config = {
+                        xField: "projectName",
+                        yField: "num",
+                        label: {
+                            position: "middle", // 'top', 'bottom', 'middle',
+                            style: {
+                                fill: "#FFFFFF",
+                                opacity: 0.6
+                            }
+                        },
+                        xAxis: {
+                            label: {
+                                autoHide: true,
+                                autoRotate: false
+                            }
+                        },
+                        color: ({ type }) => {
+                            return "#63DAAB"
+                        },
+                        meta: {
+                            projectName: {
+                                alias: "项目"
+                            },
+                            num: {
+                                alias: "缴费人数"
+                            }
+                        }
+                    }
+
+                    const plot = new G2Plot.Column(document.getElementById("payProjectChart"), {
+                        data,
+                        ...config
+                    })
+                    plot.render()
+                }
+                this.payProjectLoading = false
+            },
+            async getPayMoneyChart() {
+                this.payMoneyLoading = true
+                const resp = await $.post("/platform/member/payment/chartSummary/getPayMoneyChart", this.oneForm)
+                if (resp.code === 0) {
+                    let { data } = resp
+                    document.getElementById("payMoneyChart").innerHTML = ""
+                    const config = {
+                        xField: "projectName",
+                        yField: "money",
+                        label: {
+                            position: "middle", // 'top', 'bottom', 'middle',
+                            style: {
+                                fill: "#FFFFFF",
+                                opacity: 0.6
+                            }
+                        },
+                        xAxis: {
+                            label: {
+                                autoHide: true,
+                                autoRotate: false
+                            }
+                        },
+                        color: ({ type }) => {
+                            return "#63DAAB"
+                        },
+                        meta: {
+                            projectName: {
+                                alias: "项目"
+                            },
+                            money: {
+                                alias: "金额（元）"
+                            }
+                        }
+                    }
+                    const plot = new G2Plot.Column(document.getElementById("payMoneyChart"), {
+                        data,
+                        ...config
+                    })
+                    plot.render()
+                }
+                this.payMoneyLoading = false
+            },
+            async allUnionMoney() {
+                this.all_union_loading = true
+                const resp = await $.get("/platform/member/payment/chartSummary/allUnionMoney", {
+                    paymentProjectId: this.unionForm.paymentProjectId
+                })
+                if (resp.code === 0) {
+                    let { data } = resp
+                    document.getElementById("allUnionChart").innerHTML = ""
+                    const config = {
+                        isStack: true,
+                        legend: {
+                            position: "top-right",
+                            flipPage: false
+                        },
+                        autoFit: true,
+                        title: {
+                            visible: true,
+                            text: "年工会经费及活动详情"
+                        },
+                        description: {
+                            visible: true,
+                            text: "单位（元）"
+                        },
+                        xField: "unionname",
+                        yField: "money",
+                        stackField: "type",
+                        color: ["#5B8FF9", "#5AD8A6"],
+                        xAxis: {
+                            label: {
+                                formatter: (v) => {
+                                    if (data.length > 30 && v.length > 3) {
+                                        return v.substr(0, 2) + "..."
+                                    } else if (data.length > 20 && v.length > 4) {
+                                        return v.substr(0, 3) + "..."
+                                    } else if (data.length > 10 && v.length > 6) {
+                                        return v.substr(0, 5) + "..."
+                                    }
+                                    return v
+                                }
+                            }
+                        },
+                        yAxis: {},
+                        meta: {
+                            unionname: {
+                                alias: "工会"
+                            },
+                            money: {
+                                alias: "金额"
+                            }
+                        },
+                        connectedArea: {
+                            visible: true,
+                            triggerOn: false
+                        }
+                    }
+                    const plot = new G2Plot.Column(document.getElementById("allUnionChart"), {
+                        data,
+                        ...config
+                    })
+                    plot.render()
+                }
+                this.all_union_loading = false
+            },
+            async getProjectList() {
+                const resp = await $.get("/platform/member/payment/project/getAllProject", { year: this.unionForm.year })
+                if (resp.code === 0) {
+                    this.paymentProjectList = resp.data
+                    this.$set(this.unionForm, "paymentProjectId", this.paymentProjectList ? this.paymentProjectList[0].id : null)
+                    await this.allUnionMoney()
+                }
+            }
+        },
+        async created() {
+            await this.getPayProjectChart()
+            await this.getPayMoneyChart()
+            await this.getNumData()
+            await this.getProjectList()
+
+        }
+    })
+</script>
+
+
+<!--#
+}
+#-->
diff --git a/src/main/resources/views/platform/membercost/mine/index.html b/src/main/resources/views/platform/membercost/mine/index.html
index 6e97877..23d7cf5 100644
--- a/src/main/resources/views/platform/membercost/mine/index.html
+++ b/src/main/resources/views/platform/membercost/mine/index.html
@@ -16,7 +16,7 @@ layout("/layouts/platform.html"){
                         <div class="search-item-option">
                             <el-date-picker
                                 :clearable="false"
-                                @change="doSearch();getProjectList()"
+                                @change="doSearch"
                                 placeholder="选择年度"
                                 type="year"
                                 style="width: 100%"
@@ -27,7 +27,7 @@ layout("/layouts/platform.html"){
                     </div>
                 </div>
             </el-card>
-            <el-card shadow="never">
+            <el-card shadow="never" class="mt10">
                 <table-tool label="缴费列表" :app="this">
                     <template #func>
                         <el-radio-group @change="doSearch" class="mr10" size="small"
@@ -132,7 +132,7 @@ layout("/layouts/platform.html"){
 
             <div v-if="payActive===1" class="mt25">
                 <el-form-item label="商品订单">
-                    {{formData.tradingOrderNo}}
+                    {{formData.transactionId}}
                 </el-form-item>
                 <el-form-item label="支付金额">
                     <div style="color: #2cd000;font-size: 25px">¥ {{formData.paymentMoney}}</div>
@@ -178,7 +178,7 @@ layout("/layouts/platform.html"){
                         </div>
                     </div>
                     <el-form-item label="商品订单">
-                        {{formData.tradingOrderNo}}
+                        {{formData.transactionId}}
                     </el-form-item>
                     <el-form-item label="支付金额">
                         <div style="color: #2cd000;font-size: 25px">¥ {{formData.paymentMoney}}
@@ -198,7 +198,7 @@ layout("/layouts/platform.html"){
 
 </div>
 <script>
-    const vue = new Vue({
+    new Vue({
         el: "#app",
         mixins: [initTableMixins],
         data() {
@@ -246,7 +246,10 @@ layout("/layouts/platform.html"){
                     this.qrcodeLoading = true
                     const paymentMoney = Math.floor(this.formData.paymentMoney * 100)
                     this.payActive = this.payActive + 1
-                    const resp = await $.post("/platform/member/payment/mine/pcOrderPay", { paymentMoney })
+                    const resp = await $.post("/platform/member/payment/mine/pcOrderPay", {
+                        paymentMoney: paymentMoney,
+                        paymentInfoId: this.formData.paymentInfoId
+                    })
                     if (resp.code === 0) {
                         const data = JSON.parse(resp.data)
                         this.$nextTick(() => {
@@ -259,7 +262,7 @@ layout("/layouts/platform.html"){
                                 correctLevel: 3
                             })
                         })
-                        this.formData.tradingOrderNo = data.tradingOrderNo
+                        this.formData.transactionId = data.transactionId
                         await this.getIsPay()
                     }
                     this.qrcodeLoading = false
@@ -301,12 +304,8 @@ layout("/layouts/platform.html"){
                     this.$set(this.formData, "payModeValueList", payStandard.payModeValueList)
                     this.$set(this.formData, "paymentMoney", 0)
                 }
-
-
                 this.payVisible = true
             },
-            doSubmit() {
-            }
         },
         created() {
             this.pageData()
diff --git a/src/main/resources/views/platform/membercost/refund/index.html b/src/main/resources/views/platform/membercost/refund/index.html
new file mode 100644
index 0000000..2c77296
--- /dev/null
+++ b/src/main/resources/views/platform/membercost/refund/index.html
@@ -0,0 +1,210 @@
+<!--#
+layout("/layouts/platform.html"){
+#-->
+<style>
+
+</style>
+<div id="app" v-cloak>
+    <guava ref="guava">
+        <template>
+            <el-card shadow="never">
+                <div class="search">
+                    <div class="search-item">
+                        <div class="search-item-label">年度：</div>
+                        <div class="search-item-option">
+                            <el-date-picker
+                                :clearable="false"
+                                @change="doSearch();getProjectList()"
+                                placeholder="选择年度"
+                                type="year"
+                                style="width: 100%"
+                                v-model="pageForm.year"
+                                value-format="yyyy"
+                            ></el-date-picker>
+                        </div>
+                    </div>
+
+                    <div class="search-item">
+                        <div class="search-item-label">缴费项目：</div>
+                        <div class="search-item-option">
+                            <el-select
+                                placeholder="请选择项目"
+                                v-model="pageForm.paymentProjectId"
+                                style="width: 100%"
+                                :clearable="false"
+                                @change="doSearch"
+                                @clear="doSearch"
+                                filterable="true"
+                            >
+                                <el-option v-for="item in paymentProjectList"
+                                           :label="item.projectName" :value="item.id"></el-option>
+                            </el-select>
+                        </div>
+                    </div>
+
+                    <div class="search-item">
+                        <div class="search-item-label">工号/姓名：</div>
+                        <div class="search-item-option">
+                            <el-input placeholder="请输入工号/姓名"
+                                      v-model="pageForm.searchKeyword" clearable>
+                                <template slot="prepend">姓名/工号</template>
+                            </el-input>
+                        </div>
+                    </div>
+
+                    <div class="search-item">
+                        <div class="search-item-label">交易单号：</div>
+                        <div class="search-item-option">
+                            <el-input placeholder="请输入交易单号"
+                                      v-model="pageForm.transactionId" clearable>
+                            </el-input>
+                        </div>
+                    </div>
+
+                    <div class="search-item">
+                        <div class="search-item-label">
+                            <el-button @click="doSearch" type="primary">查询</el-button>
+                        </div>
+                    </div>
+                </div>
+            </el-card>
+            <el-card shadow="never" class="mt10">
+                <table-tool label="缴费列表" :app="this">
+                    <template #func>
+                        <el-radio-group @change="doSearch" class="mr10" size="small"
+                                        v-model="pageForm.isRefund">
+                            <el-radio-button :label="3">全部</el-radio-button>
+                            <el-radio-button :label="0">未退款</el-radio-button>
+                            <el-radio-button :label="1">已退款</el-radio-button>
+                        </el-radio-group>
+                    </template>
+                </table-tool>
+                <el-table
+                    :data="tableData"
+                    :size="tableSize"
+                    @sort-change="pageOrder"
+                    class="vi-table"
+                    ref="table"
+                    row-key="id"
+                    style="width: 100%"
+                    v-loading="tableLoading"
+                >
+                    <el-table-column
+                        :index="indexMethod"
+                        align="center"
+                        header-align="center"
+                        label="序号"
+                        type="index"
+                        width="80px"
+                    ></el-table-column>
+                    <el-table-column
+                        :label="column.label"
+                        :prop="column.prop"
+                        :sortable="column.sortable"
+                        align="center"
+                        header-align="center"
+                        show-overflow-tooltip
+                        v-for="column in tableColumns"
+                    >
+                        <template scope="{row}" v-if="column.prop==='isRefund'">
+                            <span v-if="row.isRefund" style="color: red">已全额退款</span>
+                            <span v-else style="color: #2cd000">支付成功</span>
+                        </template>
+                        <template scope="{row}" v-else-if="column.prop==='tradingAmount'">
+                            {{row.tradingAmount*0.01}}
+                        </template>
+                        <template scope="{row}" v-else-if="column.prop==='refundTime'">
+                            <span v-if="!row.refundTime"></span>
+                            <span
+                                v-else>{{moment(row.refundTime).format("YYYY-MM-DD HH:mm:ss")}}</span>
+
+                        </template>
+                    </el-table-column>
+                    <el-table-column align="center" header-align="center" label="操作"
+                                     prop="userOnline" width="200px">
+                        <template scope="{row}">
+                            <el-button :disabled="row.isRefund" @click="doRefund(row)"
+                                       size="mini" type="danger" :loading="submitLoading">退款
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <!--#include("/layouts/pagination.html"){}#-->
+            </el-card>
+
+
+        </template>
+    </guava>
+</div>
+<script>
+    new Vue({
+        el: "#app",
+        mixins: [initTableMixins],
+        data() {
+            return {
+                paymentProjectList: [],
+                pageForm: {
+                    isRefund: 3,
+                    year: moment().format("YYYY")
+                },
+                tableColumns: [
+                    { prop: "loginName", label: "工号", sortable: true },
+                    { prop: "userName", label: "姓名", sortable: true },
+                    { prop: "unitName", label: "单位", sortable: true },
+                    { prop: "unionName", label: "工会", sortable: true },
+                    { prop: "projectName", label: "项目名称", sortable: true },
+                    { prop: "tradingAmount", label: "缴费金额（元）", sortable: true },
+                    { prop: "paymentTime", label: "支付时间", sortable: true },
+                    { prop: "transactionId", label: "交易单号", sortable: true },
+                    { prop: "isRefund", label: "是否退款", sortable: true },
+                    { prop: "refundTime", label: "退款到账时间", sortable: true }
+
+                ]
+            }
+        },
+        methods: {
+            doRefund(row) {
+                this.$confirm("您确定要退款吗？退款金额将原路退还，退款后将不能撤回！", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(async () => {
+                    this.submitLoading = true
+                    const resp = await $.post("/platform/member/payment/refund/doRefund", {
+                        id: row.id
+                    })
+                    this.submitLoading = false
+                    if (resp.code === 0) {
+                        this.doSearch()
+                        this.$message({
+                            type: "success",
+                            message: resp.data
+                        })
+                    } else {
+                        this.$message({
+                            type: "error",
+                            message: resp.data
+                        })
+                    }
+                })
+            },
+            async getProjectList() {
+                const resp = await $.get("/platform/member/payment/project/getAllProject", { year: this.pageForm.year })
+                if (resp.code === 0) {
+                    this.paymentProjectList = resp.data
+                    this.$set(this.pageForm, "paymentProjectId", this.paymentProjectList ? this.paymentProjectList[0].id : null)
+                }
+            }
+        },
+        async created() {
+            await this.getProjectList()
+            this.pageData()
+        }
+    })
+</script>
+<!--#
+}
+#-->
+
+
+

From 0c644ac349b533b645764bf03d746db570ca1b40 Mon Sep 17 00:00:00 2001
From: zhouhefeng <zhouhefeng915@163.com>
Date: Tue, 11 Mar 2025 19:40:34 +0800
Subject: [PATCH 17/17] commit

---
 .../MemberPaymentChartSummaryController.java  | 27 +++++++++++++------
 .../membercost/chartSummary/index.html        | 14 +++-------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentChartSummaryController.java b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentChartSummaryController.java
index 32f698e..51ef648 100644
--- a/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentChartSummaryController.java
+++ b/src/main/java/io/v/nutz/zhgh/memberCost/controller/MemberPaymentChartSummaryController.java
@@ -151,18 +151,29 @@ public class MemberPaymentChartSummaryController {
         Sql sql = Sqls.create("""
                 SELECT
                 	un.unionname,
-                	COALESCE ( SUM( pt.tradingAmount * 0.01 ), 0 ) AS money
+                	COALESCE ( SUM( subquery.money ), 0 ) AS money
                 FROM
                 	sys_union un
-                	LEFT JOIN payment_transaction pt ON pt.unionId = un.id
-                	AND pt.tradingState = 'PAY_SUCCESS'
-                	AND pt.isRefund = 0
-                	LEFT JOIN member_payment_info mpi ON mpi.id = pt.memberPaymentInfoId
-                    AND mpi.paymentProjectId=@paymentProjectId
+                	LEFT JOIN (
+                	SELECT
+                		pt.unionId,
+                		SUM( pt.tradingAmount * 0.01 ) AS money
+                	FROM
+                		payment_transaction pt
+                		INNER JOIN member_payment_info mpi ON mpi.id = pt.memberPaymentInfoId
+                		AND mpi.paymentProjectId = @paymentProjectId
+                	WHERE
+                		pt.tradingState = 'PAY_SUCCESS'
+                		AND pt.isRefund = 0
+                	GROUP BY
+                		pt.unionId
+                	) subquery ON subquery.unionId = un.id
                 GROUP BY
-                	un.id
-                ORDER BY
+                	un.id,
+                	un.unionname,
                 	un.unioncode
+                ORDER BY
+                	un.unioncode;
                 """).setParam("paymentProjectId", paymentProjectId);
         return Result.success(memberPaymentService.listMap(sql));
     }
diff --git a/src/main/resources/views/platform/membercost/chartSummary/index.html b/src/main/resources/views/platform/membercost/chartSummary/index.html
index 5c093e9..16f4060 100644
--- a/src/main/resources/views/platform/membercost/chartSummary/index.html
+++ b/src/main/resources/views/platform/membercost/chartSummary/index.html
@@ -170,7 +170,7 @@ layout("/layouts/platform.html"){
 </div>
 
 <script>
-    new Vue({
+    const vue = new Vue({
         el: "#app",
         mixins: [initTableMixins],
         data() {
@@ -196,7 +196,7 @@ layout("/layouts/platform.html"){
                 unionForm: {
                     year: new Date().getFullYear() + ""
                 },
-                paymentProjectList:[],
+                paymentProjectList: []
             }
         },
         methods: {
@@ -231,9 +231,6 @@ layout("/layouts/platform.html"){
                                 autoRotate: false
                             }
                         },
-                        color: ({ type }) => {
-                            return "#63DAAB"
-                        },
                         meta: {
                             projectName: {
                                 alias: "项目"
@@ -274,9 +271,6 @@ layout("/layouts/platform.html"){
                                 autoRotate: false
                             }
                         },
-                        color: ({ type }) => {
-                            return "#63DAAB"
-                        },
                         meta: {
                             projectName: {
                                 alias: "项目"
@@ -311,7 +305,7 @@ layout("/layouts/platform.html"){
                         autoFit: true,
                         title: {
                             visible: true,
-                            text: "年工会经费及活动详情"
+                            text: ""
                         },
                         description: {
                             visible: true,
@@ -361,7 +355,7 @@ layout("/layouts/platform.html"){
                 const resp = await $.get("/platform/member/payment/project/getAllProject", { year: this.unionForm.year })
                 if (resp.code === 0) {
                     this.paymentProjectList = resp.data
-                    this.$set(this.unionForm, "paymentProjectId", this.paymentProjectList ? this.paymentProjectList[0].id : null)
+                    this.$set(this.unionForm, "paymentProjectId", (this.paymentProjectList && this.paymentProjectList.length > 0) ? this.paymentProjectList[0].id : null)
                     await this.allUnionMoney()
                 }
             }