pay-sdk 接口

build.sh

@@ -21,8 +21,8 @@ fi
 
 mvn package
 
-/usr/local/tomcat/paymamager/bin/shutdown.sh -force
-rm -rf /var/www/paymamager
-mv target/awesome-admin /var/www/paymamager
-ln -s /var/www/paymanagerfiles /var/www/paymamager/files
-/usr/local/tomcat/paymamager/bin/startup.sh
+/usr/local/tomcat/paymanager/bin/shutdown.sh -force
+rm -rf /var/www/paymanager
+mv target/awesome-admin /var/www/paymanager
+ln -s /var/www/paymanagerfiles /var/www/paymanager/files
+/usr/local/tomcat/paymanager/bin/startup.sh

src/main/java/com/izouma/awesomeadmin/constant/PayConstant.java

@@ -11,7 +11,7 @@ import com.izouma.awesomeadmin.enums.PayApiErrCode;
 public interface PayConstant {
 
     String SUCCESS = "SUCCESS";
-    String FAIL = "SUCCESS";
+    String FAIL = "FAIL";
 
     PayResult INVALID_REQUEST = new PayResult(FAIL, PayApiErrCode.INVALID_REQUEST.toString());
     PayResult MCHID_NOT_EXIST = new PayResult(FAIL, PayApiErrCode.MCHID_NOT_EXIST.toString());

src/main/java/com/izouma/awesomeadmin/enums/PayApiErrCode.java

@@ -27,7 +27,7 @@ public enum PayApiErrCode {
     SIGNERROR,
 
     /**
-     * post数据为空
+         * post数据为空
      */
     POST_DATA_EMPTY,
 

src/main/java/com/izouma/awesomeadmin/web/PayApiController.java

@@ -221,7 +221,7 @@ public class PayApiController {
     /**
      * 获取支付码库存列表
      *
-     * @param request mch_id
+     * @param request mch_id pay_code_id
      * @return
      */
     @RequestMapping(value = "/payCodeStockList", method = RequestMethod.POST)
@@ -901,6 +901,11 @@ public class PayApiController {
     }
 
 
+    /**
+     * 上传图片
+     * @param request
+     * @return
+     */
     @RequestMapping(value = "/uploadFile")
     @ResponseBody
     public PayResult uploadFile(HttpServletRequest request) {

src/main/resources/properties/outsidews.properties

@@ -11,7 +11,7 @@ rongyunappkey=
 rongyunappsecret=
 jwtsecret=3MgWy/pJjxHCQW2pHlQbkjomTUPRo9WhsPFjUPYZZlo=
 host=http://1eaed69e.ngrok.io
-base_domain=http://117.81.233.142:8206
+base_domain=http://202.79.174.56:8207
 ALIPAY_APP_ID=
 ALIPAY_APP_PRIVATE_KEY=++C3++IeVsph4rhyF9P98H0cFQABnumiV6jaY3/wke/9aj8uBV5zvHC3GrkSDUQotPAmE+blwqFdofQsaoOuHOR1FfstLg29jOaVipoNvkSGmOJqfIjAGaMEQy7p2S2jLIqyKGMj71TvoITAMCkkwbim0kmbN4reh5XPKTeT2upOa+64FNnYK3mJ141e2LNWNx2HAIhaw88+KUiHNXUS3LA+aGw0inZP3UdSPAetsEagNeD+NXNtWf7DeABn/0K8SGgUkScODeC8TesOpS5lcmVj5W5w9hK7AgMBAAECggEBAIzxG5Fqtza6AZ5FfaZDTDGqjdMD2fn3Mcous4/8eEKFrALqmLxUeciKi3/ES/tMyKXIC4wb1RKRAQVXUx3JjboYMn1Dbu/68JEJaDeG73qwexTlfLxp5a2YFnvJg813b4byKriei6HVqNi8MAybYEoAdeN7qJ5tQE6obg9pSdmhgg6tnza51ASlwepZqxQ2YDMvROg7KA2PHlIrdVhLBy0GGG3YvSxsl2jOmXst96mihYa6vD4rXZjVXnd+kwS+x5Mpw7tLdEkS+PSrFRFpW6W0LwnGcJm1lC3L5X8wQ+lXGT3X2TrZV4j+NCwTyn3WFr3yGRnLAzJD5vMJI/sTY8ECgYEA8o1+9ZW7XIvO+zIBEsq177pEYlqFoW2e8acokeYPXex6RmIhaikQVegnwSQcu8hvD2Gh0ozGEH1Y47vCvGi6Q9pswy4pT47BQyuir/8EVSPsO+2atWa/YXot0Gcmm2GSWXT/DNJViaGB+oT4m15mCDtzVeJIndytglx0TF9saFMCgYEA2NFob1K+fi4+NZD8WrkAnjPKodeOsu+YxNnB3E53xd8BgVLVgC9F/eEwDkbWazil5Wykwf07OGbBK5+rUv9w2DHJMHyaGQ5HpCRx06P2gxquFdudXjWwV+6TseEQDloyE13oKT8+oJBedYTNI3D6mjGv+ni+gksaU74WS0mtvvkCgYEAx5SSUTXBk6ceyyccJwBRsE6Oknd12Zy/2ov3IAYzws8g1eVNJXNgk6+RdqVmV0XXzMpDQ2K+Xzck+062MB3kloyWTgwfxezrLYAsP7EROZVzfuRGFtnSxDyqkf8uj1A8Agv5Ce3QoI0azK65ee60+jUg9BxcMDkzND8rGuSx6S0CgYAu2JAH/YjLGpK2YC0mLPLFO8t8TGa4oqwPXD1WrF2UkypwFsWqfIxS3mTTsNqDMCon9+FhSKWS+iCinE0YEbj//UHLCCEDaOJxxK4TXEnW6dzTPDA0OsVvOk0PEeG2OCa5qICQ6OlPJ+JA4gCwt6htyG6NX6lJ3ZBCp7+JZNH1gQKBgCbsC8LzVOLIw6GR87X0oeWTfq7KKVD6rMfG58jHpTSAdY6ge9f2CyxKhfUyemZtu7BsRCFeuI5NDmtmg5uXS6Nu1dL/R5Xs33mB64fwYX/kXErnrHYrCekC1uIM8I/hTyVfbUvoMArq+3s2W7KTmq63ygBEnNOAqomJDHeW+/wv
 ALIPAY_CHARSET=utf-8

src/main/resources/spring/appWebService.xml

@@ -13,7 +13,6 @@
 
     <!-- 扫描service包下所有使用注解的类型 -->
     <context:component-scan base-package="com.izouma.awesomeadmin.service"/>
-    <context:component-scan base-package="com.izouma.weixin.service"/>
 
     <!-- 配置事务管理器 -->
     <bean id="transactionManager"

src/main/vue/src/pages/PayCodeInfo.vue

@@ -23,9 +23,9 @@
             <el-form-item prop="image" label="二维码">
                 <single-upload v-model="formData.image" :disabled="'image'==subColumn"></single-upload>
             </el-form-item>
-            <el-form-item prop="limitMoney" label="限制金额">
+            <!-- <el-form-item prop="limitMoney" label="限制金额">
                 <el-input type="number" v-model="formData.limitMoney" :disabled="'limitMoney'==subColumn"></el-input>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item prop="useFlag" label="可用">
                 <el-switch
                            v-model="formData.useFlag"
@@ -112,6 +112,7 @@ export default {
                 daytimes: 0,
                 monthmoney: 0,
                 monthtimes: 0,
+                userId:0,
             },
             rules: {
                 codeName: [
@@ -120,13 +121,13 @@ export default {
                 payType: [
                     { required: true, message: '请输入 类型', trigger: 'blur' },
                 ],
-                limitMoney: [
-                    {
-                        required: true,
-                        message: '请输入 限制金额',
-                        trigger: 'blur',
-                    },
-                ],
+                // limitMoney: [
+                //     {
+                //         required: true,
+                //         message: '请输入 限制金额',
+                //         trigger: 'blur',
+                //     },
+                // ],
                 image: [
                     {
                         required: true,

src/main/vue/src/pages/PayCodeInfos.vue

@@ -86,12 +86,12 @@
 
             </el-table-column>
 
-            <el-table-column
+            <!-- <el-table-column
                              v-if="isColumnShow('limitMoney')"
                              prop="limitMoney"
                              label="限制金额"
                              min-width="100">
-            </el-table-column>
+            </el-table-column> -->
 
             <el-table-column
                              v-if="isColumnShow('useFlag')"
@@ -299,11 +299,11 @@ export default {
                     value: 'image',
                     show: true,
                 },
-                {
-                    label: '限制金额',
-                    value: 'limitMoney',
-                    show: true,
-                },
+                // {
+                //     label: '限制金额',
+                //     value: 'limitMoney',
+                //     show: true,
+                // },
                 {
                     label: '可用',
                     value: 'useFlag',

src/main/vue/src/pages/PayCodeOrder.vue

@@ -51,9 +51,9 @@
             <el-form-item prop="userId" label="用户">
                 <el-input v-model="formData.userId" :disabled="'userId'==subColumn"></el-input>
             </el-form-item>
-            <el-form-item prop="productId" label="商品Id">
+            <!-- <el-form-item prop="productId" label="商品Id">
                 <el-input v-model="formData.productId"></el-input>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item prop="remark" label="备注">
                 <el-input v-model="formData.remark" :disabled="'remark'==subColumn"></el-input>
             </el-form-item>

src/main/vue/src/pages/PayCodeOrders.vue

@@ -128,11 +128,11 @@
                              label="用户"
                              min-width="100">
             </el-table-column>
-            <el-table-column
+            <!-- <el-table-column
                              prop="productId"
                              label="商品Id"
                              min-width="100">
-            </el-table-column>
+            </el-table-column> -->
 
             <el-table-column
                              v-if="isColumnShow('remark')"

src/main/vue/src/pages/PayCodeStock.vue

@@ -98,7 +98,9 @@ export default {
     data() {
         return {
             saving: false,
-            formData: {},
+            formData: {
+                userId:0,
+            },
             rules: {},
             payTypeOptions: [
                 {

src/main/vue/src/pages/User.vue

@@ -11,8 +11,8 @@
             <el-form-item prop="phone" label="手机">
                 <el-input v-model="formData.phone"></el-input>
             </el-form-item>
-             <el-form-item prop="apiKey" label="apiKey">
-                <el-input v-model="formData.apiKey"></el-input>
+             <el-form-item prop="apikey" label="apikey">
+                <el-input v-model="formData.apikey"></el-input>
             </el-form-item>
             <el-form-item prop="roleId" label="角色" v-if="adminFlag=='Y'">
                 <el-select v-model="formData.roleId" multiple placeholder="请选择" style="width: 100%;">
@@ -49,6 +49,10 @@
                 </el-select>
             </el-form-item>
 
+            <el-form-item prop="opened" label="接单：Y/N">
+                <el-input v-model="formData.opened"></el-input>
+            </el-form-item>
+
             <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
                 <el-button @click="$router.go(-1)">取消</el-button>
@@ -128,6 +132,7 @@
                 saving: false,
                 formData: {
                     createFlag: false,
+                    opened:'Y',
                     departId: []
                 },
                 rules: {

src/main/vue/src/pages/Users.vue

@@ -71,6 +71,8 @@
             </el-table-column> -->
             <el-table-column prop="channel" label="渠道" min-width="50">
             </el-table-column>
+            <el-table-column prop="opened" label="接单" min-width="50">
+            </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" width="290">
                 <template slot-scope="scope">
                     <el-button @click="$router.push({path:'/userTeam',query:{column:scope.row.id+',recommender'}})" type="primary" size="small" plain>团队
@@ -124,23 +126,6 @@ import { mapState } from 'vuex';
 
 export default {
     created() {
-        this.$http
-            .get({
-                url: '/userLevel/all',
-            })
-            .then(res => {
-                if (res.success) {
-                    if (res.data.length > 0) {
-                        res.data.forEach(item => {
-                            this.userLevelOptions.push({
-                                label: item.name,
-                                value: item.id,
-                            });
-                        });
-                    }
-                }
-            });
-
         this.$http
             .get({
                 url: '/channelInfo/all',