撤销调整

application/index/controller/Finance.php

@@ -3107,4 +3107,38 @@ class Finance extends Basic
         return $this->response("200","success",["residue_money"=>$result]);
 
     }
+
+    /**
+     * 撤销调整
+     *
+     * @return \think\Response
+     */
+    public function delAdjustment() {
+        $code = 101;
+        if (empty($this->params['id'])) {
+            return $this->response($code, '参数错误');
+        }
+
+        $m_pay_adjustment = new OPayLogAdjustment();
+
+        $new_paylog_id = $m_pay_adjustment->getFieldValue('new_paylog_id', ['id'=>$this->params['id']]);
+        if (empty($new_paylog_id)) {
+            return $this->response($code, '无调整信息');
+        }
+
+        $num = $m_pay_adjustment->editData(['is_del'=>0], $this->params['id']);
+
+        if ($num > 0) {
+            $m_pay = new OPayLogModel();
+            $save_data['id'] = $new_paylog_id;
+            $save_data['is_del'] = 1;
+            $m_pay->updatePayLog($save_data);
+            $code = 200;
+            $msg = '撤销成功';
+        } else {
+            $msg = '撤销失败';
+        }
+
+        return $this->response($code, $msg);
+    }
 }

application/index/service/HouseService.php

@@ -93,16 +93,20 @@ class HouseService
                 }
 
                 $m_operating = new GOperatingRecords();
-                $remark = '修改为：剩余铺数' . $data['residue_num'];
+
+                $remark = '';
+                if (isset($data['residue_num'])) {
+                    $remark = '修改为：剩余铺数' . $data['residue_num'];
+                }
                 if ($data['is_exclusive_type'] == 1) {
                     $remark .= '，独家有效期 ' . $data['agent_start_time'] . '—' . $data['agent_end_time'];
                 }
 
-                if ($data['internal_title'] != $house_data[0]['internal_title']) {
+                if (isset($data['internal_title']) && $data['internal_title'] != $house_data[0]['internal_title']) {
                     $remark .= ',商铺名改为:' . $data['internal_title'];
                 }
 
-                if ($data['internal_address'] != $house_data[0]['internal_address']) {
+                if (isset($data['internal_address']) && $data['internal_address'] != $house_data[0]['internal_address']) {
                     $remark .= ',地址改为:' . $data['internal_address'];
                 }
 

application/model/GHouses.php

@@ -583,11 +583,13 @@ class GHouses extends BaseModel
             $save_data['status'] = $data['status'];
         }
 
-        //剩余商铺为0下架
-        if (empty($data['residue_num']) || empty($data['total'])) {
-            $save_data['status'] = 2;
-        } else {
-            $save_data['status'] = 1;
+        if (isset($data['residue_num']) || isset($data['total'])) {
+            //剩余商铺为0下架
+            if (empty($data['residue_num']) || empty($data['total'])) {
+                $save_data['status'] = 2;
+            } else {
+                $save_data['status'] = 1;
+            }
         }
 
         //首页排序
@@ -605,11 +607,13 @@ class GHouses extends BaseModel
             $save_data['shop_area_start'] = $data['shop_area_start'];
         }
 
-        //店铺面积存米  街铺start和end面积一样
-        if (isset($data['shop_area_end']) && $data['shop_type'] == 0) {
-            $save_data['shop_area_end'] = $data['shop_area_end'];
-        } else {
-            $save_data['shop_area_end'] = $data['shop_area_start'];
+        if (isset($data['shop_area_end'])) {
+            //店铺面积存米  街铺start和end面积一样
+            if ($data['shop_type'] == 0) {
+                $save_data['shop_area_end'] = $data['shop_area_end'];
+            } else {
+                $save_data['shop_area_end'] = $data['shop_area_start'];
+            }
         }
 
         //商铺标签
@@ -721,23 +725,24 @@ class GHouses extends BaseModel
             }
         }
 
-        //楼盘地址(对外)
-        if (empty($save_data['internal_address'])) {
-            $save_data['external_address'] = $save_data['city'] . $save_data['disc'];
-        } else {
-            $save_data['external_address'] = $save_data['city'] . $save_data['disc'];
-        }
+        if (isset($save_data['internal_address'])) {
+            //楼盘地址(对外)
+            if (empty($save_data['internal_address'])) {
+                $save_data['external_address'] = $save_data['city'] . $save_data['disc'];
+            } else {
+                $save_data['external_address'] = $save_data['city'] . $save_data['disc'];
+            }
 
-        $save_data['external_address'] = $save_data['city'] . $save_data['disc'];
+            $save_data['external_address'] = $save_data['city'] . $save_data['disc'];
 
-        if (strpos($save_data['internal_address'], '路')) {
-            $save_data['external_address'] .= substr($save_data['internal_address'], 0, strpos($save_data['internal_address'], '路')) . '路';
-        }
+            if (strpos($save_data['internal_address'], '路')) {
+                $save_data['external_address'] .= substr($save_data['internal_address'], 0, strpos($save_data['internal_address'], '路')) . '路';
+            }
 
-        if (strpos($save_data['internal_address'], '街')) {
-            $save_data['external_address'] .= substr($save_data['internal_address'], 0, strpos($save_data['internal_address'], '街')) . '街';
+            if (strpos($save_data['internal_address'], '街')) {
+                $save_data['external_address'] .= substr($save_data['internal_address'], 0, strpos($save_data['internal_address'], '街')) . '街';
+            }
         }
-
         //是否显示真实图片
         if (isset($data['is_show_image'])) {
             $save_data['is_show_image'] = $data['is_show_image'];

application/route.php

@@ -278,6 +278,7 @@ Route::group('index', [
     'collectingBill'                     => ['index/Finance/collectingBill', ['method' => 'post']],//收款
     'getBeForNum'                        => ['index/Finance/getBeForNum', ['method' => 'get']],//getBeForNum
     'getAdjustment'                      => ['index/Finance/getAdjustment', ['method' => 'get']],//剩余可以调整或退款的钱
+    'delAdjustment'                      => ['index/Finance/delAdjustment', ['method' => 'post']],//撤销调整
     'performanceInfo'                    => ['index/PerformanceInfo/performanceInfo', ['method' => 'post|get']],//业绩明细
     'getPerformanceInfoExcel'            => ['index/PerformanceInfo/getPerformanceInfoExcel', ['method' => 'post|get']],//业绩明细