Authored by 郝肖肖

支付合master 同步

@@ -51,7 +51,7 @@ class PayModel @@ -51,7 +51,7 @@ class PayModel
51 */ 51 */
52 public static function getPayTypeData($uid, $orderCode) 52 public static function getPayTypeData($uid, $orderCode)
53 { 53 {
54 - $result = array(); 54 + $result = array('orderNum' => 0, 'count' => 0, 'pinyouGoods' => '', 'orderNum' => 0, 'orderGoods' => '');
55 55
56 do { 56 do {
57 // 订单详情 57 // 订单详情
@@ -39,7 +39,7 @@ class PaymentModel @@ -39,7 +39,7 @@ class PaymentModel
39 */ 39 */
40 public static function getPayTypeData($uid, $orderCode) 40 public static function getPayTypeData($uid, $orderCode)
41 { 41 {
42 - $result = array(); 42 + $result = array('orderNum' => 0, 'count' => 0, 'pinyouGoods' => '', 'orderNum' => 0, 'orderGoods' => '');
43 43
44 do { 44 do {
45 // 订单详情 45 // 订单详情
@@ -53,6 +53,32 @@ class PaymentModel @@ -53,6 +53,32 @@ class PaymentModel
53 $result['orderNum'] = $orderCode; 53 $result['orderNum'] = $orderCode;
54 $result['count'] = $order['payment_amount']; 54 $result['count'] = $order['payment_amount'];
55 $result['paymentType'] = ($order['payment_type'] == 1 ? '在线支付' : '货到付款'); 55 $result['paymentType'] = ($order['payment_type'] == 1 ? '在线支付' : '货到付款');
  56 + // 订单商品(用于订单统计)
  57 + $result['orderGoods'] = $order['order_goods'];
  58 +
  59 + //统计成交的skn
  60 + $sknList = array();
  61 + $skuList = array();
  62 + $goodsData = array();
  63 + $pinyouGoodsArr = array();
  64 + foreach ($order['order_goods'] as $val) {
  65 + $sknList[] = $val['product_skn'];
  66 + $skuList[] = $val['product_sku'];
  67 + $goodsData[] = array(
  68 + 'goods_name' => $val['product_name'],
  69 + 'product_sku' => $val['product_sku'],
  70 + 'price' => $val['goods_price'],
  71 + 'number' => $val['buy_number']
  72 + );
  73 + $pinyouGoodsArr[] = $val['product_id'] . ',' . $val['buy_number'];
  74 + }
  75 + $result['goodsData'] = $goodsData;
  76 + // skn列表
  77 + $result['sknList'] = implode(',', $sknList);
  78 + // sku列表
  79 + $result['skuList'] = implode(',', $skuList);
  80 + // 品友统计需要的商品数据
  81 + $result['pinyouGoods'] = implode(';', $pinyouGoodsArr);
56 82
57 // 货到付款的情况 83 // 货到付款的情况
58 if ($order['payment_type'] == 2) { 84 if ($order['payment_type'] == 2) {
@@ -76,25 +102,6 @@ class PaymentModel @@ -76,25 +102,6 @@ class PaymentModel
76 102
77 $result['deliveryType'] = isset($order['delivery_time']) ? $order['delivery_time'] : ''; 103 $result['deliveryType'] = isset($order['delivery_time']) ? $order['delivery_time'] : '';
78 104
79 - //统计成交的skn  
80 - $sknList = array();  
81 - $skuList = array();  
82 - $goodsData = array();  
83 - foreach ($order['order_goods'] as $val) {  
84 - $sknList[] = $val['product_skn'];  
85 - $skuList[] = $val['product_sku'];  
86 - $goodsData[] = array(  
87 - 'goods_name' => $val['product_name'],  
88 - 'product_sku' => $val['product_sku'],  
89 - 'price' => $val['goods_price'],  
90 - 'number' => $val['buy_number']  
91 - );  
92 - }  
93 - $result['goodsData'] = $goodsData;  
94 - // skn列表  
95 - $result['sknList'] = implode(',', $sknList);  
96 - // sku列表  
97 - $result['skuList'] = implode(',', $skuList);  
98 105
99 // 用户ID 106 // 用户ID
100 $result['uid'] = $uid; 107 $result['uid'] = $uid;
@@ -172,8 +179,6 @@ class PaymentModel @@ -172,8 +179,6 @@ class PaymentModel
172 // 订单数(用于订单统计) 179 // 订单数(用于订单统计)
173 $result['orderCount'] = $orderCount; 180 $result['orderCount'] = $orderCount;
174 $result['is_advance'] = $order['attribute'] == 5 ? 'Y' : 'N'; 181 $result['is_advance'] = $order['attribute'] == 5 ? 'Y' : 'N';
175 - // 订单商品(用于订单统计)  
176 - $result['orderGoods'] = $order['order_goods'];  
177 // 订单商品数(用于订单统计) 182 // 订单商品数(用于订单统计)
178 $result['ordersGoodsNums'] = count($order['order_goods']); 183 $result['ordersGoodsNums'] = count($order['order_goods']);
179 184