From e76cc9ac07d45bc321df052e15d8ad0faecf299e Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Mon, 7 May 2018 11:33:24 +0800
Subject: [PATCH] =?UTF-8?q?fix[litemall-wx,=20litemall-wx-api]:=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=87=8C?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E6=94=AF=E4=BB=98=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../litemall/wx/web/WxOrderController.java         |  6 +-----
 .../pages/ucenter/orderDetail/orderDetail.js       | 14 ++++++++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java
index a28fec54..de3e4cf9 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java
@@ -500,9 +500,6 @@ public class WxOrderController {
             return ResponseUtil.fail(403, "订单不能支付");
         }
 
-        order.setOrderStatus(OrderUtil.STATUS_PAY);
-        // 0 初始，1 预支付，2 支付成功
-        order.setPayStatus((short)1);
         orderService.updateById(order);
         return ResponseUtil.ok(result);
     }
@@ -549,9 +546,8 @@ public class WxOrderController {
             }
 
             order.setPayId(payId);
-            // 0 初始，1 预支付，2 支付成功
-            order.setPayStatus((short)2);
             order.setPayTime(LocalDateTime.now());
+            order.setOrderStatus(OrderUtil.STATUS_PAY);
             orderService.updateById(order);
 
             return WxPayNotifyResponse.success("处理成功!");
diff --git a/litemall-wx/pages/ucenter/orderDetail/orderDetail.js b/litemall-wx/pages/ucenter/orderDetail/orderDetail.js
index 464066bb..62af7c39 100644
--- a/litemall-wx/pages/ucenter/orderDetail/orderDetail.js
+++ b/litemall-wx/pages/ucenter/orderDetail/orderDetail.js
@@ -33,22 +33,28 @@ Page({
   // “去付款”按钮点击效果
   payOrder: function () {
     let that = this;
-    util.request(api.PayPrepayId, {
+    util.request(api.OrderPrepay, {
       orderId: that.data.orderId
     }, 'POST').then(function (res) {
       if (res.errno === 0) {
         const payParam = res.data;
+        console.log("支付过程开始")
         wx.requestPayment({
           'timeStamp': payParam.timeStamp,
           'nonceStr': payParam.nonceStr,
-          'package': payParam.package,
+          'package': payParam.packageValue,
           'signType': payParam.signType,
           'paySign': payParam.paySign,
           'success': function (res) {
-            console.log(res)
+            console.log("支付过程成功")
+            util.redirect('/pages/ucenter/order/order');
           },
           'fail': function (res) {
-            console.log(res)
+            console.log("支付过程失败")
+            util.showErrorToast('支付失败');
+          },
+          'complete': function (res) {
+            console.log("支付过程结束")
           }
         });
       }