Merge branch 'test' of http://git.vipzhuang.cn/wxd/MShopWeApp into qa

WXD-SEASON\season
2 parents bd36bc38 7bc648b0
Showing 2 changed files with 8 additions and 192 deletions
packageG/pages/user/order_detail/order_detail.js
pages/user/order_list/order_list.js
@@ -347,8 +347,12 @@ Page({
              getApp().request.post("/api/weshop/order/cancelOrder/"+os.stoid+"/"+o+"/"+getApp().globalData.user_id,{
                data:{},
                success: function(t) {
-                 if(t.data.code==0)
-                   th.requestOrderDetail(o), wx.setStorageSync("order:order_list:update", !0);
+                 if(t.data.code==0) {
+                     th.requestOrderDetail(o), wx.setStorageSync("order:order_list:update", !0);
+                 }else{
+                     getApp().confirmBox(t.data.msg);
+                 }
+
                },
              })
               /*----
@@ -427,100 +431,6 @@ Page({
 		var user_id=order.user_id;
-        //如果使用预存的话，要重新效验下预存金额是否足够
-        if(order.pre_cut && order.pre_json){
-            let pickup_id=order.pickup_id
-            let res = await r.promiseGet('/api/weshop/pickup/get/' + os.stoid + '/' + pickup_id, {})
-            let keyid = res.data.data.keyid
-            let resdata = await th.vipadvancesum(keyid,order.pre_cut,order.pre_json)
-            if(resdata.code !=0){
-                let msg=resdata.msg || "预存金额不足"
-                getApp().confirmBox(msg);
-                th.setData({ paying: 0 });
-                return false;
-            }
-
-            var listform=[];
-            var adv_num=0;
-            order_goods.map(ite => {
-                //-- 不是赠品的时候 --
-                if(!ite.is_gift) {
-                    let obj = {
-                        wareno: ite.goods_sn,
-                        price: ite.first_account,   //account是平摊后的实收价格
-                        qty: ite.goods_num,
-                        sumprice: parseFloat(ite.account * ite.goods_num - ite.account_yu-(ite.quan_num?ite.quan_num:0)).toFixed(2)
-                    }
-
-                    adv_num+=ite.account * ite.goods_num - ite.account_yu-(ite.quan_num?ite.quan_num:0);
-                    listform.push(obj)
-                }
-            })
-
-            adv_num=parseFloat(adv_num).toFixed(2);
-            let res1 = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, {
-                data: {
-                    accdb: getApp().globalData.config.erpid,
-                    ApiName: 'api.pos.shop.advancesum.seek',
-                    usercode: "admin",
-                    vipid: getApp().globalData.userInfo.erpvipid,
-                    oddsum: "0",
-                    advancesum: adv_num,
-                    storageid: keyid,
-                    listform
-                },
-                is_json: 1
-            })
-            if(!res1 && res1.data.code!=0 ){
-                getApp().confirmBox("获取预存的金额失败");
-                th.setData({ paying: 0 });
-                return false;
-            }
-
-            if(res1.data.data.length<=0){
-                getApp().confirmBox("每天每人仅能使用1次预存抵扣");
-                th.setData({ paying: 0 });
-                return false;
-            }
-
-            var yck=0
-            let resData = res1.data.data
-            resData.map(ite => {
-                yck += ite.advancesum*1
-            })
-            if(yck<=0){
-                getApp().confirmBox("每天每人仅能使用1次预存抵扣");
-                th.setData({ paying: 0 });
-                return false;
-            }
-
-            if(order.pre_cut && yck!=order.pre_cut){
-                getApp().confirmBox("获取预存的金额不对");
-                th.setData({ paying: 0 });
-                return false;
-            }
-
-
-        }
-        // 幸运购检查库存量 api/weshop/activitylist/getActLen/{store_id}/{prom_type}/{prom_id}
-        if (parseInt(order_goods['0']['prom_type']) == 9) {
-            var aid = order_goods['0']['prom_id'];
-            var knum = 0;
-            await r.promiseGet('/api/weshop/activitylist/getActLen/' + os.stoid + '/9/' + aid, {
-            }).then(res => {
-                if (res.data.code == 0) {
-                    knum = res.data.data;
-                }
-            });
-
-            if (knum <= 0) {
-                getApp().confirmBox("库存为0，支付失败");
-                th.setData({ paying: 0 });
-                return false;
-            }
-
-
-        }
         var wlist = "";
         var the_yh_map={}; //判断那种商品的prom_type为0，正在做的活动是优惠促销
@@ -506,7 +506,7 @@ Page({
                 0 == e.data.activeCategoryId ?
                   (e.resetData(), e.requestOrderList(e.data.activeCategoryId)) : e.deleteOrderData2(a);
               } else {
-                getApp().confirmBox(e.data.msg);
+                getApp().confirmBox(t.data.msg);
               }
             },
           })
@@ -716,102 +716,8 @@ Page({
     var order = e;
     var order_goods = e.order_goods;
     var user_id = getApp().globalData.userInfo.user_id;
- 
-    //如果使用预存的话，要重新效验下预存金额是否足够
-    if(order.pre_cut && order.pre_json){
-        let pickup_id=order.pickup_id
-        let res = await r.promiseGet('/api/weshop/pickup/get/' + os.stoid + '/' + pickup_id, {})
-        let keyid = res.data.data.keyid
-        let resdata = await th.vipadvancesum(keyid,order.pre_cut,order.pre_json)
-        if(resdata.code !=0){
-          let msg=resdata.msg || "预存金额不足"
-          getApp().confirmBox(msg);
-          th.setData({ paying: 0 });
-          return false;
-        }
-
-        var listform=[];
-        var adv_num=0;
-        order_goods.map(ite => {
-          //-- 不是赠品的时候 --
-          if(!ite.is_gift) {
-            let obj = {
-              wareno: ite.goods_sn,
-              price: ite.first_account,   //account是平摊后的实收价格
-              qty: ite.goods_num,
-              sumprice: parseFloat(ite.account * ite.goods_num - ite.account_yu-(ite.quan_num?ite.quan_num:0)).toFixed(2)
-            }
-
-            adv_num+=ite.account * ite.goods_num - ite.account_yu-(ite.quan_num?ite.quan_num:0);
-            listform.push(obj)
-          }
-        })
-
-        adv_num=parseFloat(adv_num).toFixed(2);
-        let res1 = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, {
-            data: {
-              accdb: getApp().globalData.config.erpid,
-              ApiName: 'api.pos.shop.advancesum.seek',
-              usercode: "admin",
-              vipid: getApp().globalData.userInfo.erpvipid,
-              oddsum: "0",
-              advancesum: adv_num,
-              storageid: keyid,
-              listform
-            },
-            is_json: 1
-        })
-        if(!res1 && res1.data.code!=0 ){
-            getApp().confirmBox("获取预存的金额失败");
-            th.setData({ paying: 0 });
-            return false;
-        }
-
-        if(res1.data.data.length<=0){
-            getApp().confirmBox("每天每人仅能使用1次预存抵扣");
-            th.setData({ paying: 0 });
-            return false;
-        }
-
-        var yck=0
-        let resData = res1.data.data
-        resData.map(ite => {
-          yck += ite.advancesum*1
-        })
-        if(yck<=0){
-           getApp().confirmBox("每天每人仅能使用1次预存抵扣");
-           th.setData({ paying: 0 });
-           return false;
-        }
-
-        if(order.pre_cut && yck!=order.pre_cut){
-          getApp().confirmBox("获取预存的金额不对");
-          th.setData({ paying: 0 });
-          return false;
-        }
-
-
-    }
-
-    // 幸运购检查库存量 api/weshop/activitylist/getActLen/{store_id}/{prom_type}/{prom_id}
-    if (parseInt(order_goods['0']['prom_type']) == 9) {
-      var aid = order_goods['0']['prom_id'];
-      var knum = 0;
-      await r.promiseGet('/api/weshop/activitylist/getActLen/' + os.stoid + '/9/' + aid, {
-      }).then(res => {
-        if (res.data.code == 0) {
-          knum = res.data.data;
-        }
-      });
-
-      if (knum <= 0) {
-        getApp().confirmBox("库存为0，支付失败");
-        th.setData({ paying: 0 });
-        return false;
-      }
-
-    }
+    
     var wlist = "";
     var the_yh_map={}; //判断那种商品的prom_type为0，正在做的活动是优惠促销