xieruidong 2 anos atrás
pai
commit
6b173d6bb2
2 arquivos alterados com 196 adições e 187 exclusões
  1. 6 0
      application/api/controller/mall/Orders.php
  2. 190 187
      public/api.html

+ 6 - 0
application/api/controller/mall/Orders.php

@@ -9,6 +9,7 @@ use app\common\model\Refund;
 use app\common\service\OrderService;
 use app\common\service\RefundService;
 use app\common\validate\TaxValidate;
+use Carbon\Carbon;
 use think\Cache;
 use think\Db;
 use app\common\model\Orders as Order;
@@ -81,6 +82,7 @@ class Orders extends Api
      * @ApiParams (name=remark,description=留言)
      * @ApiParams (name=address_id,description=收货地址id)
      * @ApiParams (name=is_tax,description=是1否0需要开票)
+     * @ApiParams (name=customer_send_time,description="预定发货时间,datetime")
      * @ApiParams (name=tax,description=发票信息)
      * @ApiParams (name=tax.paper_type,description=1电子2纸质)
      * @ApiParams (name=tax.self_type,description=1专票2普票)
@@ -100,8 +102,12 @@ class Orders extends Api
             'frm|来源'=>['require','in:1,2'],
             'remark|备注'=>['max:50'],
             'address_id|收货地址'=>['require','integer','gt:0'],
+            'customer_send_time|发货时间'=>['date'],
         ]);
         $this->validateTax();
+        if(!empty($data['customer_send_time']) && strtotime($data['customer_send_time'])<Carbon::now()->startOfDay()->addDays(config('site.send_delay_day'))->timestamp){
+            $this->error('发货时间过早');
+        }
         $user=$this->auth->getUser();
         $address=$user->address()->find($data['address_id']);
         abortIf(!$address,'地址不存在');

Diferenças do arquivo suprimidas por serem muito extensas
+ 190 - 187
public/api.html


Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff