rabin 3 年之前
父節點
當前提交
b87244c6b8
共有 3 個文件被更改,包括 7 次插入5 次删除
  1. 5 2
      app/mshop/src/My.php
  2. 1 1
      app/shop/lib/Refund.php
  3. 1 2
      service/agent/lib/Dhorder.php

+ 5 - 2
app/mshop/src/My.php

@@ -354,7 +354,8 @@ class My extends Core
         $this->data['config'] = Dever::db('main/manage_config')->find();
         $where['shop_id'] = $this->shop_id;
         $shop = Dever::db('shop/info')->find($this->shop_id);
-        $stat_type = Dever::db($table)->config['config_type'];
+        //$stat_type = Dever::db($table)->config['config_type'];
+        $stat_type = $shop['stat_type'];
         $status = Dever::db($table)->config['config_status'];
 
         $month = Dever::input('month');
@@ -419,9 +420,11 @@ class My extends Core
 
         $where['id'] = $id;
         $where['shop_id'] = $this->shop_id;
+        $shop = Dever::db('shop/info')->find($this->shop_id);
         $this->data['config'] = Dever::db('main/manage_config')->find();
         $this->data['info'] = Dever::db($table)->find($where);
-        $stat_type = Dever::db($table)->config['config_type'];
+        //$stat_type = Dever::db($table)->config['config_type'];
+        $stat_type = $shop['stat_type'];
         $status = Dever::db($table)->config['config_status'];
 
         if (!$this->data['info']) {

+ 1 - 1
app/shop/lib/Refund.php

@@ -150,7 +150,7 @@ class Refund
             $re_cash = 0;
             if ($order_goods_id) {
                 $info = Dever::db($this->goods_table)->find(array('id' => $order_goods_id, 'order_id' => $data['id']));
-                if ($info) {
+                if ($info && $info['status'] == 1) {
 
                     Dever::db($this->goods_table)->update(array('where_id' => $info['id'], 'status' => 2));
 

+ 1 - 2
service/agent/lib/Dhorder.php

@@ -286,12 +286,11 @@ class Dhorder
         $order_data_where['end'] = $time;
         $order_data_where['option']['start'] = array('yes-cdate', '>=');
         $order_data_where['option']['end'] = array('yes-cdate', '<=');
-        
+
         $info = Dever::db('agent/dh_order')->find($order_data_where);
 
         $order_data['order_num'] = $this->getOrderId();
 
-        
         if (!$info) {
             $id = Dever::db('agent/dh_order')->insert($order_data);
         } else {