支付获取订单详情

api/pay.js

@@ -9,4 +9,8 @@ module.exports={
   queryAllVip:(data)=>{
 		return request.post('/xiaoshi-weixinback/vip/queryAllVip',data)
   },
+  //获取订单详情
+  getOrderDetail:(data)=>{
+    return request.post('/xiaoshi-weixinback/weixinpay/getOrderDetail',data)
+  }
  }

myComponents/pay/pay.js

@@ -111,13 +111,13 @@ Component({
           acceptDataFromVoucher: function(data) {
             console.log(data)
             var discountPrice = Number(data.discountPrice)
-            var totalPrice = Number(that.data.data.price)
-            var discount = Number(that.data.data.discount)
-            var finalPrice = 0
-            finalPrice =( Decimal.sub([totalPrice,discountPrice])<=0)?0:Decimal.sub([totalPrice,discountPrice])
-            if(discount){
-              finalPrice =Decimal.mul([finalPrice, discount])
-            }
+            // var totalPrice = Number(that.data.data.price)
+            // var discount = Number(that.data.data.discount)
+            // var finalPrice = 0
+            // finalPrice =( Decimal.sub([totalPrice,discountPrice])<=0)?0:Decimal.sub([totalPrice,discountPrice])
+            // if(discount){
+            //   finalPrice =Decimal.mul([finalPrice, discount])
+            // }
             var voucherShow = ''
             if(discountPrice >0){
               voucherShow = `- ￥${discountPrice}`
@@ -129,11 +129,12 @@ Component({
             that.setData(
               {
                 ["data.personVoucherIds"]:data.chooseVoucher,
-                ["data.finalPrice"]:finalPrice,
-                ["data.discountPrice"]:Decimal.sub([totalPrice,finalPrice]),
+                // ["data.finalPrice"]:finalPrice,
+                // ["data.discountPrice"]:Decimal.sub([totalPrice,finalPrice]),
                 voucherShow:voucherShow
               }
             )
+            that.getOrderDetail()
           },
         },
         success: function(res) {
@@ -142,6 +143,36 @@ Component({
         }
       })
     },
+    //获取订单详情
+    getOrderDetail(){
+      var params = {
+        goodType:this.data.data.type,
+        goods:this.data.data.goods,
+        servicePrice:this.data.data.servicePrice,
+        price:this.data.data.price,
+        discount:this.data.data.discount,
+        personVoucherIds:this.data.data.personVoucherIds,
+        // usedVouchers:this.data.data.servicePrice,
+        finalPrice:this.data.data.finalPrice,
+        activityId:this.data.data.activityId
+      }
+      api.getOrderDetail(params).then(res=>{
+        if(res.code == 200){
+          this.setData(
+            {
+              ["data.orderMessage"]:res.data.orderMessage,
+              ["data.Activities"]:res.data.Activities,
+              ["data.activityId"]:res.data.Activities.id,
+              ["data.price"]:res.data.orderMessage.price,
+              ["data.discount"]:res.data.orderMessage.discount,
+              ["data.discountText"]:this.decimalToDiscount(res.data.orderMessage.discount),
+              ["data.finalPrice"]:res.data.orderMessage.finalPrice,
+              ["data.discountPrice"]:Decimal.sub([res.data.orderMessage.price,res.data.orderMessage.finalPrice]),
+            }
+          )
+        }
+      })
+    },
     //支付
     payMoney(){
       var params = {
@@ -152,7 +183,8 @@ Component({
         discount:this.data.data.discount,
         personVoucherIds:this.data.data.personVoucherIds,
         // usedVouchers:this.data.data.servicePrice,
-        finalPrice:this.data.data.finalPrice
+        finalPrice:this.data.data.finalPrice,
+        activityId:this.data.data.activityId
       }
       wx.showLoading({
         title: '加载中',

pages/voucher/voucher.js

@@ -17,7 +17,10 @@ Page({
   voucherList:[],
   buyVoucher:[],
   payMoney:0,
-  all:null
+  all:null,
+  other:{
+    activityId:null,
+  }
   },
 
   /**
@@ -229,56 +232,95 @@ Page({
   //修改选择需要购买的优惠券
   changeBuyVoucher(e){
     var data = e.detail
-    var arr = this.data.voucherList.filter(item=>{
-      return data.indexOf(item.id+'')!=-1
-    })
-    var payMoney = 0
-    arr.forEach(item=>{
-      if(item.buyNumber){
-        var money1 = Decimal.mul([item.sellingPrice,item.buyNumber])
-        payMoney = Decimal.add([payMoney,money1])
-        // payMoney += Number(item.sellingPrice) * Number(item.buyNumber)
-      }else{
-        // payMoney += Number(item.sellingPrice)
-        payMoney = Decimal.add([payMoney,item.sellingPrice])
-      }
+    // var arr = this.data.voucherList.filter(item=>{
+    //   return data.indexOf(item.id+'')!=-1
+    // })
+    // var payMoney = 0
+    // arr.forEach(item=>{
+    //   if(item.buyNumber){
+    //     var money1 = Decimal.mul([item.sellingPrice,item.buyNumber])
+    //     payMoney = Decimal.add([payMoney,money1])
+    //     // payMoney += Number(item.sellingPrice) * Number(item.buyNumber)
+    //   }else{
+    //     // payMoney += Number(item.sellingPrice)
+    //     payMoney = Decimal.add([payMoney,item.sellingPrice])
+    //   }
       
-    })
+    // })
     this.setData({
       buyVoucher: data,
-      payMoney:payMoney
+      // payMoney:payMoney
     });
+    this.getOrderDetail()
   },
   //修改数量
   changeNumber(e){
     var {index} = e.currentTarget.dataset
     var value = e.detail
-    var item = this.data.voucherList[index]
-    if(this.data.buyVoucher.indexOf(item.id+'')!=-1){
-      var payMoney = this.data.payMoney
-      if(item.buyNumber){
-        if(item.buyNumber < value){
-          // payMoney  =Number(payMoney) + Number(item.sellingPrice)
-          payMoney = Decimal.add([payMoney,item.sellingPrice])
-        }else if(item.buyNumber > value){
-          // payMoney  =Number(payMoney) - Number(item.sellingPrice)
-          payMoney = Decimal.sub([payMoney,item.sellingPrice])
-        }
-      }else{
-        // payMoney = Number(payMoney) + Number(item.sellingPrice)
-        payMoney = Decimal.add([payMoney,item.sellingPrice])
-      }
-      this.setData(
-        {
-          payMoney:payMoney
-        }
-      )
-    }
+    // var item = this.data.voucherList[index]
+    // if(this.data.buyVoucher.indexOf(item.id+'')!=-1){
+    //   var payMoney = this.data.payMoney
+    //   if(item.buyNumber){
+    //     if(item.buyNumber < value){
+    //       // payMoney  =Number(payMoney) + Number(item.sellingPrice)
+    //       payMoney = Decimal.add([payMoney,item.sellingPrice])
+    //     }else if(item.buyNumber > value){
+    //       // payMoney  =Number(payMoney) - Number(item.sellingPrice)
+    //       payMoney = Decimal.sub([payMoney,item.sellingPrice])
+    //     }
+    //   }else{
+    //     // payMoney = Number(payMoney) + Number(item.sellingPrice)
+    //     payMoney = Decimal.add([payMoney,item.sellingPrice])
+    //   }
+    //   this.setData(
+    //     {
+    //       payMoney:payMoney
+    //     }
+    //   )
+    // }
     this.setData(
       {
         ["voucherList["+index+"].buyNumber"]:value
       }
     )
+    this.getOrderDetail()
+  },
+  //获取订单详情
+  getOrderDetail(){
+    var goods = []
+    this.data.voucherList.forEach(item=>{
+      if(this.data.buyVoucher.indexOf(item.id+'')!=-1){
+        var obj = {
+          id:item.id,
+          name:item.name,
+          price:item.sellingPrice,
+          num:item.buyNumber || 1
+        }
+        goods.push(obj)
+      }
+    })
+    var params ={
+      title:'购买券',
+      goodType:'0',
+      goods:goods,
+      personVoucherIds:[],
+      activityId:this.data.other.activityId
+    }
+    api.getOrderDetail(params).then(res=>{
+      if(res.code == 200){
+        this.setData(
+          {
+            ["other.orderMessage"]:res.data.orderMessage,
+            ["other.Activities"]:res.data.Activities,
+            ["other.activityId"]:res.data.Activities.id,
+            payMoney:res.data.orderMessage.finalPrice,
+            ["other.discount"]:res.data.orderMessage.discount,
+            ["other.price"]:res.data.orderMessage.price,
+            // ["other.discountPrice"]:Decimal.sub([res.data.orderMessage.price,res.data.orderMessage.finalPrice]),
+          }
+        )
+      }
+    })
   },
   //支付
   pay(){
@@ -310,7 +352,8 @@ Page({
       goods:goods,
       servicePrice:0.00,
       price:this.data.payMoney,
-      discount:null,
+      discount:this.data.other.discount,
+      activityId:this.data.other.activityId
     }
     pay.openPay(data)
   },