fe / YOHO-ACTIVITY-PHP · Commits

Go to a project

Authored by Rock Zhang
Commit 4b2ea05b947782703b5442d8e08083141ce7b01f 1 parent 6629b988

修复加价购数目显示的问题，修复购物车商品价格显示的问题

Inline Side-by-side
Showing 3 changed files with 16 additions and 11 deletions
@@ -197,7 +197,7 @@ class Helpers @@ -197,7 +197,7 @@ class Helpers
197 * 格式化商品信息 197 * 格式化商品信息
198 * 198 *
199 * @param array $productData 需要格式化的商品数据 199 * @param array $productData 需要格式化的商品数据
200 - * @param bool $showTag 控制是否显示标签 200 + * @param bool $showTags 控制是否显示标签
201 * @param bool $showNew 控制是否显示NEW图标 201 * @param bool $showNew 控制是否显示NEW图标
202 * @param bool $showSale 控制是否显示SALE图标 202 * @param bool $showSale 控制是否显示SALE图标
203 * @param int $width 图片的宽度 203 * @param int $width 图片的宽度
@@ -522,6 +522,7 @@ class Helpers @@ -522,6 +522,7 @@ class Helpers
522 * @param array $orderGoods 订单 522 * @param array $orderGoods 订单
523 * @param int $count 计订单件数 523 * @param int $count 计订单件数
524 * @param bool $haveLink 控制是否需要商品链接 524 * @param bool $haveLink 控制是否需要商品链接
  525 + * @return array $arr 处理之后的订单商品数据
525 */ 526 */
526 public static function formatOrderGoods($orderGoods, &$count = 0, $haveLink = false) 527 public static function formatOrderGoods($orderGoods, &$count = 0, $haveLink = false)
527 { 528 {
@@ -560,6 +561,7 @@ class Helpers @@ -560,6 +561,7 @@ class Helpers
560 * 561 *
561 * @param array $cartGoods 购物车商品列表 562 * @param array $cartGoods 购物车商品列表
562 * @param bool $haveLink 控制是否需要商品链接 563 * @param bool $haveLink 控制是否需要商品链接
  564 + * @return array 处理之后的购物车商品数据
563 */ 565 */
564 public static function formatCartGoods($cartGoods, $haveLink = false) 566 public static function formatCartGoods($cartGoods, $haveLink = false)
565 { 567 {
@@ -573,8 +575,7 @@ class Helpers @@ -573,8 +575,7 @@ class Helpers
573 $oneGoods['thumb'] = !empty($value['goods_images']) ? Images::getImageUrl($value['goods_images'], 120, 120) : ''; 575 $oneGoods['thumb'] = !empty($value['goods_images']) ? Images::getImageUrl($value['goods_images'], 120, 120) : '';
574 $oneGoods['color'] = $value['color_name']; 576 $oneGoods['color'] = $value['color_name'];
575 $oneGoods['size'] = $value['size_name']; 577 $oneGoods['size'] = $value['size_name'];
576 - $oneGoods['appearDate'] = '12月'; // 目前app接口没有返回该数据  
577 - $oneGoods['price'] = $value['real_price']; 578 + $oneGoods['price'] = self::transPrice($value['sales_price']);
578 $oneGoods['count'] = $value['buy_number']; 579 $oneGoods['count'] = $value['buy_number'];
579 $oneGoods['lowStocks'] = ($value['buy_number'] < $value['storage_number']); 580 $oneGoods['lowStocks'] = ($value['buy_number'] < $value['storage_number']);
580 //gift=>是否赠品,advanceBuy=>是否加价购,soldOut=>失效商品; 581 //gift=>是否赠品,advanceBuy=>是否加价购,soldOut=>失效商品;
@@ -604,13 +605,13 @@ class Helpers @@ -604,13 +605,13 @@ class Helpers
604 * 格式化加价购商品 605 * 格式化加价购商品
605 * 606 *
606 * @param array $advanceGoods 加价购商品列表 607 * @param array $advanceGoods 加价购商品列表
607 - * @param bool $haveLink 控制是否需要商品链接 608 + * @param int $count 计商品件数
  609 + * @return array $arr 处理之后的加价购商品数据
608 */ 610 */
609 - public static function formatAdvanceGoods($advanceGoods) 611 + public static function formatAdvanceGoods($advanceGoods, &$count = 0)
610 { 612 {
611 $arr = array(); 613 $arr = array();
612 614
613 -  
614 $gift = array(); 615 $gift = array();
615 $oneGoods = array(); 616 $oneGoods = array();
616 foreach ($advanceGoods as $value) { 617 foreach ($advanceGoods as $value) {
@@ -630,6 +631,9 @@ class Helpers @@ -630,6 +631,9 @@ class Helpers
630 } 631 }
631 632
632 $arr[] = $gift; 633 $arr[] = $gift;
  634 +
  635 + // 计算加价购商品数目
  636 + $count += count($value['goods_list']);
633 } 637 }
634 638
635 return $arr; 639 return $arr;
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 <span class="iconfont">&#xe61b;</span> 21 <span class="iconfont">&#xe61b;</span>
22 加价购 22 加价购
23 <a> 23 <a>
24 - <span class="count">{{count}}</span> 24 + <span class="count">{{advanceBuyCount}}</span>
25 <span class="iconfont icon-right-arrow">&#xe614;</span> 25 <span class="iconfont icon-right-arrow">&#xe614;</span>
26 </a> 26 </a>
27 </li> 27 </li>
@@ -619,12 +619,13 @@ class CartModel @@ -619,12 +619,13 @@ class CartModel
619 (count($data['gift_list']) || count($data['price_gift'])) && $result['freebieOrAdvanceBuy'] = true; 619 (count($data['gift_list']) || count($data['price_gift'])) && $result['freebieOrAdvanceBuy'] = true;
620 $result['freebie'] = $data['gift_list']; 620 $result['freebie'] = $data['gift_list'];
621 // 加价购 621 // 加价购
622 - $result['advanceBuy'] = Helpers::formatAdvanceGoods($data['price_gift']); 622 + $result['advanceBuyCount'] = 0;
  623 + $result['advanceBuy'] = Helpers::formatAdvanceGoods($data['price_gift'], $result['advanceBuyCount']);
623 // 结算数据 624 // 结算数据
624 - $result['price'] = $data['shopping_cart_data']['order_amount'];  
625 - $result['activityPrice'] = $data['shopping_cart_data']['discount_amount']; 625 + $result['price'] = Helpers::transPrice($data['shopping_cart_data']['order_amount']);
  626 + $result['activityPrice'] = Helpers::transPrice($data['shopping_cart_data']['discount_amount']);
626 $result['count'] = $data['shopping_cart_data']['goods_count']; 627 $result['count'] = $data['shopping_cart_data']['goods_count'];
627 - $result['sumPrice'] = $data['shopping_cart_data']['order_amount']; 628 + $result['sumPrice'] = Helpers::transPrice($data['shopping_cart_data']['order_amount']);
628 629
629 return $result; 630 return $result;
630 } 631 }