修复代码提交最新版本：2025-0319

.idea/compiler.xml

@@ -19,16 +19,16 @@
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
-      <module name="base-api" options="" />
+      <module name="base-api" options="-parameters" />
       <module name="base-core" options="-parameters" />
       <module name="base-tools" options="-parameters" />
       <module name="jeecg-system-cloud-api" options="-parameters" />
       <module name="jeecg-system-local-api" options="-parameters" />
-      <module name="module-base" options="" />
+      <module name="module-base" options="-parameters" />
       <module name="module-common" options="-parameters" />
       <module name="module-pay" options="-parameters" />
       <module name="module-system" options="-parameters" />
-      <module name="popularize-admin" options="" />
+      <module name="popularize-admin" options="-parameters" />
     </option>
   </component>
 </project>

.idea/encodings.xml

@@ -3,10 +3,13 @@
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$/module-base/base-api/jeecg-system-cloud-api/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-base/base-api/jeecg-system-local-api/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/module-base/base-api/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-base/base-core/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-base/base-tools/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/module-base/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-common/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-pay/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-system/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
   </component>
 </project>

admin-pc/src/components/chart/IndexBar.vue

@@ -2,10 +2,10 @@
   <div :style="{ padding: '0 0 32px 32px' }">
     <h4 :style="{ marginBottom: '20px' }">{{ title }}</h4>
     <v-chart
-      height="254"
+      height="454"
       :data="datasource"
       :forceFit="true"
-      :padding="['auto', 'auto', '40', '50']">
+      :padding="['auto', 'auto', '50', '50']">
       <v-tooltip />
       <v-axis />
       <v-bar position="x*y"/>

admin-pc/src/components/chart/MiniArea.vue

@@ -3,7 +3,7 @@
     <div class="chart-wrapper" :style="{ height: 46 }">
       <v-chart :force-fit="true" :height="height" :data="data" :scale="scale" :padding="[36, 0, 18, 0]">
         <v-tooltip/>
-        <v-smooth-area position="x*y"/>
+         <v-smooth-area position="x*y"/>
       </v-chart>
     </div>
   </div>

admin-pc/src/views/dashboard/Analysis.vue

@@ -1,64 +1,97 @@
 <template>
   <div class="page-header-index-wide">
+    
     <a-row :gutter="24">
       <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="受理量" :total="cardCount.sll | NumberFormat">
-          <a-tooltip title="指标说明" slot="action">
+        <chart-card :loading="loading" title="注册用户" :total="cardCount.sll | NumberFormat">
+          <a-tooltip title="注册用户" slot="action">
             <a-icon type="info-circle-o" />
           </a-tooltip>
           <div>
-            <mini-area :data-source="chartData.sll" />
+            <mini-area :data-source="chartData.sll" v-if="chartData.sll.length"/>
           </div>
-          <template slot="footer">今日受理量：<span>{{ todaySll }}</span></template>
+          <template slot="footer">今日注册用户：<span>{{ todaySll }}</span></template>
         </chart-card>
       </a-col>
+
+
+
+
       <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="办结量" :total="cardCount.bjl | NumberFormat">
-          <a-tooltip title="指标说明" slot="action">
+        <chart-card :loading="loading" title="平台营业额" :total="cardCount.money | NumberFormat">
+          <a-tooltip title="平台营业额" slot="action">
             <a-icon type="info-circle-o" />
           </a-tooltip>
           <div>
-            <mini-area :data-source="chartData.bjl"/>
+            <mini-area :data-source="chartData.moneyData" v-if="chartData.moneyData.length"/>
           </div>
-          <template slot="footer">今日办结量：<span>{{ todayBjl }}</span></template>
+          <template slot="footer">今日营业额：<span>{{ todayMoney }}</span></template>
         </chart-card>
       </a-col>
+
+
+
       <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="用户受理量" :total="cardCount.isll | NumberFormat">
-          <a-tooltip title="指标说明" slot="action">
+        <chart-card :loading="loading" title="报名用户数" :total="cardCount.open | NumberFormat">
+          <a-tooltip title="用户报名用户数" slot="action">
             <a-icon type="info-circle-o" />
           </a-tooltip>
           <div>
-            <mini-bar :datasource="chartData.isll" :height="50"/>
+            <mini-area :data-source="chartData.open" v-if="chartData.open.length"/>
           </div>
-          <template slot="footer">用户今日受理量：<span>{{ todayISll }}</span></template>
+          <template slot="footer">今日报名用户数：<span>{{ todayOpen }}</span></template>
         </chart-card>
       </a-col>
+
+
+
       <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="用户办结量" :total="cardCount.ibjl | NumberFormat">
-          <a-tooltip title="指标说明" slot="action">
+        <chart-card :loading="loading" title="主理人数量" :total="cardCount.adminUser | NumberFormat">
+          <a-tooltip title="今日主理人数量" slot="action">
             <a-icon type="info-circle-o" />
           </a-tooltip>
           <div>
-            <mini-bar :datasource="chartData.ibjl" :height="50"/>
+            <mini-area :data-source="chartData.adminUser" v-if="chartData.adminUser.length"/>
           </div>
-          <template slot="footer">用户今日办结量：<span>{{ todayIBjl }}</span></template>
+          <template slot="footer">今日主理人数量：<span>{{ todayAdminUser }}</span></template>
         </chart-card>
       </a-col>
+<!--      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">-->
+<!--        <chart-card :loading="loading" title="报名用户数" :total="cardCount.isll | NumberFormat">-->
+<!--          <a-tooltip title="报名用户数" slot="action">-->
+<!--            <a-icon type="info-circle-o" />-->
+<!--          </a-tooltip>-->
+<!--          <div>-->
+<!--            <mini-bar :datasource="chartData.isll" :height="50"/>-->
+<!--          </div>-->
+<!--          <template slot="footer">用户报名用户数：<span>{{ todayISll }}</span></template>-->
+<!--        </chart-card>-->
+<!--      </a-col>-->
+<!--      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">-->
+<!--        <chart-card :loading="loading" title="主理人数量" :total="cardCount.ibjl | NumberFormat">-->
+<!--          <a-tooltip title="主理人数量" slot="action">-->
+<!--            <a-icon type="info-circle-o" />-->
+<!--          </a-tooltip>-->
+<!--          <div>-->
+<!--            <mini-bar :datasource="chartData.ibjl" :height="50"/>-->
+<!--          </div>-->
+<!--          <template slot="footer">今日主理人数量：<span>{{ todayIBjl }}</span></template>-->
+<!--        </chart-card>-->
+<!--      </a-col>-->
     </a-row>
 
     <a-card :loading="loading" :bordered="false" :body-style="{padding: '0'}">
       <div class="salesCard">
         <a-tabs default-active-key="1" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
-          <div class="extra-wrapper" slot="tabBarExtraContent">
-            <div class="extra-item">
-              <a>今日</a>
-              <a>本周</a>
-              <a>本月</a>
-              <a>本年</a>
-            </div>
-            <a-range-picker :style="{width: '256px'}" />
-          </div>
+<!--          <div class="extra-wrapper" slot="tabBarExtraContent">-->
+<!--            <div class="extra-item">-->
+<!--              <a>今日</a>-->
+<!--              <a>本周</a>-->
+<!--              <a>本月</a>-->
+<!--              <a>本年</a>-->
+<!--            </div>-->
+<!--            <a-range-picker :style="{width: '256px'}" />-->
+<!--          </div>-->
 
 
 
@@ -68,10 +101,10 @@
 
 
 
-          <a-tab-pane loading="true" tab="用户数量" key="1">
+          <a-tab-pane loading="true" tab="注册用户" key="1">
             <a-row>
               <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
-                <index-bar title="用户数量统计" />
+                <index-bar title="新增注册用户数量" />
               </a-col>
             </a-row>
           </a-tab-pane>
@@ -89,10 +122,10 @@
 
 
 
-          <a-tab-pane loading="true" tab="营业额量" key="2">
+          <a-tab-pane loading="true" tab="平台营业额" key="2">
             <a-row>
               <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
-                <index-bar title="用户数量统计" />
+                <index-bar title="营业额总数" />
               </a-col>
             </a-row>
           </a-tab-pane>
@@ -101,18 +134,19 @@
 
 
 
-          <a-tab-pane loading="true" tab="主理人量" key="3">
+          <a-tab-pane loading="true" tab="报名用户数" key="3">
             <a-row>
               <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
-                <index-bar title="用户数量统计" />
+                <index-bar title="新增报名用户数" />
               </a-col>
             </a-row>
           </a-tab-pane>
 
-          <a-tab-pane loading="true" tab="主理人量" key="4">
+
+          <a-tab-pane loading="true" tab="主理人数量" key="4">
             <a-row>
               <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
-                <index-bar title="用户数量统计" />
+                <index-bar title="新增主理人数量" />
               </a-col>
             </a-row>
           </a-tab-pane>
@@ -136,7 +170,7 @@ import MiniArea from '@/components/chart/MiniArea'
 import IndexBar from '@/components/chart/IndexBar'
 import BarMultid from '@/components/chart/BarMultid'
 import DashChartDemo from '@/components/chart/DashChartDemo'
-
+import dayjs from 'dayjs'
 const jhjgData = [
   { type: '房管', '1月': 900, '2月': 1120, '3月': 1380, '4月': 1480, '5月': 1450, '6月': 1100, '7月':1300, '8月':900,'9月':1000 ,'10月':1200 ,'11月':600 ,'12月':900 },
   { type: '税务', '1月':1200, '2月': 1500, '3月': 1980, '4月': 2000, '5月': 1000, '6月': 600, '7月':900, '8月':1100,'9月':1300 ,'10月':2000 ,'11月':900 ,'12月':1100 },
@@ -243,6 +277,7 @@ const dataSource2=[
   {reBizCode:"A0011",type:"转移登记",acceptBy:'码楼',acceptDate:"2019-09-10",curNode:"部门审核",flowRate:7},
 ]
 
+import { getAction,putAction } from '@/api/manage'
 export default {
   name: "IndexBdc",
   components: {
@@ -258,23 +293,33 @@ export default {
   data() {
     return {
       loading: true,
+      analysisData : {},
       cardCount:{
         sll:100,
         bjl:87,
         isll:15,
-        ibjl:9
+        ibjl:9,
+        adminUser : 0,//主理人
+        money : 0,//营业额
+        open: 0,//报名
       },
 
-      todaySll:60,
+      todaySll:0,
       todayBjl:54,
       todayISll:13,
       todayIBjl:7,
+      todayAdminUser : 0,//主理人
+      todayMoney : 0,//营业额
+      todayOpen : 0,//报名
 
       chartData:{
         sll:[],
         bjl:[],
         isll:[],
-        ibjl:[]
+        ibjl:[],
+        adminUser : [],//主理人
+        moneyData : [],//营业额 money
+        open: [],//报名
       },
       jhjgFields,
       jhjgData,
@@ -330,6 +375,77 @@ export default {
     }
   },
   methods:{
+    loadData (){
+      try {
+        // 获取系统消息
+        getAction("/sys/annountCement/listByUser").then((res) => {
+          if (res.success) {
+            // this.analysisData = res.result
+            console.log("统计数据", res)
+            const beginDay = new Date().getTime()
+
+            // 主理人数量
+            this.todayAdminUser = res.result.openIdAdminUserToday
+            this.cardCount.adminUser = res.result.openIdAdminUserTotal
+            // this.chartData.adminUser = res.result.openIdAdminUserData
+
+            let adminUserData = []
+            for(let k in res.result.openIdAdminUserData){
+              adminUserData.push({
+                x: dayjs(new Date(beginDay + 1000 * 60 * 60 * 24 * 1)).format('YYYY-MM-DD'),
+                y : res.result.openIdAdminUserData[k]
+              })
+            }
+            this.chartData.adminUser = adminUserData
+
+            console.log('this.chartData.adminUser', this.chartData.adminUser);
+            
+            
+            
+            // 注册数量
+            this.todaySll = res.result.openIdUserToday
+            this.cardCount.sll = res.result.openIdUserTotal
+            // this.chartData.sll = res.result.openIdUserData
+            
+            for(let k in res.result.openIdUserData){
+              this.chartData.sll.push({
+                x: dayjs(new Date(beginDay + 1000 * 60 * 60 * 24 * 1)).format('YYYY-MM-DD'),
+                y : res.result.openIdUserData[k]
+              })
+            }
+            
+            // 营业额
+            this.todayMoney = res.result.openIdMoneyUserToday
+            this.cardCount.money = res.result.openIdMoneyUserTotal
+            // this.chartData.money = res.result.openIdMoneyUserData
+            for(let k in res.result.openIdMoneyData){
+              this.chartData.moneyData.push({
+                x: dayjs(new Date(beginDay + 1000 * 60 * 60 * 24 * 1)).format('YYYY-MM-DD'),
+                y : res.result.openIdMoneyData[k]
+              })
+            }
+            
+            // 报名 openIdOpenUserToday
+            this.todayOpen = res.result.openIdOpenUserToday
+            this.cardCount.open = res.result.openIdOpenUserTotal
+            // this.chartData.open = res.result.openIdOpenUserData
+            for(let k in res.result.openIdOpenUserData){
+              this.chartData.open.push({
+                x: dayjs(new Date(beginDay + 1000 * 60 * 60 * 24 * 1)).format('YYYY-MM-DD'),
+                y : res.result.openIdOpenUserData[k]
+              })
+            }
+          }
+        }).catch(error => {
+          console.error("统计查询报错",error);//这行打印permissionName is undefined
+          this.stopTimer = true;
+          console.log("清理timer");
+        });
+      } catch (err) {
+        this.stopTimer = true;
+        console.error("统计过程报错",err);
+      }
+    },
     goPage(){
       this.$message.success("根据业务自行处理跳转页面!")
     },
@@ -390,8 +506,9 @@ export default {
     }
   },
   created() {
-    this.loadDataSource1()
-    this.loadDataSource2()
+    // this.loadDataSource1()
+    // this.loadDataSource2()
+    this.loadData()
     setTimeout(() => {
       this.loading = !this.loading
     }, 1000)

admin-pc/src/views/popularizeActivity/PopularizeActivityList.vue

@@ -236,6 +236,12 @@
             align:"center",
             dataIndex: 'num'
           },
+          {
+            title:'虚拟订单下单人数',
+            align:"center",
+            sorter: true,
+            dataIndex: 'orderNum'
+          },
           {
             title:'报名费用',
             align:"center",

admin-pc/src/views/popularizeActivity/modules/PopularizeActivityForm.vue

@@ -55,7 +55,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="主理人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="adminUser">
-              <j-search-select-tag v-model="model.adminUser" dict="han_hai_member,nick_name,id"  />
+              <j-search-select-tag v-model="model.adminUser" dict="han_hai_member,nick_name,id,is_user='Y'"  />
             </a-form-model-item>
           </a-col>
 <!--          <a-col :span="24">-->
@@ -68,6 +68,11 @@
               <a-input-number v-model="model.doNum" placeholder="请输入签到人数" style="width: 100%" disabled/>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="虚拟订单下单人数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderNum">
+              <a-input-number v-model="model.orderNum" placeholder="虚拟订单下单人数" style="width: 100%"/>
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="是否上架" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isOpen">
               <j-switch v-model="model.isOpen"  ></j-switch>

admin-pc/src/views/popularizeAuthentication/modules/PopularizeAuthenticationForm.vue

@@ -10,42 +10,42 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
-              <a-input v-model="model.name" placeholder="请输入姓名" disabled></a-input>
+              <a-input v-model="model.name" placeholder="请输入姓名" ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
-              <a-input v-model="model.phone" placeholder="请输入电话"  disabled></a-input>
+              <a-input v-model="model.phone" placeholder="请输入电话"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="身份证" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cardNo">
-              <a-input v-model="model.cardNo" placeholder="请输入身份证" disabled ></a-input>
+              <a-input v-model="model.cardNo" placeholder="请输入身份证"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="简历附件" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
-              <j-upload v-model="model.image"  disabled ></j-upload>
+              <j-upload v-model="model.image"   ></j-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  disabled/>
+              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="微信二维码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="img">
-              <j-image-upload isMultiple  v-model="model.img" disabled></j-image-upload>
+              <j-image-upload isMultiple  v-model="model.img" ></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="主理人分数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
-              <a-input-number v-model="model.num" placeholder="请输入主理人分数" style="width: 100%" disabled/>
+              <a-input-number v-model="model.num" placeholder="请输入主理人分数" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="images">
-              <j-image-upload isMultiple  v-model="model.images" disabled></j-image-upload>
+              <j-image-upload isMultiple  v-model="model.images" ></j-image-upload>
             </a-form-model-item>
           </a-col>
         </a-row>

admin-pc/src/views/popularizeOrder/PopularizeOrderList.vue

@@ -112,8 +112,7 @@
         <span slot="action" slot-scope="text, record">
           <a @click="handleDetail(record)" >详情</a>
            <a-divider type="vertical" />
-          <a @click="handleEdit(record)" v-if="record.state == 3">退款</a>
-
+          <a @click="handleEdit(record)" v-if="record.outTradeNo != null && record.state != 3">退款</a>
 
 
 <!--          <a-dropdown>-->
@@ -173,6 +172,11 @@
             sorter: true,
             dataIndex: 'createTime'
           },
+          {
+            title:'订单号',
+            align:"center",
+            dataIndex: 'id'
+          },
           {
             title:'订单状态',
             align:"center",
@@ -276,6 +280,16 @@
             align:"center",
             dataIndex: 'code'
           },
+          {
+            title:'微信订单号',
+            align:"center",
+            dataIndex: 'transactionId'
+          },
+          {
+            title:'微信商户订单号',
+            align:"center",
+            dataIndex: 'outTradeNo'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -333,6 +347,8 @@
         fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''})
         fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
         fieldList.push({type:'string',value:'code',text:'邀请码',dictCode:''})
+        fieldList.push({type:'string',value:'outTradeNo',text:'微信订单号',dictCode:''})
+        fieldList.push({type:'string',value:'transactionId',text:'微信商户订单号',dictCode:''})
         this.superFieldList = fieldList
       }
     }

admin-pc/src/views/popularizeTravel/PopularizeTravelList.vue

@@ -223,6 +223,12 @@
             sorter: true,
             dataIndex: 'num'
           },
+          {
+            title:'虚拟订单下单人数',
+            align:"center",
+            sorter: true,
+            dataIndex: 'orderNum'
+          },
           {
             title:'报名价格',
             align:"center",

admin-pc/src/views/popularizeTravel/modules/PopularizeTravelForm.vue

@@ -43,6 +43,11 @@
               <a-input-number v-model="model.num" placeholder="请输入报名人数" style="width: 100%" disabled/>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="虚拟订单下单人数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderNum">
+              <a-input-number v-model="model.orderNum" placeholder="虚拟订单下单人数" style="width: 100%"/>
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="报名价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
               <a-input-number v-model="model.price" placeholder="请输入报名价格" style="width: 100%" />

module-base/base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -79,11 +79,11 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/config_common/**", "anon");
 
 
-        //三只青蛙
+
         filterChainDefinitionMap.put("/index_common/**", "anon");
         filterChainDefinitionMap.put("/order_common/**", "anon");
         filterChainDefinitionMap.put("/shop_common/**", "anon");
-
+        filterChainDefinitionMap.put("/order_pay/**", "anon");
 
 
 

module-common/pom.xml

@@ -56,6 +56,14 @@
           <version>3.2.0</version>
           <scope>compile</scope>
       </dependency>
+
+
+      <!--微信支付-->
+      <dependency>
+          <groupId>com.github.wechatpay-apiv3</groupId>
+          <artifactId>wechatpay-java</artifactId>
+          <version>0.2.15</version>
+      </dependency>
   </dependencies>
 
 </project>

module-common/src/main/java/org/jeecg/api/controller/ApiOrderController.java

@@ -4,6 +4,7 @@ package org.jeecg.api.controller;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.api.bean.PageBean;
 import org.jeecg.api.service.ApiIndexService;
 import org.jeecg.common.api.vo.Result;
@@ -118,4 +119,7 @@ public class ApiOrderController {
     }
 
 
+
+
+
 }

module-common/src/main/java/org/jeecg/api/controller/ApiOrderPayController.java

@@ -0,0 +1,67 @@
+package org.jeecg.api.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.api.service.WxMiniappPayService;
+import org.jeecg.api.wxUtils.RefundOrderReq;
+import org.jeecg.api.wxUtils.Response;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+@Api(tags="推广项目-退款相关代码")
+@RestController
+@RequestMapping("/order_pay")
+@Slf4j
+public class ApiOrderPayController {
+
+    @Resource
+    private WxMiniappPayService wxMiniappPayService;
+
+    /**
+     * 退款申请
+     * @param req
+     * @return
+     */
+    @ApiOperation(
+            value="退款",
+            notes="退款")
+    @PostMapping("/refund")
+    public  Response<?> refund(@RequestHeader("X-Access-Token") String token, RefundOrderReq req) {
+        log.info("------微信支付退款------");
+        return wxMiniappPayService.refund(req);
+    }
+
+    /**
+     * 查询单笔退款（通过商户退款单号）
+     * @param outRefundNo 商户退款单号
+     * @return
+     */
+    @ApiOperation(
+            value="查询单笔退款（通过商户退款单号）",
+            notes="查询单笔退款（通过商户退款单号）")
+    @GetMapping("/queryByOutRefundNo")
+    public  Response<?> queryByOutRefundNo(String outRefundNo) {
+        log.info("------微信支付查询单笔退款------");
+        return wxMiniappPayService.queryByOutRefundNo(outRefundNo);
+    }
+
+    /**
+     * 微信小程序退款回调
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/refundNotify")
+    public String refundNotify(HttpServletRequest request) throws Exception {
+        log.info("------微信支付微信小程序退款回调------");
+        return wxMiniappPayService.refundNotify(request);
+    }
+
+
+
+}

module-common/src/main/java/org/jeecg/api/service/ApiIndexService.java

@@ -6,6 +6,8 @@ import org.jeecg.modules.popularizeAuthentication.entity.PopularizeAuthenticatio
 import org.jeecg.modules.popularizeInvoicing.entity.PopularizeInvoicing;
 import org.springframework.web.bind.annotation.RequestHeader;
 
+import javax.servlet.http.HttpServletRequest;
+
 public interface ApiIndexService {
 
     //获取首页地区
@@ -121,4 +123,7 @@ public interface ApiIndexService {
     Result<?> getLabelPageList(String title, PageBean pageBean);
 
 
+
+
+
 }

module-common/src/main/java/org/jeecg/api/service/WxMiniappPayService.java

@@ -0,0 +1,34 @@
+package org.jeecg.api.service;
+
+
+import org.jeecg.api.wxUtils.RefundOrderReq;
+import org.jeecg.api.wxUtils.Response;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+
+public interface WxMiniappPayService {
+
+    /**
+     * 退款
+     * @param req
+     * @return
+     */
+    Response<?> refund(RefundOrderReq req);
+
+    /**
+     * 查询单笔退款（通过商户退款单号）
+     * @param outRefundNo 商户退款单号
+     * @return
+     */
+    Response<?> queryByOutRefundNo(String outRefundNo);
+
+    /**
+     * 微信小程序退款回调
+     * @param request
+     * @return
+     */
+    String refundNotify(HttpServletRequest request);
+
+}

module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java

@@ -8,6 +8,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.api.bean.PageBean;
 import org.jeecg.api.service.ApiIndexService;
+import org.jeecg.api.service.WxMiniappPayService;
+import org.jeecg.api.wxUtils.RefundOrderReq;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.commonBanner.entity.CommonBanner;
@@ -48,6 +50,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import javax.transaction.Transactional;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.*;
@@ -100,6 +103,8 @@ public class ApiIndexServiceImpl implements ApiIndexService {
     //权限配置
     @Resource
     private ShiroRealm shiroRealm;
+    @Autowired
+    private WxMiniappPayService wxMiniappPayService;
 
 
 
@@ -204,6 +209,10 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                 );
                 //查询订单购票数量之和
                 Integer i = popularizeOrderService.sumNumByActivityOrderIdAndState(recruit.getId());
+                if(i==null){
+                    i = 0;
+                }
+                i = i.intValue() + recruitObj.getOrderNum().intValue();
                 recruitObj.setNum(i);
 
                 recruitList.add(recruitObj);
@@ -270,7 +279,11 @@ public class ApiIndexServiceImpl implements ApiIndexService {
                                 .list()
                 );
                 //查询订单购票数量之和
-                Integer i = popularizeOrderService.sumNumByActivityOrderIdAndState(recruit.getId());
+                Integer i = popularizeOrderService.sumNumByActivityOrderIdAndState(recruit.getId());;
+                if(i == null){
+                    i = 0;
+                }
+                i = i.intValue() + recruitObj.getOrderNum().intValue();
                 recruitObj.setNum(i);
 
                 recruitList.add(recruitObj);
@@ -404,6 +417,7 @@ public class ApiIndexServiceImpl implements ApiIndexService {
             if(i == null){
                 i = 0;
             }
+            i = i.intValue() + recruitObj.getOrderNum().intValue();
             recruitObj.setNum(i);
 
             recruitList.add(recruitObj);
@@ -584,9 +598,36 @@ public class ApiIndexServiceImpl implements ApiIndexService {
     @Override
     public Result<?> cancelOrder(String token,String orderId){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        PopularizeOrder byId = popularizeOrderService.getById(orderId);
-        byId.setState("3");
-        popularizeOrderService.updateById(byId);
+        PopularizeOrder popularizeOrder = popularizeOrderService.getById(orderId);
+//        byId.setState("3");
+//        popularizeOrderService.updateById(byId);
+
+        //7天外退款时，退100%。
+        //7天内至1天以外，退50%。
+        //24小时以内，无法退款。
+        String msg = "取消成功";
+        if(popularizeOrder.getPayTime().getTime()+1000*60*60*24*7>System.currentTimeMillis()){
+            popularizeOrder.setTuiPrice(popularizeOrder.getPayPrice());
+
+            RefundOrderReq req = new RefundOrderReq();
+            req.setOutTradeNo(popularizeOrder.getOutTradeNo());
+            req.setRefundAmount(popularizeOrder.getTuiPrice());
+            req.setTotalAmount(popularizeOrder.getPayPrice());
+            req.setTransactionId(popularizeOrder.getTransactionId());
+            wxMiniappPayService.refund(req);
+            msg = "取消成功,7天外退款时，退100%";
+        }else if(popularizeOrder.getPayTime().getTime()+1000*60*60*24*7>System.currentTimeMillis()-1000*60*60*24) {
+            popularizeOrder.setTuiPrice(popularizeOrder.getPayPrice().divide(new BigDecimal(2)));
+            RefundOrderReq req = new RefundOrderReq();
+            req.setOutTradeNo(popularizeOrder.getOutTradeNo());
+            req.setRefundAmount(popularizeOrder.getTuiPrice());
+            req.setTotalAmount(popularizeOrder.getPayPrice());
+            req.setTransactionId(popularizeOrder.getTransactionId());
+            wxMiniappPayService.refund(req);
+            msg = "取消成功,7天内至1天以外，退50%";
+        }else if(popularizeOrder.getPayTime().getTime()+1000*60*60*24>System.currentTimeMillis()){
+            msg = "24小时以内，无法退款。";
+        }
         return Result.OK("取消成功");
     }
 
@@ -1397,6 +1438,8 @@ public class ApiIndexServiceImpl implements ApiIndexService {
     public Object payNotify(String requestBody){
         WxPayOrderNotifyResult notify = mpWxPayService.notify(requestBody);
         String outTradeNo = notify.getOutTradeNo();
+        String transactionId = notify.getTransactionId();
+
         log.info("活动报名支付回调订单号码："+outTradeNo);
         //查询活动订单
         PopularizeOrder order = popularizeOrderService.getById(outTradeNo);
@@ -1405,6 +1448,8 @@ public class ApiIndexServiceImpl implements ApiIndexService {
             if(order.getState().equals("0")){
                 order.setState("1");
                 order.setPayTime(new Date());
+                order.setTransactionId(transactionId);
+                order.setOutTradeNo(outTradeNo);
                 popularizeOrderService.updateById(order);
                 //修改当前报名人数
                 PopularizeActivity byId = popularizeActivityService.getById(order.getActivityOrderId());
@@ -1465,4 +1510,10 @@ public class ApiIndexServiceImpl implements ApiIndexService {
 
     }
 
+
+
+
+
+
+
 }

module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java

@@ -81,7 +81,7 @@ public class AppletLoginServiceImpl implements AppletLoginService {
             member = new HanHaiMember();
 //            member.setSesssionKey(sessionKey);
             member.setAppletOpenid(wxOpenid);
-            member.setNickName("发布用户"+System.currentTimeMillis());
+            member.setNickName("VTribe"+System.currentTimeMillis());
             member.setHeadImage(loginReq.getHeadimgurl());
             // 生成token返回给小程序端
             String token = JwtUtil.sign(member.getAppletOpenid(), wxOpenid);

module-common/src/main/java/org/jeecg/api/service/impl/WxMiniappPayServiceImpl.java

@@ -0,0 +1,363 @@
+package org.jeecg.api.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+
+import com.wechat.pay.java.core.Config;
+import com.wechat.pay.java.core.exception.HttpException;
+import com.wechat.pay.java.core.exception.MalformedMessageException;
+import com.wechat.pay.java.core.exception.ServiceException;
+import com.wechat.pay.java.core.exception.ValidationException;
+import com.wechat.pay.java.core.notification.NotificationConfig;
+import com.wechat.pay.java.core.notification.NotificationParser;
+import com.wechat.pay.java.core.notification.RequestParam;
+import com.wechat.pay.java.service.payments.jsapi.JsapiServiceExtension;
+import com.wechat.pay.java.service.payments.jsapi.model.Amount;
+import com.wechat.pay.java.service.payments.jsapi.model.*;
+import com.wechat.pay.java.service.payments.model.Transaction;
+import com.wechat.pay.java.service.refund.RefundService;
+import com.wechat.pay.java.service.refund.model.*;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.api.service.WxMiniappPayService;
+import org.jeecg.api.wxUtils.HttpServletUtils;
+import org.jeecg.api.wxUtils.RefundOrderReq;
+import org.jeecg.api.wxUtils.Response;
+import org.jeecg.api.wxUtils.WxPayConfig;
+import org.jeecg.modules.popularizeOrder.entity.PopularizeOrder;
+import org.jeecg.modules.popularizeOrder.service.IPopularizeOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * <p>
+ * 微信小程序支付服务实现
+ * </p>
+ *
+ * @author songfayuan
+ * @date 2024/9/14 14:23
+ */
+@Slf4j
+@Service
+public class WxMiniappPayServiceImpl implements WxMiniappPayService {
+
+    /**
+     * 微信小程序的 AppID
+     */
+    @Value("${wx.miniapp.appid}")
+    private String appid;
+
+    /**
+     * 微信小程序的密钥
+     */
+    @Value("${wx.miniapp.secret}")
+    private String secret;
+
+    /**
+     * 商户号
+     */
+    @Value("${wx.miniapp.merchantId}")
+    private String merchantId;
+
+    /**
+     * 商户API私钥路径
+     */
+    @Value("${wx.miniapp.privateKeyPath}")
+    private String privateKeyPath;
+
+    /**
+     * 商户证书序列号
+     */
+    @Value("${wx.miniapp.merchantSerialNumber}")
+    private String merchantSerialNumber;
+
+    /**
+     * 商户APIV3密钥
+     */
+    @Value("${wx.miniapp.apiV3Key}")
+    private String apiV3Key;
+
+    /**
+     * 支付通知地址
+     */
+    @Value("${wx.miniapp.payNotifyUrl}")
+    private String payNotifyUrl;
+
+    /**
+     * 退款通知地址
+     */
+    @Value("${wx.miniapp.refundNotifyUrl}")
+    private String refundNotifyUrl;
+
+
+    @Autowired
+    @Qualifier("rsaAutoCertificateConfig")
+    private Config config;
+    @Autowired
+    @Qualifier("rsaAutoCertificateConfig")
+    private Config notificationConfig;
+
+
+    @Autowired
+    private IPopularizeOrderService popularizeOrderService;
+
+
+
+    /**
+     * 退款
+     * <pre>
+     * 交易时间超过一年的订单无法提交退款（按支付成功时间+365天计算）
+     * 微信支付退款支持单笔交易分多次退款，多次退款需要提交原支付订单的商户订单号和设置不同的退款单号。申请退款总金额不能超过订单金额。 一笔退款失败后重新提交，请不要更换退款单号，请使用原商户退款单号
+     * 请求频率限制：150qps，即每秒钟正常的申请退款请求次数不超过150次
+     * 每个支付订单的部分退款次数不能超过50次
+     * 如果同一个用户有多笔退款，建议分不同批次进行退款，避免并发退款导致退款失败
+     * 申请退款接口的返回仅代表业务的受理情况，具体退款是否成功，需要通过退款查询接口获取结果
+     * 错误或无效请求频率限制：6qps，即每秒钟异常或错误的退款申请请求不超过6次
+     * 一个月之前的订单申请退款频率限制为：5000/min
+     * 同一笔订单多次退款的请求需相隔1分钟
+     * </pre>
+     *
+     * @param req
+     * @return
+     */
+    @Override
+    public Response refund(RefundOrderReq req) {
+
+        // 初始化服务
+        RefundService service = new RefundService.Builder().config(config).build();
+
+        //根据订单标识查询订单
+        PopularizeOrder payOrder = popularizeOrderService.lambdaQuery()
+                .eq(PopularizeOrder::getOutTradeNo, req.getOutTradeNo())
+                .one();
+        if (payOrder == null) {
+            return Response.error("订单不存在");
+        }
+        if (payOrder.getPayPrice().compareTo(req.getRefundAmount()) < 0) {
+            return Response.error("退款金额不能大于支付金额");
+        }
+
+        CreateRequest request = new CreateRequest();
+        // 调用request.setXxx(val)设置所需参数，具体参数可见Request定义
+        request.setOutTradeNo(req.getOutTradeNo());
+        request.setOutRefundNo("REFUND_" + req.getOutTradeNo());
+        AmountReq amount = new AmountReq();
+        // 订单总金额，单位为分，只能为整数，详见支付金额
+        amount.setTotal(decimalToLong(req.getTotalAmount()));
+        // 退款金额，单位为分，只能为整数，不能超过支付总额
+        amount.setRefund(decimalToLong(req.getRefundAmount()));
+        amount.setCurrency("CNY");
+
+        request.setAmount(amount);
+        request.setNotifyUrl(refundNotifyUrl);
+        // 调用接口
+        Refund refund = null;
+        try {
+            refund = service.create(request);
+        } catch (HttpException e) {
+            log.error("退款申请失败，发送HTTP请求失败：", e);
+            return Response.error("退款失败");
+        } catch (MalformedMessageException e) {
+            log.error("退款申请失败，解析微信支付应答或回调报文异常，返回信息：", e);
+            return Response.error("退款失败");
+        } catch (ValidationException e) {
+            log.error("退款申请失败，验证签名失败，返回信息：", e);
+            return Response.error("验证签名失败");
+        } catch (ServiceException e) {
+            log.error("退款申请失败，发送HTTP请求成功，返回异常，返回码：{},返回信息：", e.getErrorCode(), e);
+            return Response.error("退款失败：" + e.getErrorMessage());
+        } catch (Exception e) {
+            log.error("退款申请失败，异常：", e);
+            return Response.error("退款失败");
+        }
+        if (Status.SUCCESS.equals(refund.getStatus())) {
+            log.info("退款成功！-订单号：{}", req.getOutTradeNo());
+            return Response.success("退款成功");
+        } else if (Status.CLOSED.equals(refund.getStatus())) {
+            log.info("退款关闭！-订单号：{}", req.getOutTradeNo());
+            return Response.error("退款关闭");
+        } else if (Status.PROCESSING.equals(refund.getStatus())) {
+            log.info("退款处理中！-订单号：{}", req.getOutTradeNo());
+            return Response.error("退款处理中");
+        } else if (Status.ABNORMAL.equals(refund.getStatus())) {
+            log.info("退款异常！-订单号：{}", req.getOutTradeNo());
+            return Response.error("退款异常");
+        }
+        return Response.error("退款失败");
+    }
+
+    /**
+     * 查询单笔退款（通过商户退款单号）
+     * <pre>
+     * 提交退款申请后，通过调用该接口查询退款状态。退款有一定延时，建议查询退款状态在提交退款申请后1分钟发起，一般来说零钱支付的退款5分钟内到账，银行卡支付的退款1-3个工作日到账。
+     * </pre>
+     *
+     * @param outRefundNo 商户退款单号
+     * @return
+     */
+    @Override
+    public Response queryByOutRefundNo(String outRefundNo) {
+        // 初始化服务
+        RefundService service = new RefundService.Builder().config(config).build();
+        QueryByOutRefundNoRequest request = new QueryByOutRefundNoRequest();
+        // 调用request.setXxx(val)设置所需参数，具体参数可见Request定义
+        request.setOutRefundNo(outRefundNo.trim());
+        // 调用接口
+        Refund refund = null;
+        try {
+            refund = service.queryByOutRefundNo(request);
+            log.info("退款查询结果：{}", JSONObject.toJSONString(refund));
+            //【退款状态】退款到银行发现用户的卡作废或者冻结了，导致原路退款银行卡失败，可前往商户平台（pay.weixin.qq.com）-交易中心，手动处理此笔退款。可选取值：SUCCESS:退款成功CLOSED:退款关闭PROCESSING:退款处理中ABNORMAL:退款异常【退款状态】退款到银行发现用户的卡作废或者冻结了，导致原路退款银行卡失败，可前往商户平台（pay.weixin.qq.com）-交易中心，手动处理此笔退款。可选取值：SUCCESS:退款成功CLOSED:退款关闭PROCESSING:退款处理中ABNORMAL:退款异常
+            if (Status.SUCCESS.equals(refund.getStatus())) {
+                log.info("退款成功！-订单号：{}", outRefundNo);
+                return Response.success("退款成功");
+            } else if (Status.CLOSED.equals(refund.getStatus())) {
+                log.info("退款关闭！-订单号：{}", outRefundNo);
+                return Response.error("退款关闭");
+            } else if (Status.PROCESSING.equals(refund.getStatus())) {
+                log.info("退款处理中！-订单号：{}", outRefundNo);
+                return Response.success("退款处理中");
+            } else if (Status.ABNORMAL.equals(refund.getStatus())) {
+                log.info("退款异常！-订单号：{}", outRefundNo);
+                return Response.error("退款异常");
+            }
+        } catch (HttpException e) {
+            log.error("退款查询失败，发送HTTP请求失败：", e);
+            return Response.error("退款查询失败");
+        } catch (MalformedMessageException e) {
+            log.error("退款查询失败，解析微信支付应答或回调报文异常，返回信息：", e);
+            return Response.error("退款查询失败");
+        } catch (ValidationException e) {
+            log.error("退款查询失败，验证签名失败，返回信息：", e);
+            return Response.error("退款查询失败");
+        } catch (ServiceException e) {
+            log.error("退款查询失败，发送HTTP请求成功，返回异常，返回码：{},返回信息：", e.getErrorCode(), e);
+            return Response.error("退款查询失败");
+        } catch (Exception e) {
+            log.error("退款查询失败，异常：", e);
+            return Response.error("退款查询失败");
+        }
+
+        return Response.success(refund);
+    }
+
+    /**
+     * 微信小程序退款回调
+     * <pre>
+     * 注意:
+     * 对后台通知交互时，如果微信收到应答不是成功或超时，微信认为通知失败，微信会通过一定的策略定期重新发起通知，尽可能提高通知的成功率，但微信不保证通知最终能成功
+     *
+     * 同样的通知可能会多次发送给商户系统。商户系统必须能够正确处理重复的通知。 推荐的做法是，当商户系统收到通知进行处理时，先检查对应业务数据的状态，并判断该通知是否已经处理。如果未处理，则再进行处理；如果已处理，则直接返回结果成功。在对业务数据进行状态检查和处理之前，要采用数据锁进行并发控制，以避免函数重入造成的数据混乱。
+     * 如果在所有通知频率后没有收到微信侧回调。商户应调用查询订单接口确认订单状态。
+     * </pre>
+     *
+     * @param request
+     * @return
+     */
+    @Override
+    public String refundNotify(HttpServletRequest request) {
+        Map<String, String> returnMap = new HashMap<>(2);
+        returnMap.put("code", "FAIL");
+        returnMap.put("message", "失败");
+        try {
+            // 请求头Wechatpay-Signature
+            String signature = request.getHeader("Wechatpay-Signature");
+            // 请求头Wechatpay-nonce
+            String nonce = request.getHeader("Wechatpay-Nonce");
+            // 请求头Wechatpay-Timestamp
+            String timestamp = request.getHeader("Wechatpay-Timestamp");
+            // 微信支付证书序列号
+            String serial = request.getHeader("Wechatpay-Serial");
+            // 签名方式
+            String signType = request.getHeader("Wechatpay-Signature-Type");
+            // 构造解析器和请求参数
+            NotificationParser parser = new NotificationParser((NotificationConfig) notificationConfig);
+            RequestParam requestParam = new RequestParam.Builder()
+                    .serialNumber(serial)
+                    .nonce(nonce)
+                    .signature(signature)
+                    .timestamp(timestamp)
+                    .signType(signType)
+                    .body(HttpServletUtils.getRequestBody(request))
+                    .build();
+            log.info("微信小程序支付退款回调验签参数: {}", JSON.toJSONString(requestParam));
+            // 解析通知
+            RefundNotification notification = null;
+            try {
+                notification = parser.parse(requestParam, RefundNotification.class);
+            } catch (MalformedMessageException e) {
+                log.error("微信小程序支付退款回调：回调通知参数不正确、解析通知数据失败：", e);
+                returnMap.put("message", "回调通知参数不正确");
+                return JSONObject.toJSONString(returnMap);
+            } catch (ValidationException e) {
+                log.error("微信小程序支付退款回调：签名验证失败 ", e);
+                returnMap.put("message", "签名验证失败");
+                return JSONObject.toJSONString(returnMap);
+            } catch (Exception e) {
+                log.error("微信小程序支付退款回调：未知异常 ", e);
+                returnMap.put("message", "未知异常");
+                return JSONObject.toJSONString(returnMap);
+            }
+            log.info("微信小程序支付退款回调解析成功: {}", JSON.toJSONString(notification));
+            // 根据退款状态处理
+            Status refundStatus = notification.getRefundStatus();
+            switch (refundStatus) {
+                case SUCCESS:
+                    // TODO 退款成功逻辑
+
+                    returnMap.put("code", "SUCCESS");
+                    returnMap.put("message", "退款成功");
+                    //修改订单状态
+                    PopularizeOrder byId = popularizeOrderService.lambdaQuery()
+                            .eq(PopularizeOrder::getOutTradeNo,notification.getOutTradeNo())
+                            .one();
+                    byId.setState("3");
+                    popularizeOrderService.updateById(byId);
+
+
+                    return JSONObject.toJSONString(returnMap);
+                case PROCESSING:
+                    log.warn("退款处理中: {}", notification);
+                    returnMap.put("message", "退款处理中，请稍后查询");
+                    return JSONObject.toJSONString(returnMap);
+                case ABNORMAL:
+                    log.error("退款异常: {}", notification);
+                    returnMap.put("message", "退款异常，请联系客服");
+                    return JSONObject.toJSONString(returnMap);
+                case CLOSED:
+                    log.warn("退款已关闭: {}", notification);
+                    returnMap.put("message", "退款已关闭，操作失败");
+                    return JSONObject.toJSONString(returnMap);
+                default:
+                    log.error("未知退款状态: {}", refundStatus);
+                    returnMap.put("message", "未知退款状态");
+                    return JSONObject.toJSONString(returnMap);
+            }
+        } catch (Exception e) {
+            log.error("退款回调处理异常", e);
+            returnMap.put("message", "退款处理异常");
+            return JSONObject.toJSONString(returnMap);
+        }
+    }
+
+
+    /**
+     * 金额转换
+     *
+     * @param money
+     * @return
+     */
+    private static long decimalToLong(BigDecimal money) {
+        return money.multiply(BigDecimal.valueOf(100)).longValue();
+    }
+
+
+}

module-common/src/main/java/org/jeecg/api/wxUtils/CreateOrderReq.java

@@ -0,0 +1,8 @@
+package org.jeecg.api.wxUtils;
+
+public class CreateOrderReq {
+    /**
+     * 微信用户openid（前端不用传参）
+     */
+    private String wxOpenId;
+}

module-common/src/main/java/org/jeecg/api/wxUtils/HttpServletUtils.java

@@ -0,0 +1,47 @@
+package org.jeecg.api.wxUtils;
+
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * <p>
+ * HttpServletRequest 获取请求体
+ * </p>
+ *
+ * @author songfayuan
+ * @date 2024/9/30 19:11
+ */
+public class HttpServletUtils {
+
+    /**
+     * 获取请求体
+     *
+     * @param request
+     * @return
+     * @throws IOException
+     */
+    public static String getRequestBody(HttpServletRequest request) throws IOException {
+        ServletInputStream stream = null;
+        BufferedReader reader = null;
+        StringBuffer sb = new StringBuffer();
+        try {
+            stream = request.getInputStream();
+            // 获取响应
+            reader = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8));
+            String line;
+            while ((line = reader.readLine()) != null) {
+                sb.append(line);
+            }
+        } catch (IOException e) {
+            throw new IOException("读取返回支付接口数据流出现异常！");
+        } finally {
+            reader.close();
+        }
+        return sb.toString();
+    }
+
+}

module-common/src/main/java/org/jeecg/api/wxUtils/PayOrderInfo.java

@@ -0,0 +1,31 @@
+package org.jeecg.api.wxUtils;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 支付订单信息
+ * </p>
+ *
+ * @author songfayuan
+ * @date 2024/9/30 17:46
+ */
+@Data
+public class PayOrderInfo {
+    /**
+     * 订单标题
+     */
+    private String description;
+    /**
+     * 商户订单号
+     * 只能是数字、大小写字母_-*且在同一个商户号下唯一。
+     */
+    private String outTradeNo;
+    /**
+     * 支付金额，单位：元
+     */
+    private BigDecimal amount;
+}
+

module-common/src/main/java/org/jeecg/api/wxUtils/QueryOrderReq.java

@@ -0,0 +1,23 @@
+package org.jeecg.api.wxUtils;
+
+import lombok.Data;
+
+/**
+ * <p>
+ * 订单查询请求
+ * </p>
+ *
+ * @author songfayuan
+ * @date 2024/9/30 19:19
+ */
+@Data
+public class QueryOrderReq {
+    /**
+     * 订单号：业务侧的订单号
+     */
+    private String transactionId;
+    /**
+     * 商户订单号
+     */
+    private String outTradeNo;
+}

module-common/src/main/java/org/jeecg/api/wxUtils/RefundOrderReq.java

@@ -0,0 +1,36 @@
+package org.jeecg.api.wxUtils;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 退款订单请求参数
+ * </p>
+ *
+ * @author songfayuan
+ * @date 2024/9/30 19:19
+ */
+@Data
+public class RefundOrderReq {
+    /**
+     * 订单号：业务侧的订单号
+     */
+    private String transactionId;
+    /**
+     * 商户订单号
+     */
+    private String outTradeNo;
+
+    /**
+     * 原订单金额 说明：原支付交易的订单总金额，这里单位为元。
+     */
+    private BigDecimal totalAmount;
+
+    /**
+     * 退款金额 说明：退款金额，这里单位为元，不能超过原订单支付金额。
+     */
+    private BigDecimal refundAmount;
+}
+

module-common/src/main/java/org/jeecg/api/wxUtils/Response.java

@@ -0,0 +1,164 @@
+package org.jeecg.api.wxUtils;
+
+import lombok.Data;
+
+/**
+ * 返回参数封装类
+ *
+ * @param <T>
+ * @author songfayuan
+ */
+
+@Data
+public class Response<T> {
+    /**
+     * 状态码
+     */
+    protected int code;
+
+    /**
+     * 提示信息
+     */
+    protected String msg;
+
+    /**
+     * 数据
+     */
+    protected T data;
+
+    /**
+     * 成功时状态码
+     */
+    private static final int SUCCESS_CODE = 200;
+
+    /**
+     * 成功时提示信息
+     */
+    private static final String SUCCESS_MSG = "success";
+
+    /**
+     * 异常、错误信息状态码
+     */
+    private static final int ERROR_CODE = 500;
+
+    /**
+     * 异常、错误提示信息
+     */
+    private static final String ERROR_MSG = "服务器内部异常，请联系技术人员！";
+
+    /**
+     * 返回成功消息
+     *
+     * @param <T>
+     * @return
+     */
+    public static <T> Response<T> success() {
+        Response resp = new Response();
+        resp.code = (SUCCESS_CODE);
+        resp.msg = (SUCCESS_MSG);
+        return resp;
+    }
+
+    /**
+     * 返回成功消息
+     *
+     * @param <T>
+     * @param msg
+     * @return
+     */
+    public static <T> Response<T> successResponse(String msg) {
+        Response resp = new Response();
+        resp.code = SUCCESS_CODE;
+        resp.msg = msg;
+        return resp;
+    }
+
+    /**
+     * 返回错误消息
+     *
+     * @param <T>
+     * @return
+     */
+    public static <T> Response<T> error() {
+        Response resp = new Response();
+        resp.code = (ERROR_CODE);
+        resp.msg = (ERROR_MSG);
+        return resp;
+    }
+
+    /**
+     * 返回错误消息
+     *
+     * @param <T>
+     * @param msg
+     * @return
+     */
+    public static <T> Response<T> errorResponse(String msg) {
+        Response resp = new Response();
+        resp.code = ERROR_CODE;
+        resp.msg = msg;
+        return resp;
+    }
+
+    /**
+     * 自定义状态码、提示信息
+     *
+     * @param <T>
+     * @param code 状态码
+     * @param msg  提示信息
+     * @return
+     */
+    public static <T> Response<T> response(int code, String msg) {
+        Response resp = new Response();
+        resp.code = (code);
+        resp.msg = (msg);
+        return resp;
+    }
+
+    /**
+     * 自定义状态码、提示信息、业务数据
+     *
+     * @param <T>
+     * @param code 状态码
+     * @param msg  提示信息
+     * @param data 业务数据
+     * @return
+     */
+    public static <T> Response<T> response(int code, String msg, T data) {
+        Response<T> resp = new Response<>();
+        resp.code = (code);
+        resp.msg = (msg);
+        resp.data = data;
+        return resp;
+    }
+
+    /**
+     * 返回成功数据
+     *
+     * @param <T>
+     * @param data 业务数据
+     * @return
+     */
+    public static <T> Response<T> success(T data) {
+        Response<T> resp = new Response<>();
+        resp.code = (SUCCESS_CODE);
+        resp.msg = (SUCCESS_MSG);
+        resp.data = data;
+        return resp;
+    }
+
+    /**
+     * 返回错误消息
+     *
+     * @param <T>
+     * @param data 业务数据
+     * @return
+     */
+    public static <T> Response<T> error(T data) {
+        Response<T> resp = new Response<>();
+        resp.code = (ERROR_CODE);
+        resp.msg = (ERROR_MSG);
+        resp.data = data;
+        return resp;
+    }
+}

module-common/src/main/java/org/jeecg/api/wxUtils/WxPayAutoCertificateConfig.java

@@ -0,0 +1,96 @@
+package org.jeecg.api.wxUtils;
+
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.wechat.pay.java.core.Config;
+import com.wechat.pay.java.core.RSAAutoCertificateConfig;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@Configuration
+public class WxPayAutoCertificateConfig {
+
+    /**
+     * 微信小程序的 AppID
+     */
+    @Value("${wx.miniapp.appid}")
+    private String appid;
+
+    /**
+     * 微信小程序的密钥
+     */
+    @Value("${wx.miniapp.secret}")
+    private String secret;
+
+    /**
+     * 商户号
+     */
+    @Value("${wx.miniapp.merchantId}")
+    private String merchantId;
+
+    /**
+     * 商户API私钥路径
+     */
+    @Value("${wx.miniapp.privateKeyPath}")
+    private String privateKeyPath;
+
+    /**
+     * 商户证书序列号
+     */
+    @Value("${wx.miniapp.merchantSerialNumber}")
+    private String merchantSerialNumber;
+
+    /**
+     * 商户APIV3密钥
+     */
+    @Value("${wx.miniapp.apiV3Key}")
+    private String apiV3Key;
+
+    /**
+     * 支付通知地址
+     */
+    @Value("${wx.miniapp.payNotifyUrl}")
+    private String payNotifyUrl;
+
+    /**
+     * 退款通知地址
+     */
+    @Value("${wx.miniapp.refundNotifyUrl}")
+    private String refundNotifyUrl;
+
+    /**
+     * 初始化商户配置
+     * @return
+     */
+    @Bean
+    public Config rsaAutoCertificateConfig() {
+        // 这里把Config作为配置Bean是为了避免多次创建资源，一般项目运行的时候这些东西都确定了
+        // 具体的参数改为申请的数据，可以通过读配置文件的形式获取
+//        Config config = new RSAAutoCertificateConfig.Builder()
+//                .merchantId("1659066870")
+//                .privateKeyFromPath("E:\\git_java\\api_java\\popularize-admin\\popularize-admin\\popularize-admin\\module-pay\\src\\main\\resources\\apiclient_key.pem")
+//                .merchantSerialNumber("7BE56DC695B2B612BD1C6C710A7FBFA1AC46B10F")
+//                .apiV3Key("vtribevtribevtribevtribevtribe12")
+//                .build();
+
+
+        Config config = new RSAAutoCertificateConfig.Builder()
+                .merchantId(merchantId)
+                .privateKeyFromPath(privateKeyPath)
+                .merchantSerialNumber(merchantSerialNumber)
+                .apiV3Key(apiV3Key)
+                .build();
+        log.info("初始化微信支付商户配置完成...");
+        return config;
+    }
+
+
+}

module-common/src/main/java/org/jeecg/api/wxUtils/WxPayConfig.java

@@ -0,0 +1,17 @@
+package org.jeecg.api.wxUtils;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+
+
+
+@Data
+@Component
+public class WxPayConfig {
+
+
+
+}
+

module-common/src/main/java/org/jeecg/modules/employOrder/controller/EmployOrderController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.employOrder.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.employOrder.entity.EmployOrder;
+import org.jeecg.modules.employOrder.service.IEmployOrderService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 订单信息表
+ * @Author: jeecg-boot
+ * @Date:   2025-03-12
+ * @Version: V1.0
+ */
+@Api(tags="订单信息表")
+@RestController
+@RequestMapping("/employOrder/employOrder")
+@Slf4j
+public class EmployOrderController extends JeecgController<EmployOrder, IEmployOrderService> {
+	@Autowired
+	private IEmployOrderService employOrderService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param employOrder
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "订单信息表-分页列表查询")
+	@ApiOperation(value="订单信息表-分页列表查询", notes="订单信息表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<EmployOrder>> queryPageList(EmployOrder employOrder,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<EmployOrder> queryWrapper = QueryGenerator.initQueryWrapper(employOrder, req.getParameterMap());
+		Page<EmployOrder> page = new Page<EmployOrder>(pageNo, pageSize);
+		IPage<EmployOrder> pageList = employOrderService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param employOrder
+	 * @return
+	 */
+	@AutoLog(value = "订单信息表-添加")
+	@ApiOperation(value="订单信息表-添加", notes="订单信息表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody EmployOrder employOrder) {
+		employOrderService.save(employOrder);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param employOrder
+	 * @return
+	 */
+	@AutoLog(value = "订单信息表-编辑")
+	@ApiOperation(value="订单信息表-编辑", notes="订单信息表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody EmployOrder employOrder) {
+		employOrderService.updateById(employOrder);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "订单信息表-通过id删除")
+	@ApiOperation(value="订单信息表-通过id删除", notes="订单信息表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		employOrderService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "订单信息表-批量删除")
+	@ApiOperation(value="订单信息表-批量删除", notes="订单信息表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.employOrderService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "订单信息表-通过id查询")
+	@ApiOperation(value="订单信息表-通过id查询", notes="订单信息表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<EmployOrder> queryById(@RequestParam(name="id",required=true) String id) {
+		EmployOrder employOrder = employOrderService.getById(id);
+		if(employOrder==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(employOrder);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param employOrder
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, EmployOrder employOrder) {
+        return super.exportXls(request, employOrder, EmployOrder.class, "订单信息表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, EmployOrder.class);
+    }
+
+}

module-common/src/main/java/org/jeecg/modules/employOrder/entity/EmployOrder.java

@@ -0,0 +1,161 @@
+package org.jeecg.modules.employOrder.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 订单信息表
+ * @Author: jeecg-boot
+ * @Date:   2025-03-12
+ * @Version: V1.0
+ */
+@Data
+@TableName("employ_order")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="employ_order对象", description="订单信息表")
+public class EmployOrder implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**订单类型*/
+	@Excel(name = "订单类型", width = 15, dicCode = "employ_order_type")
+	@Dict(dicCode = "employ_order_type")
+    @ApiModelProperty(value = "订单类型")
+    private java.lang.Integer type;
+	/**订单状态*/
+	@Excel(name = "订单状态", width = 15, dicCode = "employ_status")
+	@Dict(dicCode = "employ_status")
+    @ApiModelProperty(value = "订单状态")
+    private java.lang.Integer status;
+	/**招聘标题*/
+	@Excel(name = "招聘标题", width = 15)
+    @ApiModelProperty(value = "招聘标题")
+    private java.lang.String title;
+	/**所属行业*/
+	@Excel(name = "所属行业", width = 15)
+    @ApiModelProperty(value = "所属行业")
+    private java.lang.String categoryOne;
+	/**所属工种*/
+	@Excel(name = "所属工种", width = 15)
+    @ApiModelProperty(value = "所属工种")
+    private java.lang.String categoryTwo;
+	/**师傅姓名*/
+	@Excel(name = "师傅姓名", width = 15)
+    @ApiModelProperty(value = "师傅姓名")
+    private java.lang.String jobName;
+	/**师傅电话*/
+	@Excel(name = "师傅电话", width = 15)
+    @ApiModelProperty(value = "师傅电话")
+    private java.lang.String jobPhone;
+	/**师傅出发地址*/
+	@Excel(name = "师傅出发地址", width = 15)
+    @ApiModelProperty(value = "师傅出发地址")
+    private java.lang.String jobAddress;
+	/**支付方式*/
+	@Excel(name = "支付方式", width = 15)
+    @ApiModelProperty(value = "支付方式")
+    private java.lang.String payType;
+	/**工作薪资*/
+	@Excel(name = "工作薪资", width = 15)
+    @ApiModelProperty(value = "工作薪资")
+    private java.lang.String jobMoney;
+	/**工作时间*/
+	@Excel(name = "工作时间", width = 15)
+    @ApiModelProperty(value = "工作时间")
+    private java.lang.String jobTime;
+	/**用工公司图片*/
+	@Excel(name = "用工公司图片", width = 15)
+    @ApiModelProperty(value = "用工公司图片")
+    private java.lang.String workHeadImg;
+	/**用工公司名称*/
+	@Excel(name = "用工公司名称", width = 15)
+    @ApiModelProperty(value = "用工公司名称")
+    private java.lang.String workName;
+	/**用工联系人*/
+	@Excel(name = "用工联系人", width = 15)
+    @ApiModelProperty(value = "用工联系人")
+    private java.lang.String workUser;
+	/**用工联系人电话*/
+	@Excel(name = "用工联系人电话", width = 15)
+    @ApiModelProperty(value = "用工联系人电话")
+    private java.lang.String workPhone;
+	/**用工地址*/
+	@Excel(name = "用工地址", width = 15)
+    @ApiModelProperty(value = "用工地址")
+    private java.lang.String workAddress;
+	/**用工工作内容*/
+	@Excel(name = "用工工作内容", width = 15)
+    @ApiModelProperty(value = "用工工作内容")
+    private java.lang.String workDetails;
+	/**保险费用*/
+	@Excel(name = "保险费用", width = 15)
+    @ApiModelProperty(value = "保险费用")
+    private java.math.BigDecimal premium;
+	/**支付金额*/
+	@Excel(name = "支付金额", width = 15)
+    @ApiModelProperty(value = "支付金额")
+    private java.math.BigDecimal payMoney;
+	/**师傅照片*/
+	@Excel(name = "师傅照片", width = 15)
+    @ApiModelProperty(value = "师傅照片")
+    private java.lang.String jobHeadImg;
+	/**关联-求职*/
+	@Excel(name = "关联-求职", width = 15, dictTable = "employ_seek", dicText = "address", dicCode = "id")
+	@Dict(dictTable = "employ_seek", dicText = "address", dicCode = "id")
+    @ApiModelProperty(value = "关联-求职")
+    private java.lang.String seekId;
+	/**关联-用户*/
+	@Excel(name = "关联-用户", width = 15)
+    @ApiModelProperty(value = "关联-用户")
+    private java.lang.String userId;
+	/**关联-招聘*/
+	@Excel(name = "关联-招聘", width = 15, dictTable = "employ_job", dicText = "title", dicCode = "id")
+	@Dict(dictTable = "employ_job", dicText = "title", dicCode = "id")
+    @ApiModelProperty(value = "关联-招聘")
+    private java.lang.String jobId;
+	/**关联-简历*/
+	@Excel(name = "关联-简历", width = 15, dictTable = "employ_resume", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "employ_resume", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "关联-简历")
+    private java.lang.String resumeId;
+	/**关联-招聘者*/
+	@Excel(name = "关联-招聘者", width = 15, dictTable = "employ_authentication_person", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "employ_authentication_person", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "关联-招聘者")
+    private java.lang.String personId;
+	/**关联-公司*/
+	@Excel(name = "关联-公司", width = 15, dictTable = "employ_authentication_company", dicText = "company", dicCode = "id")
+	@Dict(dictTable = "employ_authentication_company", dicText = "company", dicCode = "id")
+    @ApiModelProperty(value = "关联-公司")
+    private java.lang.String companyId;
+}

module-common/src/main/java/org/jeecg/modules/employOrder/mapper/EmployOrderMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.employOrder.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.employOrder.entity.EmployOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 订单信息表
+ * @Author: jeecg-boot
+ * @Date:   2025-03-12
+ * @Version: V1.0
+ */
+public interface EmployOrderMapper extends BaseMapper<EmployOrder> {
+
+}

module-common/src/main/java/org/jeecg/modules/employOrder/mapper/xml/EmployOrderMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.employOrder.mapper.EmployOrderMapper">
+
+</mapper>

module-common/src/main/java/org/jeecg/modules/employOrder/service/IEmployOrderService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.employOrder.service;
+
+import org.jeecg.modules.employOrder.entity.EmployOrder;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 订单信息表
+ * @Author: jeecg-boot
+ * @Date:   2025-03-12
+ * @Version: V1.0
+ */
+public interface IEmployOrderService extends IService<EmployOrder> {
+
+}

module-common/src/main/java/org/jeecg/modules/employOrder/service/impl/EmployOrderServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.employOrder.service.impl;
+
+import org.jeecg.modules.employOrder.entity.EmployOrder;
+import org.jeecg.modules.employOrder.mapper.EmployOrderMapper;
+import org.jeecg.modules.employOrder.service.IEmployOrderService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 订单信息表
+ * @Author: jeecg-boot
+ * @Date:   2025-03-12
+ * @Version: V1.0
+ */
+@Service
+public class EmployOrderServiceImpl extends ServiceImpl<EmployOrderMapper, EmployOrder> implements IEmployOrderService {
+
+}

module-common/src/main/java/org/jeecg/modules/employOrder/vue/EmployOrderList.vue

@@ -0,0 +1,358 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="订单类型">
+              <j-dict-select-tag placeholder="请选择订单类型" v-model="queryParam.type" dictCode="employ_order_type"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="订单状态">
+              <j-dict-select-tag placeholder="请选择订单状态" v-model="queryParam.status" dictCode="employ_status"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="关联-招聘">
+                <j-dict-select-tag placeholder="请选择关联-招聘" v-model="queryParam.jobId" dictCode="employ_job,title,id"/>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('订单信息表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <employ-order-modal ref="modalForm" @ok="modalFormOk"></employ-order-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import EmployOrderModal from './modules/EmployOrderModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'EmployOrderList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      EmployOrderModal
+    },
+    data () {
+      return {
+        description: '订单信息表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'创建日期',
+            align:"center",
+            sorter: true,
+            dataIndex: 'createTime'
+          },
+          {
+            title:'订单类型',
+            align:"center",
+            dataIndex: 'type_dictText'
+          },
+          {
+            title:'订单状态',
+            align:"center",
+            dataIndex: 'status_dictText'
+          },
+          {
+            title:'招聘标题',
+            align:"center",
+            dataIndex: 'title'
+          },
+          {
+            title:'所属行业',
+            align:"center",
+            dataIndex: 'categoryOne'
+          },
+          {
+            title:'所属工种',
+            align:"center",
+            dataIndex: 'categoryTwo'
+          },
+          {
+            title:'师傅姓名',
+            align:"center",
+            dataIndex: 'jobName'
+          },
+          {
+            title:'师傅电话',
+            align:"center",
+            dataIndex: 'jobPhone'
+          },
+          {
+            title:'师傅出发地址',
+            align:"center",
+            dataIndex: 'jobAddress'
+          },
+          {
+            title:'支付方式',
+            align:"center",
+            dataIndex: 'payType'
+          },
+          {
+            title:'工作薪资',
+            align:"center",
+            dataIndex: 'jobMoney'
+          },
+          {
+            title:'工作时间',
+            align:"center",
+            dataIndex: 'jobTime'
+          },
+          {
+            title:'用工公司图片',
+            align:"center",
+            dataIndex: 'workHeadImg',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'用工公司名称',
+            align:"center",
+            dataIndex: 'workName'
+          },
+          {
+            title:'用工联系人',
+            align:"center",
+            dataIndex: 'workUser'
+          },
+          {
+            title:'用工联系人电话',
+            align:"center",
+            dataIndex: 'workPhone'
+          },
+          {
+            title:'用工地址',
+            align:"center",
+            dataIndex: 'workAddress'
+          },
+          {
+            title:'用工工作内容',
+            align:"center",
+            dataIndex: 'workDetails'
+          },
+          {
+            title:'保险费用',
+            align:"center",
+            dataIndex: 'premium'
+          },
+          {
+            title:'支付金额',
+            align:"center",
+            dataIndex: 'payMoney'
+          },
+          {
+            title:'师傅照片',
+            align:"center",
+            dataIndex: 'jobHeadImg',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'关联-求职',
+            align:"center",
+            dataIndex: 'seekId_dictText'
+          },
+          {
+            title:'关联-用户',
+            align:"center",
+            dataIndex: 'userId'
+          },
+          {
+            title:'关联-招聘',
+            align:"center",
+            dataIndex: 'jobId_dictText'
+          },
+          {
+            title:'关联-简历',
+            align:"center",
+            dataIndex: 'resumeId_dictText'
+          },
+          {
+            title:'关联-招聘者',
+            align:"center",
+            dataIndex: 'personId_dictText'
+          },
+          {
+            title:'关联-公司',
+            align:"center",
+            dataIndex: 'companyId_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/employOrder/employOrder/list",
+          delete: "/employOrder/employOrder/delete",
+          deleteBatch: "/employOrder/employOrder/deleteBatch",
+          exportXlsUrl: "/employOrder/employOrder/exportXls",
+          importExcelUrl: "employOrder/employOrder/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
+        fieldList.push({type:'int',value:'type',text:'订单类型',dictCode:'employ_order_type'})
+        fieldList.push({type:'int',value:'status',text:'订单状态',dictCode:'employ_status'})
+        fieldList.push({type:'string',value:'title',text:'招聘标题',dictCode:''})
+        fieldList.push({type:'string',value:'categoryOne',text:'所属行业',dictCode:''})
+        fieldList.push({type:'string',value:'categoryTwo',text:'所属工种',dictCode:''})
+        fieldList.push({type:'string',value:'jobName',text:'师傅姓名',dictCode:''})
+        fieldList.push({type:'string',value:'jobPhone',text:'师傅电话',dictCode:''})
+        fieldList.push({type:'string',value:'jobAddress',text:'师傅出发地址',dictCode:''})
+        fieldList.push({type:'string',value:'payType',text:'支付方式',dictCode:''})
+        fieldList.push({type:'string',value:'jobMoney',text:'工作薪资',dictCode:''})
+        fieldList.push({type:'string',value:'jobTime',text:'工作时间',dictCode:''})
+        fieldList.push({type:'Text',value:'workHeadImg',text:'用工公司图片',dictCode:''})
+        fieldList.push({type:'string',value:'workName',text:'用工公司名称',dictCode:''})
+        fieldList.push({type:'string',value:'workUser',text:'用工联系人',dictCode:''})
+        fieldList.push({type:'string',value:'workPhone',text:'用工联系人电话',dictCode:''})
+        fieldList.push({type:'string',value:'workAddress',text:'用工地址',dictCode:''})
+        fieldList.push({type:'string',value:'workDetails',text:'用工工作内容',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'premium',text:'保险费用',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'payMoney',text:'支付金额',dictCode:''})
+        fieldList.push({type:'Text',value:'jobHeadImg',text:'师傅照片',dictCode:''})
+        fieldList.push({type:'string',value:'seekId',text:'关联-求职',dictCode:"employ_seek,address,id"})
+        fieldList.push({type:'string',value:'userId',text:'关联-用户',dictCode:''})
+        fieldList.push({type:'string',value:'jobId',text:'关联-招聘',dictCode:"employ_job,title,id"})
+        fieldList.push({type:'string',value:'resumeId',text:'关联-简历',dictCode:"employ_resume,name,id"})
+        fieldList.push({type:'string',value:'personId',text:'关联-招聘者',dictCode:"employ_authentication_person,name,id"})
+        fieldList.push({type:'string',value:'companyId',text:'关联-公司',dictCode:"employ_authentication_company,company,id"})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

module-common/src/main/java/org/jeecg/modules/employOrder/vue/modules/EmployOrderForm.vue

@@ -0,0 +1,229 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="订单类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
+              <j-dict-select-tag type="list" v-model="model.type" dictCode="employ_order_type" placeholder="请选择订单类型" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="订单状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
+              <j-dict-select-tag type="list" v-model="model.status" dictCode="employ_status" placeholder="请选择订单状态" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="招聘标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
+              <a-input v-model="model.title" placeholder="请输入招聘标题"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="所属行业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="categoryOne">
+              <a-input v-model="model.categoryOne" placeholder="请输入所属行业"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="所属工种" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="categoryTwo">
+              <a-input v-model="model.categoryTwo" placeholder="请输入所属工种"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="师傅姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="jobName">
+              <a-input v-model="model.jobName" placeholder="请输入师傅姓名"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="师傅电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="jobPhone">
+              <a-input v-model="model.jobPhone" placeholder="请输入师傅电话"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="师傅出发地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="jobAddress">
+              <a-input v-model="model.jobAddress" placeholder="请输入师傅出发地址"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="支付方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payType">
+              <a-input v-model="model.payType" placeholder="请输入支付方式"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="工作薪资" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="jobMoney">
+              <a-input v-model="model.jobMoney" placeholder="请输入工作薪资"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="工作时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="jobTime">
+              <a-input v-model="model.jobTime" placeholder="请输入工作时间"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用工公司图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workHeadImg">
+              <j-image-upload isMultiple  v-model="model.workHeadImg" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用工公司名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workName">
+              <a-input v-model="model.workName" placeholder="请输入用工公司名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用工联系人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workUser">
+              <a-input v-model="model.workUser" placeholder="请输入用工联系人"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用工联系人电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workPhone">
+              <a-input v-model="model.workPhone" placeholder="请输入用工联系人电话"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用工地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workAddress">
+              <a-input v-model="model.workAddress" placeholder="请输入用工地址"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用工工作内容" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workDetails">
+              <a-input v-model="model.workDetails" placeholder="请输入用工工作内容"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="保险费用" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="premium">
+              <a-input-number v-model="model.premium" placeholder="请输入保险费用" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="支付金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payMoney">
+              <a-input-number v-model="model.payMoney" placeholder="请输入支付金额" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="师傅照片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="jobHeadImg">
+              <j-image-upload isMultiple  v-model="model.jobHeadImg" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关联-求职" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="seekId">
+              <j-dict-select-tag type="list" v-model="model.seekId" dictCode="employ_seek,address,id" placeholder="请选择关联-求职" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关联-用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <a-input v-model="model.userId" placeholder="请输入关联-用户"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关联-招聘" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="jobId">
+              <j-dict-select-tag type="list" v-model="model.jobId" dictCode="employ_job,title,id" placeholder="请选择关联-招聘" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关联-简历" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="resumeId">
+              <j-dict-select-tag type="list" v-model="model.resumeId" dictCode="employ_resume,name,id" placeholder="请选择关联-简历" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关联-招聘者" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="personId">
+              <j-dict-select-tag type="list" v-model="model.personId" dictCode="employ_authentication_person,name,id" placeholder="请选择关联-招聘者" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关联-公司" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyId">
+              <j-dict-select-tag type="list" v-model="model.companyId" dictCode="employ_authentication_company,company,id" placeholder="请选择关联-公司" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'EmployOrderForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/employOrder/employOrder/add",
+          edit: "/employOrder/employOrder/edit",
+          queryById: "/employOrder/employOrder/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

module-common/src/main/java/org/jeecg/modules/employOrder/vue/modules/EmployOrderModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <employ-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></employ-order-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import EmployOrderForm from './EmployOrderForm'
+
+  export default {
+    name: 'EmployOrderModal',
+    components: {
+      EmployOrderForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

module-common/src/main/java/org/jeecg/modules/employOrder/vue/modules/EmployOrderModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <employ-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></employ-order-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import EmployOrderForm from './EmployOrderForm'
+  export default {
+    name: 'EmployOrderModal',
+    components: {
+      EmployOrderForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

module-common/src/main/java/org/jeecg/modules/employOrder/vue3/EmployOrder.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/employOrder/employOrder/list',
+  save='/employOrder/employOrder/add',
+  edit='/employOrder/employOrder/edit',
+  deleteOne = '/employOrder/employOrder/delete',
+  deleteBatch = '/employOrder/employOrder/deleteBatch',
+  importExcel = '/employOrder/employOrder/importExcel',
+  exportXls = '/employOrder/employOrder/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

module-common/src/main/java/org/jeecg/modules/employOrder/vue3/EmployOrder.data.ts

@@ -0,0 +1,333 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '创建日期',
+    align:"center",
+    sorter: true,
+    dataIndex: 'createTime'
+   },
+   {
+    title: '订单类型',
+    align:"center",
+    dataIndex: 'type_dictText'
+   },
+   {
+    title: '订单状态',
+    align:"center",
+    dataIndex: 'status_dictText'
+   },
+   {
+    title: '招聘标题',
+    align:"center",
+    dataIndex: 'title'
+   },
+   {
+    title: '所属行业',
+    align:"center",
+    dataIndex: 'categoryOne'
+   },
+   {
+    title: '所属工种',
+    align:"center",
+    dataIndex: 'categoryTwo'
+   },
+   {
+    title: '师傅姓名',
+    align:"center",
+    dataIndex: 'jobName'
+   },
+   {
+    title: '师傅电话',
+    align:"center",
+    dataIndex: 'jobPhone'
+   },
+   {
+    title: '师傅出发地址',
+    align:"center",
+    dataIndex: 'jobAddress'
+   },
+   {
+    title: '支付方式',
+    align:"center",
+    dataIndex: 'payType'
+   },
+   {
+    title: '工作薪资',
+    align:"center",
+    dataIndex: 'jobMoney'
+   },
+   {
+    title: '工作时间',
+    align:"center",
+    dataIndex: 'jobTime'
+   },
+   {
+    title: '用工公司图片',
+    align:"center",
+    dataIndex: 'workHeadImg',
+    customRender:render.renderAvatar,
+   },
+   {
+    title: '用工公司名称',
+    align:"center",
+    dataIndex: 'workName'
+   },
+   {
+    title: '用工联系人',
+    align:"center",
+    dataIndex: 'workUser'
+   },
+   {
+    title: '用工联系人电话',
+    align:"center",
+    dataIndex: 'workPhone'
+   },
+   {
+    title: '用工地址',
+    align:"center",
+    dataIndex: 'workAddress'
+   },
+   {
+    title: '用工工作内容',
+    align:"center",
+    dataIndex: 'workDetails'
+   },
+   {
+    title: '保险费用',
+    align:"center",
+    dataIndex: 'premium'
+   },
+   {
+    title: '支付金额',
+    align:"center",
+    dataIndex: 'payMoney'
+   },
+   {
+    title: '师傅照片',
+    align:"center",
+    dataIndex: 'jobHeadImg',
+    customRender:render.renderAvatar,
+   },
+   {
+    title: '关联-求职',
+    align:"center",
+    dataIndex: 'seekId_dictText'
+   },
+   {
+    title: '关联-用户',
+    align:"center",
+    dataIndex: 'userId'
+   },
+   {
+    title: '关联-招聘',
+    align:"center",
+    dataIndex: 'jobId_dictText'
+   },
+   {
+    title: '关联-简历',
+    align:"center",
+    dataIndex: 'resumeId_dictText'
+   },
+   {
+    title: '关联-招聘者',
+    align:"center",
+    dataIndex: 'personId_dictText'
+   },
+   {
+    title: '关联-公司',
+    align:"center",
+    dataIndex: 'companyId_dictText'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+	{
+      label: "订单类型",
+      field: "type",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"employ_order_type"
+      },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "订单状态",
+      field: "status",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"employ_status"
+      },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "关联-招聘",
+      field: "jobId",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"employ_job,title,id"
+      },
+      colProps: {span: 6},
+ 	},
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '订单类型',
+    field: 'type',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"employ_order_type"
+     },
+  },
+  {
+    label: '订单状态',
+    field: 'status',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"employ_status"
+     },
+  },
+  {
+    label: '招聘标题',
+    field: 'title',
+    component: 'Input',
+  },
+  {
+    label: '所属行业',
+    field: 'categoryOne',
+    component: 'Input',
+  },
+  {
+    label: '所属工种',
+    field: 'categoryTwo',
+    component: 'Input',
+  },
+  {
+    label: '师傅姓名',
+    field: 'jobName',
+    component: 'Input',
+  },
+  {
+    label: '师傅电话',
+    field: 'jobPhone',
+    component: 'Input',
+  },
+  {
+    label: '师傅出发地址',
+    field: 'jobAddress',
+    component: 'Input',
+  },
+  {
+    label: '支付方式',
+    field: 'payType',
+    component: 'Input',
+  },
+  {
+    label: '工作薪资',
+    field: 'jobMoney',
+    component: 'Input',
+  },
+  {
+    label: '工作时间',
+    field: 'jobTime',
+    component: 'Input',
+  },
+  {
+    label: '用工公司图片',
+    field: 'workHeadImg',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '用工公司名称',
+    field: 'workName',
+    component: 'Input',
+  },
+  {
+    label: '用工联系人',
+    field: 'workUser',
+    component: 'Input',
+  },
+  {
+    label: '用工联系人电话',
+    field: 'workPhone',
+    component: 'Input',
+  },
+  {
+    label: '用工地址',
+    field: 'workAddress',
+    component: 'Input',
+  },
+  {
+    label: '用工工作内容',
+    field: 'workDetails',
+    component: 'Input',
+  },
+  {
+    label: '保险费用',
+    field: 'premium',
+    component: 'InputNumber',
+  },
+  {
+    label: '支付金额',
+    field: 'payMoney',
+    component: 'InputNumber',
+  },
+  {
+    label: '师傅照片',
+    field: 'jobHeadImg',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '关联-求职',
+    field: 'seekId',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"employ_seek,address,id"
+     },
+  },
+  {
+    label: '关联-用户',
+    field: 'userId',
+    component: 'Input',
+  },
+  {
+    label: '关联-招聘',
+    field: 'jobId',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"employ_job,title,id"
+     },
+  },
+  {
+    label: '关联-简历',
+    field: 'resumeId',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"employ_resume,name,id"
+     },
+  },
+  {
+    label: '关联-招聘者',
+    field: 'personId',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"employ_authentication_person,name,id"
+     },
+  },
+  {
+    label: '关联-公司',
+    field: 'companyId',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"employ_authentication_company,company,id"
+     },
+  },
+];

module-common/src/main/java/org/jeecg/modules/employOrder/vue3/EmployOrderList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <EmployOrderModal @register="registerModal" @success="handleSuccess"></EmployOrderModal>
+  </div>
+</template>
+
+<script lang="ts" name="employOrder-employOrder" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import EmployOrderModal from './components/EmployOrderModal.vue'
+  import {columns, searchFormSchema} from './employOrder.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './employOrder.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '订单信息表',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"订单信息表",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

module-common/src/main/java/org/jeecg/modules/employOrder/vue3/components/EmployOrderModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../employOrder.data';
+    import {saveOrUpdate} from '../employOrder.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

module-common/src/main/java/org/jeecg/modules/popularizeActivity/entity/PopularizeActivity.java

@@ -158,6 +158,10 @@ public class PopularizeActivity implements Serializable {
 	@Excel(name = "签到人数", width = 15)
     @ApiModelProperty(value = "签到人数")
     private java.lang.Integer doNum;
+    /**虚拟下单人数*/
+    @Excel(name = "虚拟下单人数", width = 15)
+    @ApiModelProperty(value = "虚拟下单人数")
+    private java.lang.Integer orderNum;
 
 	@TableField(exist = false)
     private List<PopularizeOrder> popularizeOrderList;

module-common/src/main/java/org/jeecg/modules/popularizeOrder/controller/PopularizeOrderController.java

@@ -1,8 +1,12 @@
 package org.jeecg.modules.popularizeOrder.controller;
 
+import java.math.BigDecimal;
 import java.util.Arrays;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.jeecg.api.service.WxMiniappPayService;
+import org.jeecg.api.wxUtils.RefundOrderReq;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.popularizeOrder.entity.PopularizeOrder;
@@ -34,6 +38,9 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class PopularizeOrderController extends JeecgController<PopularizeOrder, IPopularizeOrderService> {
 	@Autowired
 	private IPopularizeOrderService popularizeOrderService;
+
+	 @Autowired
+	 private WxMiniappPayService wxMiniappPayService;
 	
 	/**
 	 * 分页列表查询
@@ -81,7 +88,25 @@ public class PopularizeOrderController extends JeecgController<PopularizeOrder,
 	@ApiOperation(value="订单列表-编辑", notes="订单列表-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody PopularizeOrder popularizeOrder) {
-		popularizeOrderService.updateById(popularizeOrder);
+		//退款金额不能为空
+		if(popularizeOrder.getPayTuiPrice()==null){
+			return Result.error("退款金额不能为空");
+		}
+		if(popularizeOrder.getPayTuiPrice().compareTo(popularizeOrder.getPayPrice())>0){
+			return Result.error("退款金额不能大于支付金额");
+		}
+
+
+
+
+		RefundOrderReq req = new RefundOrderReq();
+		req.setOutTradeNo(popularizeOrder.getOutTradeNo());
+		req.setRefundAmount(popularizeOrder.getTuiPrice());
+		req.setTotalAmount(popularizeOrder.getPayPrice());
+		req.setTransactionId(popularizeOrder.getTransactionId());
+		wxMiniappPayService.refund(req);
+
+//		popularizeOrderService.updateById(popularizeOrder);
 		return Result.OK("编辑成功!");
 	}
 	

module-common/src/main/java/org/jeecg/modules/popularizeOrder/entity/PopularizeOrder.java

@@ -141,5 +141,16 @@ public class PopularizeOrder implements Serializable {
     @TableField(exist = false)
     private java.math.BigDecimal tuiPrice;
 
+    /**微信订单号*/
+    @Excel(name = "微信订单号", width = 15)
+    @ApiModelProperty(value = "微信订单号")
+    private String transactionId;
+
+    /**微信商户订单号*/
+    @Excel(name = "微信商户订单号", width = 15)
+    @ApiModelProperty(value = "微信商户订单号")
+    private String outTradeNo;
+
+
 
 }

module-common/src/main/java/org/jeecg/modules/popularizeTravel/entity/PopularizeTravel.java

@@ -156,6 +156,10 @@ public class PopularizeTravel implements Serializable {
 	@Excel(name = "签到人数", width = 15)
     @ApiModelProperty(value = "签到人数")
     private java.lang.Integer doNum;
+    /**虚拟下单人数*/
+    @Excel(name = "虚拟下单人数", width = 15)
+    @ApiModelProperty(value = "虚拟下单人数")
+    private java.lang.Integer orderNum;
 
     @TableField(exist = false)
     private List<PopularizeOrder> orderList;

module-common/src/main/resources/apiclient_cert.pem

@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIENDCCAxygAwIBAgIUe+VtxpWythK9HGxxCn+/oaxGsQ8wDQYJKoZIhvcNAQEL
+BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
+FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
+Q0EwHhcNMjQxMjA5MDUzNTU3WhcNMjkxMjA4MDUzNTU3WjCBjTETMBEGA1UEAwwK
+MTY1OTA2Njg3MDEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMTkwNwYDVQQL
+DDDlvq7nqIvpg6jokL3vvIjoi4/lt57vvInlm73pmYXml4XooYzmnInpmZDlhazl
+j7gxCzAJBgNVBAYTAkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAMOUPv24dTCOvyuFKWTuDIK+ZYA4f3DWe+Xq+NK0
+3RQRsaQ9gS1mEAqnKTArm49XQJcckjxrsiW/6qsLRjWb4xDrdJnwAdv57nB36IaR
+dJdfhP/LaMEcEZXEmTA8Hts3ueHtRirg5nU8HnEpe9jBiCtO2YMrEyvBtqh0mvIt
+uLr9bMLhBwotJBPAno716EdWtRZsFeLNgplf9AeP0FBjvca182GP+mlVWHjx0+R9
+jLbSkZLm04/pUMeyU1B7UUexQvPZAqv1+pRwYqX0KGeltxQCQO0fOUjY0NiJWyJ1
+ElmNqMkDjOljKfdJv12XpUb8GxWAtMBI8OiHyWKdcqSya4ECAwEAAaOBuTCBtjAJ
+BgNVHRMEAjAAMAsGA1UdDwQEAwID+DCBmwYDVR0fBIGTMIGQMIGNoIGKoIGHhoGE
+aHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1YmxpYy9pdHJ1c2NybD9DQT0xQkQ0
+MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMwMUMzRThFQkQyJnNnPUhBQ0M0NzFC
+NjU0MjJFMTJCMjdBOUQzM0E4N0FEMUNERjU5MjZFMTQwMzcxMA0GCSqGSIb3DQEB
+CwUAA4IBAQB2wKNWFtzqAwwVMH2QeF2Fx8i0utPR03D22jmaHGtsxV08vxo2tt6k
+j9Xh2X4sTwn7ZDcPWP8Yqq41m3/LxmSpcaocTUG5WAIr7Waz19pmqUnFit17XiZb
+PEHNLtz1UosdpsrEKbRBQOz3VYZBsB/IPBEVOKrcmt9oRgMFKz1LfSG/DBY2Vf9q
+yUagxC1wsSP1ZFYL6ZCkroXmmyMDaaJ9JvSYRBfmmXJ0626ag2L1FqzDHIObFM+J
+3Im6Qm0c9TzH/VsX/QdJhDJcYN6jlBn22xnWeVMnLNS5YzX7zcDuZR3m0Oakru6y
+i6bO8IWfJzS22nnM0hy1ORHieMB6Jrsq
+-----END CERTIFICATE-----

module-common/src/main/resources/apiclient_key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDDlD79uHUwjr8r
+hSlk7gyCvmWAOH9w1nvl6vjStN0UEbGkPYEtZhAKpykwK5uPV0CXHJI8a7Ilv+qr
+C0Y1m+MQ63SZ8AHb+e5wd+iGkXSXX4T/y2jBHBGVxJkwPB7bN7nh7UYq4OZ1PB5x
+KXvYwYgrTtmDKxMrwbaodJryLbi6/WzC4QcKLSQTwJ6O9ehHVrUWbBXizYKZX/QH
+j9BQY73GtfNhj/ppVVh48dPkfYy20pGS5tOP6VDHslNQe1FHsULz2QKr9fqUcGKl
+9ChnpbcUAkDtHzlI2NDYiVsidRJZjajJA4zpYyn3Sb9dl6VG/BsVgLTASPDoh8li
+nXKksmuBAgMBAAECggEAf4/cee3qeY5RP9hthEgDXu9CEpxG+tjaHL7iJcQTgfh8
+bcwzyeGMyvX2VlXK83YMScM32jLAEgEX1RHYbDTNqAZ6mcDB5bEhBLggsEyEyApk
+G9aW74UYLx/4bk54LbEuCx6QKn1fss1QaayN+3VXFDAsjHH24g5JzZuoSBbsKwDl
+WVP3wHh87x4eiXnDtR9hBG5ul5AXRhuE24ka1cpYE0N3/7cm+D+lNfvXz/A427z9
+6+El2sBTutrfIzFnJjz2KUX1RqFHXqBWVwCxUPH0SSp6l59qy/kWOkIW1nlOjo8x
+fPoLEd6y6x5YgaNSLG3ur4hhxp7h/2beVqwfmSSxJQKBgQDwuG8LTpB+xDKjmE3C
+sX82n1yvE6I0UQo4mc/5LkS/PxsKAE9zo6yX96WsFThY8S43Ep6gg6SdMVGINHBx
+vPudiWgIrhGMocJ+9PHapJQBtUAxem64gNVxSXFrfyphjO+GRtM4ji9+71fcUwFD
+lS0T0wKm5MVCbSzbUWIdGgWM5wKBgQDP/kqqP/SalLD89dQa4jaJ5jOQJTiYq7lB
+9BIsy23dQEv5mNXJS6pcOjayuE1iaiYdA0Ri0Rueu4xZ+hNaAdSHcH1Pgt/0qMI7
++SuaHjPFxffNFtePkmHg6dS9JzXwQ/xub6ZOf+E/qUf1BTv6ja0o69ApWl0RFtAF
+xL/Z6kIPVwKBgETsujbllvAFI26+ND2z7vXn6XTjzUTnk2Kjf+4cNmkAG7DgZ993
+lPqqWRCNvuWQoSf5t9vD9cVgkrTKNwwKDY2NA3HAzZuT0YnifsGY8BwRFsFUChHg
+Kb1XRxd9gNgPr6Gl8+K0q5rP0ztttOXx98c+WvsIdAbSFc7yXYJxqfcvAoGAAorI
+HNaVRcJle2IByqZTJlJS9QMPcwY+SGkUQ8nkuNyNUSqmCkTLez8W5g5Mm9RSTO56
+Sn7lyIXgTEU7MVFuaI1earddx168qQD9oG+YEGXABpit38pZOeeBuyIcjag3EJ56
+uODlPuLxxzPeLMzIfgSL0cWR96CAwGFMOvya/BcCgYBpOOie5LdFOLh0kCRWk0sg
+1/pIJYr9hXmG+QEFSELZ56mWl0ujPfZ8g7bh211RZ5FWaddD3ba7nZR6u884bRwN
+9Tg/BKz5rXd7FkKtaodxs1/ti1WLGdrC/mnCjIq0LfnVK6Zg5dbOSGdE2qQaVyPY
+ZUrwYWW/VDgsAyeMuWWdEQ==
+-----END PRIVATE KEY-----

module-common/src/main/resources/apiclient_key1.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDGTdqq3lLCX5s2
+Du4/F43kUjTDS7gzFgYfdxQFVAvY5Fb49JkApKAnTIi/Oql4MmRQEHXePxS84HA+
+Ses6/21klPX7VDBy2i5FvHVLJVpkYG1Y0Otlv0RgLN5iZrrLvOG0IU0AQs/F5sgH
+XA4k7W3QhYAlxJVBRuWqj/9PxDLNwdRMGDvfF84I29XVxrDEq9c+QfomZbZumnVg
+VIJYo7Do6GKDEYItMKGlr9nfiQ8eXbfbOnaIwlzP+TIUfsbLUDpvCjon3MhwkZw5
+jtslpxMceLV6r3Dd0pv1OvOVDEbeARiIwgSoI2+PH3pLuDMfkGDOQoH96mIcBPrO
+4wgq8ma/AgMBAAECggEBAKy5RTxNF3KcCboFOTkVEA8OF0z/1/oPNdgURQj7ErKg
++KwxiE8KFUEFpZpCwzehVMR0AeZJtYtqRfnLMquZrbPNF5AI3YY8Sc+N/fAtIdWK
+M9QHbPGbrjfC/RRifFNXOpRF6SbQCt9KS3I1mVBKybq1fU/oMUTBNuvgLrZQoxuZ
+LnyrRaYI18xJXXXXqvf5RDEaviFRNbf7+uv85hBWGbiZV12eWhXOY50hTqmvQOp1
+jG/emsKxBUN2o0S+2l7hks/tNvT3kFEPMyJDoKh6WpQcHVngegHgTMrkI9YD0Ryc
+oBCTfaD2glJYcTtWaD47Vxq2iW1tsxxbK45FHe4WLIkCgYEA7aPTQecIHL6sMxC0
+eZ0C9rsmewtaa1COQq1o50oiLW+qRlQixA9BytYZn+VNfBw+toYfL4OYH1J69z+f
+EvZ5P9/N+7IusOnIPqNk31SONR9m/Z6MhoGbouYIArR5aeZXo4Bo3MZXtq+CwbtR
+hayPCY6yLy3AWVEQ8+eclxWo+h0CgYEA1aAF7dvi34tciIP1DonjD4vFqtTH5Irh
+EIxO0gduzHV78fyrW14ezRKA25n90TinKBeBKrveOrCIq+Am/Z6MWtEbQCZMbo3D
+MHR53GfOK3WqAxF92ioVWkOrlcLNJCfVUID78L/lNRmq6+ED4IXI11FMQQ3L/OGU
+7emnTSRRrYsCgYAcR42hXxP5D7vAS/GeM1Ah+n2G0QAOm0SCrM46D/lnPM2flu2Y
+NVSYBciA3bHN3jKcV/OoHNniiFc3yytr/0bIkiKaHEcwKHH6+kjLxu0xZy5DajXA
+3/WcehFj+QQl1RKC04onE7dmdxZxZZA6/yD6ey+7K4+jUWFaFSruU9aLBQKBgERD
+RGHDl/WzBLii4hXpPeNj2KBEKjP/pPeyviUjNuaizB6BjQg/RTxmo0KJLLBEmDWZ
+fS74pYS/kIzLrenxVgxXMYwIMPhK2IqNTbt+eEUu7krYtgyW0gfsA9JxUzgwelul
+O9yslUOolhOV7bU7SvhzBBjtnbeLJhn4RfvClU8NAoGAXOQRM4SHGEKKfvrgBqf5
+KD/gyoOB/akfFaucKOZ6wCXqRGPzvfWb3DiOk8vonzhUotJIHUJ3HyfL1+LxDNuH
+FkV4NTSc8W0/GMgUX840Mf0bgAv9tCk/C22EWbSU45y7C9yb4IaOb02xqnrn0HTX
+QMF4fplSUn1iU6rG3NmO6qo=
+-----END PRIVATE KEY-----

module-common/src/main/resources/application.yml

@@ -0,0 +1,2 @@
+server:
+  port: 7002

module-common/src/main/resources/pay_alipay.properties

@@ -0,0 +1,4 @@
+alipay.appId=
+alipay.aliPubilcKey=
+alipay.appPubilcKey=
+alipay.appPrivateKey=

module-common/src/main/resources/pay_weixin.properties

@@ -0,0 +1,7 @@
+pay.mchId=
+pay.appId=
+pay.mchKey=
+pay.keyPath=
+pay.notifyUrl=
+pay.notifyUrlDev=
+

module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java

@@ -196,4 +196,6 @@ public class MpWxPayService {
         }
         return notify;
     }
+
+
 }

module-pay/src/main/resources/apiclient_cert.pem

@@ -1,28 +1,25 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDPo5Z4gvrmMdQH
-3fmBDEzaNulWjzSYNmKsZtZzbEw8h/MdTxXps/a0LHO0dfVTpEgD2O+jGYYsdfSV
-abR9VBpM9pEBQmjufIPlDd7BOjmxkqeIfuhVu1d2bAo6MVXWkY9/Wv3cLaSnZtrj
-yVFhLVJNq5tugTRsLzRmiSOSJqJ0GRKlfwiQrcnuLT64iRJSEPstWN1n9EsoyonN
-rMaG1oMtMbytvbd5YOBN/b/XozvGNInwguKC+O5ACmfoxLVqGpoP6AvrjBIIxcxz
-jzZQAWJa2FUK7iehCzaPkiAhPnaBZ0VN+eeVOVPPC5sHKp8UveiM+8W6wmdrg0gI
-UY1EumYfAgMBAAECggEAYppa0GvS3hH3kKzW2XOP42iEMnjbDxV0kk5btIBPS8d7
-qgVucIbntvQNFjuV/txa3ojcc+WhE+gH+BQ0g/e2baoBfkmdLvOuZs3JZJVT5IGy
-UV2C04OdqzzvNmdLThPdwyrgtvht4pkzhUyK+szc8sl1jGqLDHz2M2MYo0T5jIun
-8GeNL2SkJs4E/6wFYN7hFOL9TaHwEiphF6J+nDVIqlC4PhbMqZcOP3vwxoGUvgcH
-r27w371Np/aoJ3b6i/G9drTp9E8FrCesvuoK0NaTGshzOoqsRQTfANNNkxRmo++U
-2GSF+j195yM0Btx8tpiWmblChb/0uI2RqwgzIbbxsQKBgQD5FNMsOBtBrIdNnaNq
-Y9v8oBD2RkAXj9/+VlixHT3RN7/DAF+RJktAffwJ/DtZQIlA8g4UN1i29mAPEdhV
-Bm2diJVPatV0MxihyR87fU+G5I3Jly1zBGdlzSjNYBqnnAzbefDEhH2s1zYKNh05
-/89wJAhdPGXfTdogNHmNp2guKwKBgQDVaBLRHk2SYOu/JQ4/1dLtk3MWD/WITf4t
-add6lS1Tg8E3j4hoOcBsgz4zMkyQtm7P7KaVz+0qAEXxeXhce5f7nr8x48rA0SyT
-QkLB1AQQuHIko6j1oVohKOrf53jIKh4+h0daYpVA5gZVn75InKlEF4zuM8Af4C33
-PduIwQUh3QKBgBJlH1NcsWagPz3ULoVk6pI1oAsQFRuoXHqEFfi+mBoja94S4Pvv
-QA97PmneXuOwiHJrbe7AR6T7fQyf3MIqv12rAJvk3+6890y7dbsG/iCQMIh6ybh8
-0sYJ6MGCH3XRaIGs98MLpdxl6G/In0/xPHijsJpyI3PiZAGM3o0/l8oRAoGBANTE
-r8YZPWQNB96Klntkt6kw0pSTksy0XhBvL2xDYW6btT+s9mZb9hL6g0BODPJXQYJC
-wxAov5+ZqCKKZktm2m//pUabg6Hcq2GitaZEuUzmaL9JAQLtPUxEXHCietSu0Xqs
-K6LdGUwcSwKBgxkoQMbn6BXyOMJPI+UWolPlhjVtAoGBAI1ihRUL/oUYNao/a69B
-gDCeeJmPPdFjixwAjiu3hUKJRs3F/Nigpewo7nQgska5mgaRx6u/3IpUoxLWh9sN
-yVRFkdweg5uc5OdIiCfyuPLGopk3fjW1qKp8wVPw2I5NxEhvT/aNKOsokGrtXqRg
-Cy2h60ovFhbrbwqFPCVLQlvS
------END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIENDCCAxygAwIBAgIUe+VtxpWythK9HGxxCn+/oaxGsQ8wDQYJKoZIhvcNAQEL
+BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
+FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
+Q0EwHhcNMjQxMjA5MDUzNTU3WhcNMjkxMjA4MDUzNTU3WjCBjTETMBEGA1UEAwwK
+MTY1OTA2Njg3MDEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMTkwNwYDVQQL
+DDDlvq7nqIvpg6jokL3vvIjoi4/lt57vvInlm73pmYXml4XooYzmnInpmZDlhazl
+j7gxCzAJBgNVBAYTAkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAMOUPv24dTCOvyuFKWTuDIK+ZYA4f3DWe+Xq+NK0
+3RQRsaQ9gS1mEAqnKTArm49XQJcckjxrsiW/6qsLRjWb4xDrdJnwAdv57nB36IaR
+dJdfhP/LaMEcEZXEmTA8Hts3ueHtRirg5nU8HnEpe9jBiCtO2YMrEyvBtqh0mvIt
+uLr9bMLhBwotJBPAno716EdWtRZsFeLNgplf9AeP0FBjvca182GP+mlVWHjx0+R9
+jLbSkZLm04/pUMeyU1B7UUexQvPZAqv1+pRwYqX0KGeltxQCQO0fOUjY0NiJWyJ1
+ElmNqMkDjOljKfdJv12XpUb8GxWAtMBI8OiHyWKdcqSya4ECAwEAAaOBuTCBtjAJ
+BgNVHRMEAjAAMAsGA1UdDwQEAwID+DCBmwYDVR0fBIGTMIGQMIGNoIGKoIGHhoGE
+aHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1YmxpYy9pdHJ1c2NybD9DQT0xQkQ0
+MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMwMUMzRThFQkQyJnNnPUhBQ0M0NzFC
+NjU0MjJFMTJCMjdBOUQzM0E4N0FEMUNERjU5MjZFMTQwMzcxMA0GCSqGSIb3DQEB
+CwUAA4IBAQB2wKNWFtzqAwwVMH2QeF2Fx8i0utPR03D22jmaHGtsxV08vxo2tt6k
+j9Xh2X4sTwn7ZDcPWP8Yqq41m3/LxmSpcaocTUG5WAIr7Waz19pmqUnFit17XiZb
+PEHNLtz1UosdpsrEKbRBQOz3VYZBsB/IPBEVOKrcmt9oRgMFKz1LfSG/DBY2Vf9q
+yUagxC1wsSP1ZFYL6ZCkroXmmyMDaaJ9JvSYRBfmmXJ0626ag2L1FqzDHIObFM+J
+3Im6Qm0c9TzH/VsX/QdJhDJcYN6jlBn22xnWeVMnLNS5YzX7zcDuZR3m0Oakru6y
+i6bO8IWfJzS22nnM0hy1ORHieMB6Jrsq
+-----END CERTIFICATE-----

module-pay/src/main/resources/apiclient_key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDDlD79uHUwjr8r
+hSlk7gyCvmWAOH9w1nvl6vjStN0UEbGkPYEtZhAKpykwK5uPV0CXHJI8a7Ilv+qr
+C0Y1m+MQ63SZ8AHb+e5wd+iGkXSXX4T/y2jBHBGVxJkwPB7bN7nh7UYq4OZ1PB5x
+KXvYwYgrTtmDKxMrwbaodJryLbi6/WzC4QcKLSQTwJ6O9ehHVrUWbBXizYKZX/QH
+j9BQY73GtfNhj/ppVVh48dPkfYy20pGS5tOP6VDHslNQe1FHsULz2QKr9fqUcGKl
+9ChnpbcUAkDtHzlI2NDYiVsidRJZjajJA4zpYyn3Sb9dl6VG/BsVgLTASPDoh8li
+nXKksmuBAgMBAAECggEAf4/cee3qeY5RP9hthEgDXu9CEpxG+tjaHL7iJcQTgfh8
+bcwzyeGMyvX2VlXK83YMScM32jLAEgEX1RHYbDTNqAZ6mcDB5bEhBLggsEyEyApk
+G9aW74UYLx/4bk54LbEuCx6QKn1fss1QaayN+3VXFDAsjHH24g5JzZuoSBbsKwDl
+WVP3wHh87x4eiXnDtR9hBG5ul5AXRhuE24ka1cpYE0N3/7cm+D+lNfvXz/A427z9
+6+El2sBTutrfIzFnJjz2KUX1RqFHXqBWVwCxUPH0SSp6l59qy/kWOkIW1nlOjo8x
+fPoLEd6y6x5YgaNSLG3ur4hhxp7h/2beVqwfmSSxJQKBgQDwuG8LTpB+xDKjmE3C
+sX82n1yvE6I0UQo4mc/5LkS/PxsKAE9zo6yX96WsFThY8S43Ep6gg6SdMVGINHBx
+vPudiWgIrhGMocJ+9PHapJQBtUAxem64gNVxSXFrfyphjO+GRtM4ji9+71fcUwFD
+lS0T0wKm5MVCbSzbUWIdGgWM5wKBgQDP/kqqP/SalLD89dQa4jaJ5jOQJTiYq7lB
+9BIsy23dQEv5mNXJS6pcOjayuE1iaiYdA0Ri0Rueu4xZ+hNaAdSHcH1Pgt/0qMI7
++SuaHjPFxffNFtePkmHg6dS9JzXwQ/xub6ZOf+E/qUf1BTv6ja0o69ApWl0RFtAF
+xL/Z6kIPVwKBgETsujbllvAFI26+ND2z7vXn6XTjzUTnk2Kjf+4cNmkAG7DgZ993
+lPqqWRCNvuWQoSf5t9vD9cVgkrTKNwwKDY2NA3HAzZuT0YnifsGY8BwRFsFUChHg
+Kb1XRxd9gNgPr6Gl8+K0q5rP0ztttOXx98c+WvsIdAbSFc7yXYJxqfcvAoGAAorI
+HNaVRcJle2IByqZTJlJS9QMPcwY+SGkUQ8nkuNyNUSqmCkTLez8W5g5Mm9RSTO56
+Sn7lyIXgTEU7MVFuaI1earddx168qQD9oG+YEGXABpit38pZOeeBuyIcjag3EJ56
+uODlPuLxxzPeLMzIfgSL0cWR96CAwGFMOvya/BcCgYBpOOie5LdFOLh0kCRWk0sg
+1/pIJYr9hXmG+QEFSELZ56mWl0ujPfZ8g7bh211RZ5FWaddD3ba7nZR6u884bRwN
+9Tg/BKz5rXd7FkKtaodxs1/ti1WLGdrC/mnCjIq0LfnVK6Zg5dbOSGdE2qQaVyPY
+ZUrwYWW/VDgsAyeMuWWdEQ==
+-----END PRIVATE KEY-----

module-pay/src/main/resources/apiclient_key1.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDGTdqq3lLCX5s2
+Du4/F43kUjTDS7gzFgYfdxQFVAvY5Fb49JkApKAnTIi/Oql4MmRQEHXePxS84HA+
+Ses6/21klPX7VDBy2i5FvHVLJVpkYG1Y0Otlv0RgLN5iZrrLvOG0IU0AQs/F5sgH
+XA4k7W3QhYAlxJVBRuWqj/9PxDLNwdRMGDvfF84I29XVxrDEq9c+QfomZbZumnVg
+VIJYo7Do6GKDEYItMKGlr9nfiQ8eXbfbOnaIwlzP+TIUfsbLUDpvCjon3MhwkZw5
+jtslpxMceLV6r3Dd0pv1OvOVDEbeARiIwgSoI2+PH3pLuDMfkGDOQoH96mIcBPrO
+4wgq8ma/AgMBAAECggEBAKy5RTxNF3KcCboFOTkVEA8OF0z/1/oPNdgURQj7ErKg
++KwxiE8KFUEFpZpCwzehVMR0AeZJtYtqRfnLMquZrbPNF5AI3YY8Sc+N/fAtIdWK
+M9QHbPGbrjfC/RRifFNXOpRF6SbQCt9KS3I1mVBKybq1fU/oMUTBNuvgLrZQoxuZ
+LnyrRaYI18xJXXXXqvf5RDEaviFRNbf7+uv85hBWGbiZV12eWhXOY50hTqmvQOp1
+jG/emsKxBUN2o0S+2l7hks/tNvT3kFEPMyJDoKh6WpQcHVngegHgTMrkI9YD0Ryc
+oBCTfaD2glJYcTtWaD47Vxq2iW1tsxxbK45FHe4WLIkCgYEA7aPTQecIHL6sMxC0
+eZ0C9rsmewtaa1COQq1o50oiLW+qRlQixA9BytYZn+VNfBw+toYfL4OYH1J69z+f
+EvZ5P9/N+7IusOnIPqNk31SONR9m/Z6MhoGbouYIArR5aeZXo4Bo3MZXtq+CwbtR
+hayPCY6yLy3AWVEQ8+eclxWo+h0CgYEA1aAF7dvi34tciIP1DonjD4vFqtTH5Irh
+EIxO0gduzHV78fyrW14ezRKA25n90TinKBeBKrveOrCIq+Am/Z6MWtEbQCZMbo3D
+MHR53GfOK3WqAxF92ioVWkOrlcLNJCfVUID78L/lNRmq6+ED4IXI11FMQQ3L/OGU
+7emnTSRRrYsCgYAcR42hXxP5D7vAS/GeM1Ah+n2G0QAOm0SCrM46D/lnPM2flu2Y
+NVSYBciA3bHN3jKcV/OoHNniiFc3yytr/0bIkiKaHEcwKHH6+kjLxu0xZy5DajXA
+3/WcehFj+QQl1RKC04onE7dmdxZxZZA6/yD6ey+7K4+jUWFaFSruU9aLBQKBgERD
+RGHDl/WzBLii4hXpPeNj2KBEKjP/pPeyviUjNuaizB6BjQg/RTxmo0KJLLBEmDWZ
+fS74pYS/kIzLrenxVgxXMYwIMPhK2IqNTbt+eEUu7krYtgyW0gfsA9JxUzgwelul
+O9yslUOolhOV7bU7SvhzBBjtnbeLJhn4RfvClU8NAoGAXOQRM4SHGEKKfvrgBqf5
+KD/gyoOB/akfFaucKOZ6wCXqRGPzvfWb3DiOk8vonzhUotJIHUJ3HyfL1+LxDNuH
+FkV4NTSc8W0/GMgUX840Mf0bgAv9tCk/C22EWbSU45y7C9yb4IaOb02xqnrn0HTX
+QMF4fplSUn1iU6rG3NmO6qo=
+-----END PRIVATE KEY-----

module-system/pom.xml

@@ -83,6 +83,7 @@
 
 
 
+
     </dependencies>
 
 	<build>

module-system/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java

@@ -371,6 +371,91 @@ public class SysAnnouncementController {
 		sysMsgMap.put("sysMsgTotal", sysMsgList.getTotal());
 		sysMsgMap.put("anntMsgList", anntMsgList.getRecords());
 		sysMsgMap.put("anntMsgTotal", anntMsgList.getTotal());
+
+
+
+
+
+		//统计数据信息 //用户
+		Map<Object, Object> openIdUserData = new HashMap();
+		openIdUserData.put("1", 100);
+		openIdUserData.put("2", 100);
+		openIdUserData.put("3", 100);
+		openIdUserData.put("4", 100);
+		openIdUserData.put("5", 100);
+		openIdUserData.put("6", 100);
+		openIdUserData.put("7", 100);
+		openIdUserData.put("8", 100);
+		openIdUserData.put("9", 100);
+		openIdUserData.put("10", 100);
+		openIdUserData.put("11", 100);
+		openIdUserData.put("12", 100);
+
+		sysMsgMap.put("openIdUserToday", 1);
+		sysMsgMap.put("openIdUserTotal", 100);
+		sysMsgMap.put("openIdUserData", openIdUserData);
+
+
+
+		Map<Object, Object> openIdOpenUserData = new HashMap();
+		openIdOpenUserData.put("1", 200);
+		openIdOpenUserData.put("2", 100);
+		openIdOpenUserData.put("3", 100);
+		openIdOpenUserData.put("4", 100);
+		openIdOpenUserData.put("5", 100);
+		openIdOpenUserData.put("6", 100);
+		openIdOpenUserData.put("7", 100);
+		openIdOpenUserData.put("8", 100);
+		openIdOpenUserData.put("9", 100);
+		openIdOpenUserData.put("10", 100);
+		openIdOpenUserData.put("11", 100);
+		openIdOpenUserData.put("12", 100);
+
+		sysMsgMap.put("openIdOpenUserToday", 2);
+		sysMsgMap.put("openIdOpenUserTotal", 100);
+		sysMsgMap.put("openIdOpenUserData", openIdOpenUserData);
+
+
+
+		Map<Object, Object> openIdAdminUserData = new HashMap();
+		openIdAdminUserData.put("1", 100);
+		openIdAdminUserData.put("2", 100);
+		openIdAdminUserData.put("3", 100);
+		openIdAdminUserData.put("4", 100);
+		openIdAdminUserData.put("5", 100);
+		openIdAdminUserData.put("6", 100);
+		openIdAdminUserData.put("7", 100);
+		openIdAdminUserData.put("8", 100);
+		openIdAdminUserData.put("9", 100);
+		openIdAdminUserData.put("10", 100);
+		openIdAdminUserData.put("11", 100);
+		openIdAdminUserData.put("12", 300);
+
+		sysMsgMap.put("openIdAdminUserToday", 1);
+		sysMsgMap.put("openIdAdminUserTotal", 300);
+		sysMsgMap.put("openIdAdminUserData", openIdAdminUserData);
+
+
+
+		Map<Object, Object> openIdMoneyData = new HashMap();
+		openIdMoneyData.put("1", 100);
+		openIdMoneyData.put("2", 100);
+		openIdMoneyData.put("3", 100);
+		openIdMoneyData.put("4", 100);
+		openIdMoneyData.put("5", 100);
+		openIdMoneyData.put("6", 100);
+		openIdMoneyData.put("7", 100);
+		openIdMoneyData.put("8", 100);
+		openIdMoneyData.put("9", 100);
+		openIdMoneyData.put("10", 1000000);
+		openIdMoneyData.put("11", 1000000);
+		openIdMoneyData.put("12", 10000);
+
+		sysMsgMap.put("openIdMoneyUserToday", 100);
+		sysMsgMap.put("openIdMoneyUserTotal", 10000);
+		sysMsgMap.put("openIdMoneyData", openIdMoneyData);
+
+
 		result.setSuccess(true);
 		result.setResult(sysMsgMap);
 		return result;

module-system/src/main/resources/apiclient_cert.pem

@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIENDCCAxygAwIBAgIUe+VtxpWythK9HGxxCn+/oaxGsQ8wDQYJKoZIhvcNAQEL
+BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
+FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
+Q0EwHhcNMjQxMjA5MDUzNTU3WhcNMjkxMjA4MDUzNTU3WjCBjTETMBEGA1UEAwwK
+MTY1OTA2Njg3MDEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMTkwNwYDVQQL
+DDDlvq7nqIvpg6jokL3vvIjoi4/lt57vvInlm73pmYXml4XooYzmnInpmZDlhazl
+j7gxCzAJBgNVBAYTAkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAMOUPv24dTCOvyuFKWTuDIK+ZYA4f3DWe+Xq+NK0
+3RQRsaQ9gS1mEAqnKTArm49XQJcckjxrsiW/6qsLRjWb4xDrdJnwAdv57nB36IaR
+dJdfhP/LaMEcEZXEmTA8Hts3ueHtRirg5nU8HnEpe9jBiCtO2YMrEyvBtqh0mvIt
+uLr9bMLhBwotJBPAno716EdWtRZsFeLNgplf9AeP0FBjvca182GP+mlVWHjx0+R9
+jLbSkZLm04/pUMeyU1B7UUexQvPZAqv1+pRwYqX0KGeltxQCQO0fOUjY0NiJWyJ1
+ElmNqMkDjOljKfdJv12XpUb8GxWAtMBI8OiHyWKdcqSya4ECAwEAAaOBuTCBtjAJ
+BgNVHRMEAjAAMAsGA1UdDwQEAwID+DCBmwYDVR0fBIGTMIGQMIGNoIGKoIGHhoGE
+aHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1YmxpYy9pdHJ1c2NybD9DQT0xQkQ0
+MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMwMUMzRThFQkQyJnNnPUhBQ0M0NzFC
+NjU0MjJFMTJCMjdBOUQzM0E4N0FEMUNERjU5MjZFMTQwMzcxMA0GCSqGSIb3DQEB
+CwUAA4IBAQB2wKNWFtzqAwwVMH2QeF2Fx8i0utPR03D22jmaHGtsxV08vxo2tt6k
+j9Xh2X4sTwn7ZDcPWP8Yqq41m3/LxmSpcaocTUG5WAIr7Waz19pmqUnFit17XiZb
+PEHNLtz1UosdpsrEKbRBQOz3VYZBsB/IPBEVOKrcmt9oRgMFKz1LfSG/DBY2Vf9q
+yUagxC1wsSP1ZFYL6ZCkroXmmyMDaaJ9JvSYRBfmmXJ0626ag2L1FqzDHIObFM+J
+3Im6Qm0c9TzH/VsX/QdJhDJcYN6jlBn22xnWeVMnLNS5YzX7zcDuZR3m0Oakru6y
+i6bO8IWfJzS22nnM0hy1ORHieMB6Jrsq
+-----END CERTIFICATE-----

module-system/src/main/resources/apiclient_key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDDlD79uHUwjr8r
+hSlk7gyCvmWAOH9w1nvl6vjStN0UEbGkPYEtZhAKpykwK5uPV0CXHJI8a7Ilv+qr
+C0Y1m+MQ63SZ8AHb+e5wd+iGkXSXX4T/y2jBHBGVxJkwPB7bN7nh7UYq4OZ1PB5x
+KXvYwYgrTtmDKxMrwbaodJryLbi6/WzC4QcKLSQTwJ6O9ehHVrUWbBXizYKZX/QH
+j9BQY73GtfNhj/ppVVh48dPkfYy20pGS5tOP6VDHslNQe1FHsULz2QKr9fqUcGKl
+9ChnpbcUAkDtHzlI2NDYiVsidRJZjajJA4zpYyn3Sb9dl6VG/BsVgLTASPDoh8li
+nXKksmuBAgMBAAECggEAf4/cee3qeY5RP9hthEgDXu9CEpxG+tjaHL7iJcQTgfh8
+bcwzyeGMyvX2VlXK83YMScM32jLAEgEX1RHYbDTNqAZ6mcDB5bEhBLggsEyEyApk
+G9aW74UYLx/4bk54LbEuCx6QKn1fss1QaayN+3VXFDAsjHH24g5JzZuoSBbsKwDl
+WVP3wHh87x4eiXnDtR9hBG5ul5AXRhuE24ka1cpYE0N3/7cm+D+lNfvXz/A427z9
+6+El2sBTutrfIzFnJjz2KUX1RqFHXqBWVwCxUPH0SSp6l59qy/kWOkIW1nlOjo8x
+fPoLEd6y6x5YgaNSLG3ur4hhxp7h/2beVqwfmSSxJQKBgQDwuG8LTpB+xDKjmE3C
+sX82n1yvE6I0UQo4mc/5LkS/PxsKAE9zo6yX96WsFThY8S43Ep6gg6SdMVGINHBx
+vPudiWgIrhGMocJ+9PHapJQBtUAxem64gNVxSXFrfyphjO+GRtM4ji9+71fcUwFD
+lS0T0wKm5MVCbSzbUWIdGgWM5wKBgQDP/kqqP/SalLD89dQa4jaJ5jOQJTiYq7lB
+9BIsy23dQEv5mNXJS6pcOjayuE1iaiYdA0Ri0Rueu4xZ+hNaAdSHcH1Pgt/0qMI7
++SuaHjPFxffNFtePkmHg6dS9JzXwQ/xub6ZOf+E/qUf1BTv6ja0o69ApWl0RFtAF
+xL/Z6kIPVwKBgETsujbllvAFI26+ND2z7vXn6XTjzUTnk2Kjf+4cNmkAG7DgZ993
+lPqqWRCNvuWQoSf5t9vD9cVgkrTKNwwKDY2NA3HAzZuT0YnifsGY8BwRFsFUChHg
+Kb1XRxd9gNgPr6Gl8+K0q5rP0ztttOXx98c+WvsIdAbSFc7yXYJxqfcvAoGAAorI
+HNaVRcJle2IByqZTJlJS9QMPcwY+SGkUQ8nkuNyNUSqmCkTLez8W5g5Mm9RSTO56
+Sn7lyIXgTEU7MVFuaI1earddx168qQD9oG+YEGXABpit38pZOeeBuyIcjag3EJ56
+uODlPuLxxzPeLMzIfgSL0cWR96CAwGFMOvya/BcCgYBpOOie5LdFOLh0kCRWk0sg
+1/pIJYr9hXmG+QEFSELZ56mWl0ujPfZ8g7bh211RZ5FWaddD3ba7nZR6u884bRwN
+9Tg/BKz5rXd7FkKtaodxs1/ti1WLGdrC/mnCjIq0LfnVK6Zg5dbOSGdE2qQaVyPY
+ZUrwYWW/VDgsAyeMuWWdEQ==
+-----END PRIVATE KEY-----

module-system/src/main/resources/application-dev.yml

@@ -349,4 +349,53 @@ wechat-dm:
   notifyUrl:
 
 
+### 微信商户
+#wx:
+#  miniapp:
+#    appid: wx797abcfb479c75ec # 微信小程序appid
+#    secret: c4565acc18698a7000be1b2bb748be81 # 微信小程序密钥
+#    merchantId: 1659066870 # 商户号
+#    privateKeyPath: E:\\git_java\\api_java\\popularize-admin\\popularize-admin\\popularize-admin\\module-pay\\src\\main\\resources\\apiclient_key.pem
+#    merchantSerialNumber: 7BE56DC695B2B612BD1C6C710A7FBFA1AC46B10F  # 商户API证书序列号
+#    apiV3Key: vtribevtribevtribevtribevtribe12 # 商户APIV3密钥
+#    payNotifyUrl: http://h5.xzaiyp.top/popularize-admin/order_pay/refundNotify # 支付通知地址（测试环境）
+#    refundNotifyUrl: http://h5.xzaiyp.top/popularize-admin/order_pay/refundNotify # 退款通知地址（测试环境）
+
+
+## 微信商户
+wx:
+  miniapp:
+    appid: wx797abcfb479c75ec # 微信小程序appid
+    secret: c4565acc18698a7000be1b2bb748be81 # 微信小程序密钥
+    merchantId: 1659066870 # 商户号
+    privateKeyPath: /root/api/pem/apiclient_key.pem
+    merchantSerialNumber: 7BE56DC695B2B612BD1C6C710A7FBFA1AC46B10F  # 商户API证书序列号
+    apiV3Key: vtribevtribevtribevtribevtribe12 # 商户APIV3密钥
+    payNotifyUrl: https://popularize-admin.hhlm1688.com/popularize-admin/order_pay/refundNotify # 支付通知地址（测试环境）
+    refundNotifyUrl: https://popularize-admin.hhlm1688.com/popularize-admin/order_pay/refundNotify # 退款通知地址（测试环境）
+
+
+#wxpay:
+#  #应用编号
+#  appId: wx3c24e397e3b132ea
+#  #商户号
+#  mchId: 1684030364
+#  # APIv2密钥
+#  apiKey: 0fdb77429ffdf206c151af76a663041c
+#  # APIv3密钥
+#  apiV3Key: 0fdb77429ffdf206c151af76a663041c
+#  # 微信支付V3-url前缀
+#  baseUrl: https://api.mch.weixin.qq.com/v3
+#  # 支付通知回调, pjm6m9.natappfree.cc 为内网穿透地址
+#  notifyUrl: https://admin.ytonggao.com/a-notice-api/hanHaiWater/hanHaiWater/withdrawal/notify
+#  # 退款通知回调, pjm6m9.natappfree.cc 为内网穿透地址
+#  refundNotifyUrl: https://admin.ytonggao.com/a-notice-api/hanHaiWater/hanHaiWater/withdrawal/notify
+#  # 密钥路径,resources根目录下
+#  keyPemPath: apiclient_key.pem
+#  #商户证书序列号
+#  serialNo: 2B56BA25B8D847A8A5099677B67F4994358A1B58
+#  #转账到零钱
+#  transferBatchUrl: https://api.mch.weixin.qq.com/v3/fund-app/mch-transfer/transfer-bills
+#  withdrawalNotifyUrl: https://admin.ytonggao.com/a-notice-api/hanHaiWater/hanHaiWater/withdrawal/notify
+
 

module-system/src/main/resources/pay_weixin.properties

@@ -3,8 +3,8 @@ pay.appId=wx797abcfb479c75ec
 pay.mchKey=vtribevtribevtribevtribevtribe12
 pay.keyPath=classpath:apiclient_cert.pem
 pay.notifyUrl=https://popularize-admin.hhlm1688.com/popularize-admin/order_common/payNotify
-pay.notifyUrlDev=https://popularize-admin.hhlm1688.com//popularize-admin/order_common/payNotify
-pay.notifyOneUrl=https://popularize-admin.hhlm1688.com//popularize-admin/order_common/payNotify
-pay.notifyUrlOneDev=https://popularize-admin.hhlm1688.com//popularize-admin/order_common/payNotify
+pay.notifyUrlDev=https://popularize-admin.hhlm1688.com/popularize-admin/order_common/payNotify
+pay.notifyOneUrl=https://popularize-admin.hhlm1688.com/popularize-admin/order_common/payNotify
+pay.notifyUrlOneDev=https://popularize-admin.hhlm1688.com/popularize-admin/order_common/payNotify