This commit is contained in:
kino 2021-01-19 13:52:28 +08:00
parent d5c30399e2
commit d8edac4483
3 changed files with 26 additions and 16 deletions

View File

@ -4,6 +4,8 @@ import cn.hutool.core.util.RandomUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest;
import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
@ -218,4 +220,12 @@ public class AppOrderController extends BaseController {
public AjaxResult remove(@PathVariable String[] ids) {
return toAjax(iAppOrderService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
}
@Log(title = "回调", businessType = BusinessType.OTHER)
@PostMapping("/payNotify")
String payNotify(@RequestBody String xmlData) throws WxPayException {
WxPayOrderNotifyResult notifyResult = wxPayService.parseOrderNotifyResult(xmlData);
// TODO 根据自己业务场景需要构造返回对象
return WxPayNotifyResponse.success("成功");
}
}

View File

@ -197,7 +197,7 @@ wxmini:
appId: wx76ec015fc31a1946 #微信公众号或者小程序等的appid 必填
mchId: 1486984962
mchKey: 82aZ9Tb6eu5W2HdXKQWZU2SztU8w8nJ8
notifyUrl: http://41.mxl530.top:8087/zhongyihis/wxnotify
notifyUrl: http://41.liyiren.me:8696/winery/order/payNotify
subAppId: #服务商模式下的子商户公众账号ID
subMchId: #服务商模式下的子商户号
tradeType: JSAPI #交易类型

View File

@ -1,9 +1,9 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="商户名称" prop="name">
<el-form-item label="商户名称" prop="mchName">
<el-input
v-model="queryParams.name"
v-model="queryParams.mchName"
placeholder="请输入商户名称"
clearable
size="small"
@ -28,9 +28,9 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="介绍" prop="desc">
<el-form-item label="介绍" prop="mchDesc">
<el-input
v-model="queryParams.desc"
v-model="queryParams.mchDesc"
placeholder="请输入介绍"
clearable
size="small"
@ -88,10 +88,10 @@
<el-table v-loading="loading" :data="merchantList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="ID" align="center" prop="id" v-if="false"/>
<el-table-column label="商户名称" align="center" prop="name" />
<el-table-column label="商户名称" align="center" prop="mchName" />
<el-table-column label="副标题" align="center" prop="subtitle" />
<el-table-column label="图标" align="center" prop="avatar" />
<el-table-column label="介绍" align="center" prop="desc" />
<el-table-column label="介绍" align="center" prop="mchDesc" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -111,7 +111,7 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@ -123,8 +123,8 @@
<!-- 添加或修改商户对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="商户名称" prop="name">
<el-input v-model="form.name" placeholder="请输入商户名称" />
<el-form-item label="商户名称" prop="mchName">
<el-input v-model="form.mchName" placeholder="请输入商户名称" />
</el-form-item>
<el-form-item label="副标题" prop="subtitle">
<el-input v-model="form.subtitle" placeholder="请输入副标题" />
@ -132,8 +132,8 @@
<el-form-item label="图标" prop="avatar">
<el-input v-model="form.avatar" placeholder="请输入图标" />
</el-form-item>
<el-form-item label="介绍" prop="desc">
<el-input v-model="form.desc" placeholder="请输入介绍" />
<el-form-item label="介绍" prop="mchDesc">
<el-input v-model="form.mchDesc" placeholder="请输入介绍" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -175,10 +175,10 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
name: undefined,
mchName: undefined,
subtitle: undefined,
avatar: undefined,
desc: undefined,
mchDesc: undefined,
},
//
form: {},
@ -209,10 +209,10 @@ export default {
reset() {
this.form = {
id: undefined,
name: undefined,
mchName: undefined,
subtitle: undefined,
avatar: undefined,
desc: undefined,
mchDesc: undefined,
createTime: undefined,
updateTime: undefined
};