2 Commits 44a059ed10 ... fbfc353c11

Author SHA1 Message Date
  zhangguidong fbfc353c11 sgd 2 years ago
  zhangguidong 11eb931b41 sgd 2 years ago
2 changed files with 4 additions and 1 deletions
  1. 3 1
      application/api/controller/Yorder.php
  2. 1 0
      public/assets/js/backend/order.js

+ 3 - 1
application/api/controller/Yorder.php

@@ -60,6 +60,8 @@ class Yorder extends Api
         }
        $method_info = $method_model->where('id',$data['method_id'])->field('type,show_images,moshi,user_id,yutang_id,yutang_name,eat_price,yajin')->find();
        $images = explode(',',$method_info['show_images']);
+        $rebate = rebate($method_info['type'],$method_info['moshi']);
+        $youhui= $rebate['reduction'];
        $order_data = [
            'user_id'=>$this->auth->id,
            'order_no'=>$order_no,
@@ -72,7 +74,7 @@ class Yorder extends Api
            'item_money'=>$data['item_money'],
            'wucan_money'=>$data['wucan_money'],
            'yajin_money'=>$data['yajin_money'],
-           'youhui_money'=>config('site.reduction'),
+           'youhui_money'=>$youhui,
            'order_money'=>$data['order_money'],
            'status'=>1,
            'create_time'=>time(),

+ 1 - 0
public/assets/js/backend/order.js

@@ -7,6 +7,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 extend: {
                     index_url: 'order/index' + location.search,
                     add_url: 'order/add',
+                    edit_url: 'order/edit',
                     multi_url: 'order/multi',
                     import_url: 'order/import',
                     table: 'order',