积分兑换

app/common/model/Order.php

@@ -107,21 +107,21 @@ class Order extends BaseModel
 //            return $orderStatus[$data['order_status']];
 //        }
         // 订单状态
-        if ($data['order_status'] != OrderStatusEnum::NORMAL) {
+        if (isset($data['order_status']) && $data['order_status'] != OrderStatusEnum::NORMAL) {
             return OrderStatusEnum::data()[$data['order_status']]['name'];
         }
         // 付款状态
-        if ($data['pay_status'] == PayStatusEnum::PENDING) {
+        if (isset($data['pay_status']) && $data['pay_status'] == PayStatusEnum::PENDING) {
             return '待支付';
         }
         // 订单类型：单独购买
-        if ($data['delivery_status'] == 10) {
+        if (isset($data['delivery_status']) && $data['delivery_status'] == 10) {
             return '待发货';
         }
-        if ($data['receipt_status'] == 10) {
+        if (isset($data['receipt_status']) && $data['receipt_status'] == 10) {
             return '待收货';
         }
-        return $value;
+        return strval($value);
     }
 
     /**

app/index/controller/Checkout.php

@@ -16,6 +16,7 @@ use app\index\model\Order;
 use app\index\model\Order as OrderModel;
 use app\index\model\User as UserModel;
 use app\index\service\order\PaySuccess;
+use app\index\service\User;
 use app\index\service\User as UserService;
 use app\index\service\Cart as CartService;
 use app\index\service\order\Checkout as CheckoutService;
@@ -165,6 +166,15 @@ class Checkout extends Controller
                 'setting' => $Checkout->getSetting(),
             ]);
         }
+        $userInfo = User::getCurrentLoginUser();
+        $points = $userInfo['points'];
+        if ($params['payType'] == OrderPayTypeEnum::POINTS) {
+            $payPoints = intval(bcmul(strval($orderInfo['orderPayPrice']), '100', 0));//订单所需积分
+            if (intval($points) < $payPoints) {
+                return $this->renderError($payment['message'] ?? '积分不够');
+            }
+        }
+
         // 验证订单是否存在错误
         if ($Checkout->hasError()) {
             return $this->renderError($Checkout->getError(), ['is_created' => false]);

app/index/controller/Index.php

@@ -72,7 +72,7 @@ class Index extends Controller
 
     }
 
-    public function productDetail()
+    public function productDetails()
     {
         $goodsId = $this->request->param('goodsId', 0);
         if (empty($goodsId)) {

app/index/view/cart/shoppingCart.html

@@ -52,9 +52,9 @@
                 </div>
             </a>
             <!-- 收藏 -->
-            <div class="headIconItem collectIcon">
-                <img src="/assets/index/asstes/icon/collect.png" alt="collect" tabindex="collect">
-            </div>
+<!--            <div class="headIconItem collectIcon">-->
+<!--                <img src="/assets/index/asstes/icon/collect.png" alt="collect" tabindex="collect">-->
+<!--            </div>-->
             <!-- 个人中心 -->
             <a href="/index/user/personal.html">
                 <div class="headIconItem userIcon">
@@ -99,9 +99,9 @@
                     <h2 class="menuItemTitle shoppingCartIcon">Shopping Cart</h2>
                 </a>
             </div>
-            <div class="mobileMenuItem">
+<!--            <div class="mobileMenuItem">
                 <h2 class="menuItemTitle collectIcon">Collect</h2>
-            </div>
+            </div>-->
             <div class="mobileMenuItem">
                 <a href="/index/user/personal.html">
                     <h2 class="menuItemTitle userIcon">Personal</h2>
@@ -187,7 +187,7 @@
                     <div class="link"></div>
                 </div>
                 <div class="checkoutButton">
-                    <span>Proceed to Checkout</span>
+                    <span>Redemption using Points</span>
                 </div>
             </section>
         </div>
@@ -457,7 +457,7 @@
             console.log(res)
             const {status, message, data} = res || {}
             if (status === 200 || status === "200") {
-                window.open(data.payment.approval_link, "_blank");
+                window.location.replace('/index/user/order.html')
             } else if (status === 401 || status === "401") {
                 window.location.replace('../passport/logIn.html')
             } else {

app/index/view/index/index.html

@@ -152,7 +152,7 @@
             <div class="goodsModel" id="newGoodsModel" data-type="new">
                 <div class="newGoodsContainer">
                     {foreach $newGoods as $goods}
-                    <a href="/assets/index/productDetails.html">
+                    <a href="/index/index/productDetails.html?goodsId={$goods['goods_id']}">
                         <div class="newGoodsItem">
                             <div class="goodsImgBox">
                                 <img class="lazy" src="/assets/index/asstes/icon/transparent.png"
@@ -208,7 +208,7 @@
             <div class="goodsModel" id="bestGoodsModel" data-type="best">
                 <div class="newGoodsContainer">
                     {foreach $bestseller as $goods}
-                    <a href="/index/index/productDetails.html">
+                    <a href="/index/index/productDetails.html?goodsId={$goods['goods_id']}">
                         <div class="newGoodsItem">
                             <div class="goodsImgBox">
                                 <img class="lazy" src="{$goods['goods_images'][0]['preview_url']}"
@@ -311,7 +311,7 @@
                          data-original="https://www.buranshao.com/Content/Img/iqos3duo.jpg" alt="">
                 </div>
                 {foreach $superDealsOne as $deal}
-                <a href="/index/index/productDetail.html?goodsId={$goods['goods_id']}">
+                <a href="/index/index/productDetails.html?goodsId={$goods['goods_id']}">
                     <div class="newGoodsItem">
                         <div class="newGoodsTag">New</div>
                         <div class="goodsImgBox">
@@ -363,7 +363,7 @@
                          data-original="https://www.buranshao.com/Content/Img/iqos3duo.jpg" alt="">
                 </div>
                 {foreach $superDealsTwo as $deal}
-                <a href="/index/index/productDetail.html?goodsId={$goods['goods_id']}">
+                <a href="/index/index/productDetails.html?goodsId={$goods['goods_id']}">
                     <div class="newGoodsItem">
                         <div class="newGoodsTag">New</div>
                         <div class="goodsImgBox">
@@ -476,7 +476,7 @@
                     <p class="ltV">Sign up for the Vapesourcing newsletter</p>
                 </div>
                 <div class="footerInuptBox">
-                    <img class="mailIcon" src="/assets/index/asstes/icon//mailIcon.png" alt="">
+                    <img class="mailIcon" src="/assets/index/asstes/icon/mailIcon.png" alt="">
                     <input class="footerInupt" type="text">
                     <img class="arrowIcon" src="/assets/index/asstes/icon/arrowIcon.png" alt="">
                 </div>

app/index/view/user/order.html

@@ -36,7 +36,7 @@
         </a>
         <div class="headIconContainer">
             <!-- 购物车 -->
-            <a href="/index/index/index.html">
+            <a href="/index/cart/shoppingCart.html">
                 <div class="headIconItem shoppingCartIcon">
                     <img src="/assets/index/asstes/icon/shoppingCart.png" alt="shoppingCart" tabindex="shoppingCart">
                 </div>