优化

MrShi

2025-08-21 907ec8bf7687f8feaf4efbad3c98c585c31fc0e8

优化

 .idea/jarRepositories.xml

@@ -7,6 +7,11 @@
      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="nexus" />
      <option name="name" value="Nexus" />
      <option name="url" value="http://47.97.118.181:8089/nexus/content/groups/public/" />
    </remote-repository>
    <remote-repository>
      <option name="id" value="central" />
      <option name="name" value="Maven Central repository" />
      <option name="url" value="https://repo1.maven.org/maven2" />

 .idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_0_2_12.xml

ÎļþÒÑɾ³ý

 .idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_0_2_15.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
<component name="libraryTable">
  <library name="Maven: com.github.wechatpay-apiv3:wechatpay-java:0.2.15">
    <CLASSES>
<<<<<<< HEAD:.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_0_2_12.xml
      <root url="jar://$PROJECT_DIR$/../../maven/repository/com/github/wechatpay-apiv3/wechatpay-java/0.2.12/wechatpay-java-0.2.12.jar!/" />
    </CLASSES>
    <SOURCES>
      <root url="jar://$PROJECT_DIR$/../../maven/repository/com/github/wechatpay-apiv3/wechatpay-java/0.2.12/wechatpay-java-0.2.12-sources.jar!/" />
=======
      <root url="jar://$PROJECT_DIR$/../../../maven/repository/com/github/wechatpay-apiv3/wechatpay-java/0.2.15/wechatpay-java-0.2.15.jar!/" />
    </CLASSES>
    <JAVADOC>
      <root url="jar://$PROJECT_DIR$/../../../maven/repository/com/github/wechatpay-apiv3/wechatpay-java/0.2.15/wechatpay-java-0.2.15-javadoc.jar!/" />
    </JAVADOC>
    <SOURCES>
      <root url="jar://$PROJECT_DIR$/../../../maven/repository/com/github/wechatpay-apiv3/wechatpay-java/0.2.15/wechatpay-java-0.2.15-sources.jar!/" />
>>>>>>> 6f806bd04000f63bdb165abe749c08e21210762c:.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_0_2_15.xml
    </SOURCES>
  </library>
</component>

 .idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_core_0_2_12.xml

ÎļþÒÑɾ³ý

 .idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_core_0_2_15.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
<component name="libraryTable">
  <library name="Maven: com.github.wechatpay-apiv3:wechatpay-java-core:0.2.15">
    <CLASSES>
<<<<<<< HEAD:.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_core_0_2_12.xml
      <root url="jar://$PROJECT_DIR$/../../maven/repository/com/github/wechatpay-apiv3/wechatpay-java-core/0.2.12/wechatpay-java-core-0.2.12.jar!/" />
    </CLASSES>
    <SOURCES>
      <root url="jar://$PROJECT_DIR$/../../maven/repository/com/github/wechatpay-apiv3/wechatpay-java-core/0.2.12/wechatpay-java-core-0.2.12-sources.jar!/" />
=======
      <root url="jar://$PROJECT_DIR$/../../../maven/repository/com/github/wechatpay-apiv3/wechatpay-java-core/0.2.15/wechatpay-java-core-0.2.15.jar!/" />
    </CLASSES>
    <JAVADOC>
      <root url="jar://$PROJECT_DIR$/../../../maven/repository/com/github/wechatpay-apiv3/wechatpay-java-core/0.2.15/wechatpay-java-core-0.2.15-javadoc.jar!/" />
    </JAVADOC>
    <SOURCES>
      <root url="jar://$PROJECT_DIR$/../../../maven/repository/com/github/wechatpay-apiv3/wechatpay-java-core/0.2.15/wechatpay-java-core-0.2.15-sources.jar!/" />
>>>>>>> 6f806bd04000f63bdb165abe749c08e21210762c:.idea/libraries/Maven__com_github_wechatpay_apiv3_wechatpay_java_core_0_2_15.xml
    </SOURCES>
  </library>
</component>

 admin/src/components/business/OperaCategoryWindow.vue

@@ -115,6 +115,7 @@
        name: '',
        detail: null,
        type: type,
        remark: null,
        detailList: [''],
        icon: '',
        iconFull: '',

 admin/src/components/business/OperaMemberDetailWindow.vue

 admin/src/views/business/categoryFee.vue

@@ -2,7 +2,7 @@
  <TableLayout :permissions="['business:category:query']">
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:category:create', 'business:category:delete']">
        <li><el-button type="primary" @click="$refs.operaCategoryWindow.open('新建餐标配置',null,searchForm.type)" icon="el-icon-plus" v-permissions="['business:category:create']">新建</el-button></li>
        <li><el-button type="primary" @click="$refs.operaCategoryWindow.open('新建手续费配置',null,searchForm.type)" icon="el-icon-plus" v-permissions="['business:category:create']">新建</el-button></li>
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:category:delete']">删除</el-button></li>
      </ul>
      <el-table
@@ -42,7 +42,7 @@
          fixed="right"
        >
          <template slot-scope="{row}">
            <el-button type="text"   @click="$refs.operaCategoryWindow.open('编辑餐标配置', row,searchForm.type)" icon="el-icon-edit" v-permissions="['business:category:update']">编辑</el-button>
            <el-button type="text"   @click="$refs.operaCategoryWindow.open('编辑手续费配置', row,searchForm.type)" icon="el-icon-edit" v-permissions="['business:category:update']">编辑</el-button>
            <el-button type="text"   @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:category:delete']">删除</el-button>
          </template>
        </el-table-column>

 admin/src/views/business/member.vue

@@ -66,7 +66,7 @@
        <el-table-column prop="createTime" label="注册时间" min-width="100px"></el-table-column>
        <el-table-column prop="autoReciveStatus" label="接受自动派单" min-width="100px">
            <template slot-scope="{row}">
              {{row.autoReciveStatus ==1?"是":"否"}}
              {{row.autoReceiveStatus ==1?"是":"否"}}
            </template>
        </el-table-column>
<!--        <el-table-column label="状态">
@@ -134,6 +134,17 @@
    this.search()
  },
  methods: {
    reset () {
      this.searchForm = {
        type: 0,
        startTime: '',
        endTime: '',
        telephone: '',
        name: '',
        status: ''
      }
      this.search()
    },
    openDetail (row) {
      this.$refs.OperaMemberDetailWindow.open('用户详情', row.id)
    },

 admin/src/views/business/orders.vue

@@ -3,13 +3,13 @@
    <!-- æœç´¢è¡¨å• -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="订单号" prop="releaseMemberId">
        <el-input v-model="searchForm.code" style="width: 120px"  placeholder="请输入订单号" @keypress.enter.native="search"></el-input>
        <el-input v-model="searchForm.code" style="width: 120px"  clearable placeholder="请输入订单号" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="接单方" prop="acceptName">
        <el-input v-model="searchForm.acceptName" style="width: 120px"  placeholder="请输入接单方" @keypress.enter.native="search"></el-input>
        <el-input v-model="searchForm.acceptName" style="width: 120px"  clearable placeholder="请输入名称" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="发单方" prop="releaseName">
        <el-input v-model="searchForm.releaseName" style="width: 120px"  placeholder="请输入发单方" @keypress.enter.native="search"></el-input>
        <el-input v-model="searchForm.releaseName" style="width: 120px"  clearable placeholder="请输入名称" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="订单类型" prop="type">
        <el-select v-model="searchForm.type"  style="width: 120px"  @keypress.enter.native="search" clearable placeholder="订单类型">
@@ -19,7 +19,7 @@
        </el-select>
      </el-form-item>
      <el-form-item label="订单状态" prop="status">
        <el-select v-model="searchForm.status" style="width: 120px"  @keypress.enter.native="search" clearable placeholder="状态">
        <el-select v-model="searchForm.status" style="width: 100px"  @keypress.enter.native="search" clearable placeholder="状态">
        <el-option label="待支付" :value="0"></el-option>
        <el-option label="待接单" :value="1"></el-option>
        <el-option label="已接单" :value="2"></el-option>
@@ -179,6 +179,22 @@
    })
    this.search()
  },
  reset () {
    this.searchForm = {
      acceptName: null,
      releaseName: null,
      type: null,
      createTimeEnd: null,
      createTimeStart: null,
      acceptTimeStart: null,
      acceptTimeEnd: null,
      doneTimeStart: null,
      doneTimeEnd: null,
      status: null,
      code: null
    }
    this.search()
  },
  methods: {
    openDetail (row) {
      this.$refs.OperaOrderDetailWindow.open('订单详情', row )

 server/admin/src/main/java/com/doumee/api/business/OrdersController.java

@@ -101,5 +101,4 @@
        return ApiResponse.success("操作成功");
    }


}

 server/services/src/main/resources/application-dev.yml

@@ -47,7 +47,6 @@
          required: true

debug_model: true

# Swagger配置
swagger:
  host:
@@ -59,8 +58,6 @@
  enable-encrypt: true
  # ç¦ç”¨swagger时的重定向地址
  redirect-uri: /


des_pwd: 123456SDFKDJF
knife4j:
  enable: true
@@ -68,10 +65,8 @@
    enable: true
    username: admin
    password: 111111

qiwei:
  serviceurl: https://qyapi.weixin.qq.com

aes:
  encrypt:
    open: true # æ˜¯å¦å¼€å¯åŠ å¯† true  or  false
@@ -79,7 +74,6 @@
    publicKey: mN4Yn8Or8r7SH1w3 # AES密钥
    privateKey:  # RSA私钥
    time: 600000

########################微信支付相关配置########################
wx:
  pay:
@@ -100,7 +94,6 @@
    privateCertPath: d://apiclient_cert.pem
    privateKeyPath: d://apiclient_key.pem


    #商户信息
    wechatSerialNumer: 3C9A32FB6CD453FAAAF97F9737ECAEA9D6625727
    wechatPayPublicKeyId: 47E172124E73E8098A565E971064C20ACDE7C911 # PUB_KEY_ID_0116617720032025071800291849000801 #商户/平台支付公钥id
@@ -109,7 +102,6 @@
    wechatPrivateKeyPath: d://wechatApiclient_key.pem #商户私钥
    wechatNotifyUrl: http://xiaopiqiu2.natapp1.cc/web/wechat/transferNotify #商户转账回调地址
    #wechatApiV3Key: V4PRKUBTK2BKNKJAD9NSI9YFG2Q0EOT1 #商户APIV3Key


    #服务商-------------end---
    existsSub: 1
@@ -122,7 +114,6 @@
    #子商户------------end----
    #      mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
    typeId: gybike

upload:
  type: ftp


 small-program/App.vue

@@ -5,6 +5,7 @@
            ...mapState(['userInfo','openid'])
        },
        onLaunch: function() {
            console.log(ua)  
            var that = this;
            if (!this.openid || this.openid =='') {
                uni.login({