clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

测试修改

This commit is contained in:
donqi 2022-05-12 14:30:06 +08:00
parent 9dbeeab71f
commit 48425a25ce
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java
View File

@ -40,9 +40,10 @@ public class WxPayController extends BaseController {
* 微信小程序支付 * 微信小程序支付
*/ */
@PostMapping("lite") @PostMapping("lite")
@ResponseBody
public AjaxResult litePay(HttpServletRequest request) { public AjaxResult litePay(HttpServletRequest request) {
String code = request.getParameter("code"); String code = request.getHeader("code");
String orderMasterCode = request.getParameter("orderMasterCode"); String orderMasterCode = request.getHeader("orderMasterCode");
OrderMaster orderMaster = orderMasterService.selectByCode(orderMasterCode); OrderMaster orderMaster = orderMasterService.selectByCode(orderMasterCode);
if (orderMaster == null) { if (orderMaster == null) {
return AjaxResult.error("订单不存在"); return AjaxResult.error("订单不存在");
@ -57,12 +58,12 @@ public class WxPayController extends BaseController {
String openId = wxUser.getString("openid"); String openId = wxUser.getString("openid");
//调用adapay微信公众号支付. //调用adapay微信公众号支付.
WxLiteExpend expend = new WxLiteExpend(); WxLiteExpend expend = new WxLiteExpend();
expend.setOpenId(openId); expend.setOpenId(code);
Map<String, Object> map; Map<String, Object> map;
try { try {
// TODO 订单里需要补充支付金额、tittle、简要描述、分账信息、description // TODO 订单里需要补充支付金额、tittle、简要描述、分账信息、description
map = adapayService.wxPubPay(payCallback, expend, orderMaster.getCode(), "orderMaster.get支付金额", map = adapayService.wxPubPay(payCallback, expend, orderMaster.getCode(), "0.01",
"orderMaster.getTittle()", "orderMaster.get简要描述", "orderMaster.getDivMember", "orderMaster.getDescription"); "orderMaster.getTittle()", "orderMaster.get简要描述", "0", "orderMaster.getDescription");
} catch (BaseAdaPayException e) { } catch (BaseAdaPayException e) {
logger.error("获取微信用户信息失败", e); logger.error("获取微信用户信息失败", e);
return AjaxResult.error(); return AjaxResult.error();

4
ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
View File

@ -102,7 +102,7 @@
<insert id="insertOrderMaster" parameterType="com.ghy.order.domain.OrderMaster" useGeneratedKeys="true" keyProperty="id"> <insert id="insertOrderMaster" parameterType="com.ghy.order.domain.OrderMaster" useGeneratedKeys="true" keyProperty="id">
INSERT INTO order_master( INSERT INTO order_master(
<if test="code != null and code != 0">code,</if> <if test="code != null ">code,</if>
<if test="customerId != null and customerId != ''">customer_id,</if> <if test="customerId != null and customerId != ''">customer_id,</if>
<if test="orderType != null and orderType != ''">order_type,</if> <if test="orderType != null and orderType != ''">order_type,</if>
<if test="orderStatus != null and orderStatus != ''">order_status,</if> <if test="orderStatus != null and orderStatus != ''">order_status,</if>
@ -114,7 +114,7 @@
<if test="createBy != null and createBy != ''">create_by,</if> <if test="createBy != null and createBy != ''">create_by,</if>
create_time create_time
)VALUES( )VALUES(
<if test="code != null and code != 0">#{code},</if> <if test="code != null">#{code},</if>
<if test="customerId != null and customerId != ''">#{customerId},</if> <if test="customerId != null and customerId != ''">#{customerId},</if>
<if test="orderType != null and orderType != ''">#{orderType},</if> <if test="orderType != null and orderType != ''">#{orderType},</if>
<if test="orderStatus != null and orderStatus != ''">#{orderStatus},</if> <if test="orderStatus != null and orderStatus != ''">#{orderStatus},</if>