Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

app/mshop/lib/Buy.php

@@ -783,6 +783,7 @@ class Buy
 
     private function show_address($info, &$result, $type, $type_info)
     {
+        
         $parent_order = array();
         if ($info['parent_type'] == 2) {
             $parent_order = Dever::db('shop/sell_order')->find($info['parent_order_id']);
@@ -845,6 +846,11 @@ class Buy
                 array('联系电话', $type_info['mobile']),
                 array('订单备注', $info['info']),
             );
+            $result[$info['order_num']]['content'][] = array
+            (
+                array('资金账户抵扣', $info['record_cash']),
+                
+            );
         }
 
 

app/mshop/src/Buy.php

@@ -127,18 +127,17 @@ class Buy extends Core
                     $this->data['wallet']['price'] = $this->data['price'];
                     $this->data['price'] = 0;
                     #余额
-                    $this->data['wallet']['yue'] = $this->shop['price'] - $this->data['price'];
+                    $this->data['wallet']['yue'] = round($this->shop['price'] - $this->data['price'],2);
                 } else {
                     $this->data['wallet']['type'] = 2;
                     $this->data['wallet']['price'] = $this->shop['price'];
-                    $this->data['price'] = $this->data['price'] - $this->shop['price'];
+                    $this->data['price'] = round($this->data['price'] - $this->shop['price'],2);
                     $this->data['wallet']['yue'] = 0;
                 }
             }
         }else{
             $this->data['wallet']['yue'] = $this->shop['price'];
         }
-
         $this->data['name'] = implode(',', $this->data['name']);
     }