商品平兰

admin/language/zh/trade.php

@@ -26,6 +26,8 @@ $lang['order_price_from']          = '訂單金額';
 $lang['cancel_search']             = '撤銷檢索';
 $lang['order_time']                = '下單時間';
 $lang['order_total_price']         = '訂單總額';
+$lang['order_bonus']               = '红包抵扣';
+$lang['order_discount']            = '折扣率';
 $lang['order_total_transport']     = '運費';
 $lang['miss_order_number']         = '缺少訂單編號';
 

admin/language/zh_cn/trade.php

@@ -27,6 +27,8 @@ $lang['order_price_from']          = '订单金额';
 $lang['cancel_search']             = '撤销检索';
 $lang['order_time']                = '下单时间';
 $lang['order_total_price']         = '订单总额';
+$lang['order_bonus']               = '红包抵扣';
+$lang['order_discount']            = '折扣率';
 $lang['order_total_transport']     = '运费';
 $lang['miss_order_number']         = '缺少订单编号';
 

admin/templates/default/order.index.php

@@ -73,10 +73,13 @@
     <thead>
       <tr class="thead">
         <th><?php echo $lang['order_number'];?></th>
-        <th><?php echo $lang['store_name'];?></th>
+<!--        <th>--><?php //echo $lang['store_name'];?><!--</th>-->
         <th><?php echo $lang['buyer_name'];?></th>
         <th class="align-center"><?php echo $lang['order_time'];?></th>
         <th class="align-center"><?php echo $lang['order_total_price'];?></th>
+        <th class="align-center"><?php echo $lang['order_bonus'];?></th>
+        <th class="align-center"><?php echo $lang['order_discount'];?></th>
+
         <th class="align-center"><?php echo $lang['payment'];?></th>
         <th class="align-center"><?php echo $lang['order_state'];?></th>
         <th class="align-center"><?php echo $lang['nc_handle'];?></th>
@@ -87,11 +90,22 @@
       <?php foreach($output['order_list'] as $order){?>
       <tr class="hover">
         <td><?php echo $order['order_sn'];?></td>
-        <td><?php echo $order['store_name'];?></td>
+<!--        <td>--><?php //echo $order['store_name'];?><!--</td>-->
         <td><?php echo $order['buyer_name'];?></td>
         <td class="nowrap align-center"><?php echo date('Y-m-d H:i:s',$order['add_time']);?></td>
         <td class="align-center"><?php echo $order['order_amount'];?></td>
-        <td class="align-center"><?php echo orderPaymentName($order['payment_code']);?></td>
+        <td class="align-center"><?php echo $order['pd_amount'];?></td>
+        <td class="align-center"><?php
+            $pay_amount = $order['order_amount'] - $order['pd_amount'] - $order['shipping_fee'];
+            if(intval($order['order_amount'] * 100 + 0.5) > 0) {
+                $discount = $pay_amount / $order['order_amount'];
+            } else {
+                $discount = 0;
+            }
+            $discount =  intval($discount* 100 + 0.5);
+            echo "{$discount}%" ;
+            ?></td>
+          <td class="align-center"><?php echo orderPaymentName($order['payment_code']);?></td>
         <td class="align-center"><?php echo orderState($order);?></td>
         <td class="w144 align-center"><a href="index.php?act=order&op=show_order&order_id=<?php echo $order['order_id'];?>"><?php echo $lang['nc_view'];?></a>
 

helper/pay_helper.php

@@ -123,6 +123,18 @@ class pay_helper
         return ($need_pay === $total_fee);
     }
 
+    static public function paied($pay_sn)
+    {
+        $logic_payment = Logic('payment');
+        $result = $logic_payment->getRealOrderInfo($pay_sn);
+
+        if (intval($result['data']['api_pay_state']) != 0) {
+            return true;
+        }
+
+        return false;
+    }
+
     public function OnNotify($param,$payment)
     {
         $pay = $this->gen_payment($payment);

helper/special_helper.php

@@ -130,6 +130,29 @@ class special_helper
 
         return $result;
     }
+    public static function format_comments($comments)
+    {
+        $blocks = [];
+        foreach ($comments as $val)
+        {
+            $block = [];
+            $block['item_title'] = '';
+            $block['item_type'] = 'home_comment';
+            $block['scale'] = 1;
+
+            $item['image'] = '';
+            $item['type']  = 'comment';
+            $item['data']  = intval($val['geval_id']);
+            $item['title'] = $val['geval_goodsname'];
+            $items[] = $item;
+
+            $block['items'] = $items;
+
+            $blocks[] = $block;
+        }
+
+        return $blocks;
+    }
 
     public static function format_brand($brands)
     {

mobile/alipay_notify_url.php

@@ -28,6 +28,11 @@ if ($verify_result)
     $trade_status = $_POST['trade_status'];
     if ($trade_status === 'TRADE_FINISHED' || $trade_status === 'TRADE_SUCCESS')
     {
+        if(pay_helper::paied($pay_sn)) {
+            echo('success'); //该订单已经支付
+            return;
+        }
+
         $chk = pay_helper::check_fee($pay_sn,$total_fee,$need_pay);
         if($chk == false) {
             Log::record("AliPay check: pay_sn={$pay_sn},total_fee={$total_fee},need_pay={$need_pay}",Log::WAIT_HANDLE);

mobile/control/goods_common.php

@@ -9,9 +9,12 @@
 
 require_once (BASE_ROOT_PATH . "/helper/goods_helper.php");
 require_once (BASE_ROOT_PATH . "/helper/activity_helper.php");
+require_once (BASE_ROOT_PATH . '/helper/special_helper.php');
 
 class goods_commonControl extends mobileControl
 {
+    const pic_path = '/data/upload/shop/member';
+
     public function __construct()
     {
         parent::__construct();
@@ -41,6 +44,68 @@ class goods_commonControl extends mobileControl
             return self::outerr(errcode::ErrParamter,"请输入正确的参数.");
         }
     }
+
+    private function format_image($member_id,$image)
+    {
+        $images = explode(',',$image);
+        if(empty($images)) {
+            return array();
+        }
+
+        $result = [];
+        foreach ($images as $img) {
+            $path = BASE_SITE_URL . self::pic_path . "/{$member_id}/" . $img;
+            $result[] = $path;
+        }
+
+        return $result;
+    }
+
+    private function format_comment($items)
+    {
+        $blocks = special_helper::format_comments($items);
+        $comments = [];
+        foreach ($items as $item)
+        {
+            $val['geval_id'] = intval($item['geval_id']);
+            $val['order_id'] = intval($item['geval_orderid']);
+            $val['order_sn'] = $item['geval_orderno'];
+            $val['goods_id'] = intval($item['geval_goodsid']);
+            $val['goods_name'] = $item['geval_goodsname'];
+            $val['goodsprice'] = doubleval($item['geval_goodsprice']);
+            $val['goodsimage'] = $item['geval_goodsimage'];
+            $val['scores'] = $item['geval_scores'];
+            $val['anonymous'] = $item['geval_isanonymous'];
+
+            $val['addtime'] = intval($item['geval_addtime']);
+            $val['storeid'] = intval($item['geval_storeid']);
+            $val['storename'] = $item['geval_storename'];
+            $member_id = intval($item['geval_frommemberid']);
+
+            $val['frommemberid'] = $member_id;
+            $val['frommembername'] = $item['geval_frommembername'];
+            $val['remark'] = $item['geval_remark'];
+            $val['images'] = $this->format_image($member_id,$item['geval_image']);
+
+            $comments[] = $val;
+        }
+
+        return array('blocks' => $blocks,'comments' => $comments);
+    }
+
+    public function commentsOp()
+    {
+        $common_id = intval($_GET['goods_commonid']);
+        if($common_id <= 0) {
+            return self::outerr(errcode::ErrParamter,"参数信息错误");
+        }
+        $mod_eva = Model('evaluate_goods');
+        $items = $mod_eva->getEvaluateGoodsList(array('geval_commonid' => $common_id),$this->page_size());
+        $page_count = $mod_eva->gettotalpage();
+        $result = $this->format_comment($items);
+
+        return self::outsuccess(array('comments' => $result,'mobile_page' =>mobile_page($page_count)));
+    }
 }
 
 class tpl_detail

mobile/control/member_evaluate.php

@@ -222,13 +222,15 @@ class member_evaluateControl extends mbMemberControl
         $goodsid_array = array();
         foreach ($order_goods as $value)
         {
+            $goods_id = intval($value['goods_id']);
+            $goods_commonid = commonid_helper::instance()->common_id($goods_id);
             //如果未评分，默认为5分
-            $evaluate_score = $comments[$value['goods_id']]['score'];
+            $evaluate_score = $comments[$goods_id]['score'];
             if($evaluate_score <= 0 || $evaluate_score > 5) {
                 $evaluate_score = 5;
             }
             //默认评语
-            $evaluate_comment = $comments[$value['goods_id']]['comment'];
+            $evaluate_comment = $comments[$goods_id]['comment'];
             if(empty($evaluate_comment)) {
                 $evaluate_comment = '不错哦';
             }
@@ -238,6 +240,7 @@ class member_evaluateControl extends mbMemberControl
             $evaluate_goods_info['geval_orderid'] = $order_id;
             $evaluate_goods_info['geval_orderno'] = $order_info['order_sn'];
             $evaluate_goods_info['geval_ordergoodsid'] = $value['rec_id'];
+            $evaluate_goods_info['geval_commonid'] = $goods_commonid;
             $evaluate_goods_info['geval_goodsid'] = $value['goods_id'];
             $evaluate_goods_info['geval_goodsname'] = $value['goods_name'];
             $evaluate_goods_info['geval_goodsprice'] = $value['goods_price'];

mobile/control/member_order.php

@@ -46,7 +46,7 @@ class member_orderControl extends mbMemberControl
         $page_count = $model_order->gettotalpage();
         $model_order->cls();
 
-        self::outsuccess(array('orders' => $result,'mobile_page' =>mobile_page($page_count)));
+        return self::outsuccess(array('orders' => $result,'mobile_page' =>mobile_page($page_count)));
     }
     public function infoOp()
     {
@@ -58,7 +58,7 @@ class member_orderControl extends mbMemberControl
         if($order == false) {
             return self::outerr(errcode::ErrOrder);
         } else {
-            self::outsuccess(array('order' => $order));
+            return self::outsuccess(array('order' => $order));
         }
     }
 
@@ -73,7 +73,7 @@ class member_orderControl extends mbMemberControl
         if($order == false) {
             return self::outerr(errcode::ErrOrder);
         } else {
-            self::outsuccess(array('order' => $order,"paytype" => $pay_ments));
+            return self::outsuccess(array('order' => $order,"paytype" => $pay_ments));
         }
     }
 
@@ -284,7 +284,7 @@ class member_orderControl extends mbMemberControl
         if (!$result['state']) {
             return self::outerr(errcode::ErrOrder, $result['msg']);
         } else {
-            self::outsuccess(array('result' => '1'));
+            return self::outsuccess(array('result' => '1'));
         }
     }
 
@@ -310,7 +310,7 @@ class member_orderControl extends mbMemberControl
         if (!$result['state']) {
             return self::outerr(errcode::ErrOrder, $result['msg']);
         } else {
-            self::outsuccess(array('result' => '1'));
+            return self::outsuccess(array('result' => '1'));
         }
     }
 

upfile_ex.php

@@ -55,6 +55,4 @@ if ($_POST)
   			upfile_joutput_error();
   		}
 	}
-}
-
-?> 
+}