From 48425a25cedd85485e0e674b0710d66432adf79a Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Thu, 12 May 2022 14:30:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ghy/web/controller/pay/WxPayController.java   | 11 ++++++-----
 .../main/resources/mapper/order/OrderMasterMapper.xml |  6 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java b/ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java
index f77fea12..80dcd2cc 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/pay/WxPayController.java
@@ -40,9 +40,10 @@ public class WxPayController extends BaseController {
      * 微信小程序支付
      */
     @PostMapping("lite")
+    @ResponseBody
     public AjaxResult litePay(HttpServletRequest request) {
-        String code = request.getParameter("code");
-        String orderMasterCode = request.getParameter("orderMasterCode");
+        String code = request.getHeader("code");
+        String orderMasterCode = request.getHeader("orderMasterCode");
         OrderMaster orderMaster = orderMasterService.selectByCode(orderMasterCode);
         if (orderMaster == null) {
             return AjaxResult.error("订单不存在");
@@ -57,12 +58,12 @@ public class WxPayController extends BaseController {
         String openId = wxUser.getString("openid");
         //调用adapay微信公众号支付.
         WxLiteExpend expend = new WxLiteExpend();
-        expend.setOpenId(openId);
+        expend.setOpenId(code);
         Map<String, Object> map;
         try {
             // TODO 订单里需要补充支付金额、tittle、简要描述、分账信息、description
-            map = adapayService.wxPubPay(payCallback, expend, orderMaster.getCode(), "orderMaster.get支付金额",
-                    "orderMaster.getTittle()", "orderMaster.get简要描述", "orderMaster.getDivMember", "orderMaster.getDescription");
+            map = adapayService.wxPubPay(payCallback, expend, orderMaster.getCode(), "0.01",
+                    "orderMaster.getTittle()", "orderMaster.get简要描述", "0", "orderMaster.getDescription");
         } catch (BaseAdaPayException e) {
             logger.error("获取微信用户信息失败", e);
             return AjaxResult.error();
diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
index a1ec8df0..43236f9b 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
@@ -102,7 +102,7 @@
 
     <insert id="insertOrderMaster" parameterType="com.ghy.order.domain.OrderMaster" useGeneratedKeys="true" keyProperty="id">
         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="orderType != null and orderType != ''">order_type,</if>
         <if test="orderStatus != null and orderStatus != ''">order_status,</if>
@@ -114,7 +114,7 @@
         <if test="createBy != null and createBy != ''">create_by,</if>
         create_time
         )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="orderType != null and orderType != ''">#{orderType},</if>
         <if test="orderStatus != null and orderStatus != ''">#{orderStatus},</if>
@@ -138,4 +138,4 @@
         WHERE `code` = #{orderMasterCode}
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>