diff --git a/common/models/CarT.php b/common/models/CarT.php index ae9159e..78b7ef2 100644 --- a/common/models/CarT.php +++ b/common/models/CarT.php @@ -48,9 +48,6 @@ use Yii; */ class CarT extends \common\models\Base { - const MONTH = [1,2,3,4,5,6,7,8,9,10,11,12]; - const DAYS = [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31]; - /** * @inheritdoc */ @@ -68,7 +65,7 @@ class CarT extends \common\models\Base [['user_id', 'car_type_id', 'car_use_id'], 'required'], [['user_id', 'car_type_id', 'car_use_id','seats','brand_id','series_id','displacement_id','location','invalid_id','invalid_flag','is_track','times','biaozhu','hiddenes'], 'integer'], [['register_date', 'insurer1_date', 'insurer2_date','id_man','id_number','print_date','car_man_number', 'created_at', 'updated_at'], 'safe'], - [['car_no', 'factory_model', 'car_model', 'engine_no', 'car_frame_no','old_user','phone1','id_phone'], 'string', 'max' => 50], + [['car_no', 'factory_model', 'car_model', 'engine_no', 'car_frame_no','old_user','id_phone'], 'string', 'max' => 50], [['car_year'], 'string', 'max' => 10], [['car_man','phone','remark','company','op_user1','op_user2','op_user3','weixin','from_src'], 'string', 'max' => 200], ]; diff --git a/common/models/GiftUseLogT.php b/common/models/GiftUseLogT.php new file mode 100644 index 0000000..fa95401 --- /dev/null +++ b/common/models/GiftUseLogT.php @@ -0,0 +1,63 @@ + 50], + [['group_name', 'remark','info'], 'string', 'max' => 100], + ]; + } + + /** + * @inheritdoc + */ + public function attributeLabels() + { + return [ + 'id' => 'ID', + 'gift_use_id' => 'Gift Use ID', + 'op_man' => 'Op Man', + 'op_time' => 'Op Time', + 'group_name' => 'Group Name', + 'type' => 'Type', + 'remark' => 'Remark', + 'info' => 'Info', + 'created_at' => 'Created At', + 'updated_at' => 'Updated At', + ]; + } +} diff --git a/common/models/InsurerCompanyT.php b/common/models/InsurerCompanyT.php index 4e6dfbe..9d40678 100644 --- a/common/models/InsurerCompanyT.php +++ b/common/models/InsurerCompanyT.php @@ -9,7 +9,6 @@ use Yii; * * @property integer $id * @property string $name - * @property string $sam * @property string $created_at * @property string $updated_at */ @@ -30,9 +29,8 @@ class InsurerCompanyT extends \common\models\Base { return [ [['name'], 'required'], - [['difc'], 'integer'], [['created_at', 'updated_at'], 'safe'], - [['name','sam'], 'string', 'max' => 100], + [['name'], 'string', 'max' => 100], ]; } @@ -44,7 +42,6 @@ class InsurerCompanyT extends \common\models\Base return [ 'id' => 'ID', 'name' => 'Name', - 'sam' => 'SAM', 'created_at' => 'Created At', 'updated_at' => 'Updated At', ]; diff --git a/common/models/OrderT.php b/common/models/OrderT.php index df1a216..2358986 100644 --- a/common/models/OrderT.php +++ b/common/models/OrderT.php @@ -36,15 +36,6 @@ use Yii; * @property string $insurer2_end_date * @property string $send_date * @property string $direction_id - * @property string $range1_id - * @property string $city1_id - * @property string $district1_id - * @property string $send_address1 - * @property string $direction2_id - * @property string $range2_id - * @property string $city2_id - * @property string $district2_id - * @property string $send_address2 * @property integer $pay_type_id * @property string $pay_no * @property string $remark @@ -110,9 +101,9 @@ class OrderT extends \common\models\Base public function rules() { return [ - [['car_id', 'user_id', 'company_id', 'company2_id', 'status_id', 'pay_type_id','lock_id','range1_id','send_city_id','send_district_id','direction2_id','range2_id','city2_id','district2_id','success_id','return_status_id','return_time','first_send','send_times','check_gift','gift_type1_id','gift_type8_id','gift_type2_id','gift_type3_id','gift_type4_id','gift_type5_id','gift_type6_id','gift_type7_id','business_group_id','op1_id','op2_id','shoufei_id','payer','payee_id','hk_status','payment_id','account_status','insurance_status','el_insurance','ord_scheme_id','non_num','addr_id'], 'integer'], + [['car_id', 'user_id', 'company_id', 'company2_id', 'status_id', 'pay_type_id','lock_id','send_city_id','send_district_id','success_id','return_status_id','return_time','first_send','send_times','check_gift','gift_type1_id','gift_type8_id','gift_type2_id','gift_type3_id','gift_type4_id','gift_type5_id','gift_type6_id','gift_type7_id','business_group_id','op1_id','op2_id','shoufei_id','payer','payee_id','hk_status','payment_id','account_status','insurance_status','el_insurance','ord_scheme_id','non_num','addr_id'], 'integer'], [['submit_date', 'insurer1_begin_date', 'insurer1_end_date', 'insurer2_begin_date', 'insurer2_end_date', 'send_date','print_date','zhifu_date', 'created_at', 'updated_at','insurer_date_start','insurer_date_end'], 'safe'], - [['gift_other', 'id_man', 'id_man_number', 'id_man_type', 'id_man_phone', 'link_man', 'link_man_phone', 'link_man_type', 'link_man_number', 'send_address','send_address2','car_frame_no','car_man','total1','total1_clear','total1_real','total1_dis','total1_percent','total1_rate','total2','total2_clear','total2_rate','total3','total_all','total_real','price_remark','money_no','money_bank','email','return_remark','piao_header','photo_back','photo_face','tijiang'], 'string', 'max' => 100], + [['gift_other', 'id_man', 'id_man_number', 'id_man_type', 'id_man_phone', 'link_man', 'link_man_phone', 'link_man_type', 'link_man_number', 'send_address','car_frame_no','car_man','total1','total1_clear','total1_real','total1_dis','total1_percent','total1_rate','total2','total2_clear','total2_rate','total3','total_all','total_real','price_remark','money_no','money_bank','email','return_remark','piao_header','photo_back','photo_face','tijiang'], 'string', 'max' => 100], [['car_no','engine_no','pay_no','insurer1_no','insurer2_no','identifying_code','money_man','insurer_non_no'], 'string', 'max' => 50], [['remark'], 'string', 'max' => 200], ]; @@ -145,15 +136,6 @@ class OrderT extends \common\models\Base 'insurer2_end_date' => 'Insurer2 End Date', 'send_date' => 'Send Date', 'direction_id' => 'Direction 1 ID', - 'range1_id' => 'Range 1 ID', - 'city1_id' => 'City 1 ID', - 'district1_id' => 'District 1 ID', - 'send_address1' => 'Send Address 1', - 'direction2_id' => 'Direction 2 ID', - 'range2_id' => 'Range 2 ID', - 'city2_id' => 'City 2 ID', - 'district2_id' => 'District 2 ID', - 'send_address2' => 'Send Address 2', 'pay_type_id' => 'Pay Type ID', 'pay_no' => 'Pay No', 'remark' => 'Remark', diff --git a/composer.json b/composer.json index e5752b8..1defbc9 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,8 @@ "yiisoft/yii2-bootstrap": "*", "yiisoft/yii2-swiftmailer": "*", "phpoffice/phpspreadsheet": "^1.9", - "codeception/codeception": "^3.1" + "codeception/codeception": "^3.1", + "yiisoft/yii2-imagine": "^2.2" }, "require-dev": { "yiisoft/yii2-debug": "*", @@ -34,5 +35,11 @@ "npm-asset-library": "vendor/npm", "bower-asset-library": "vendor/bower" } + }, + "repositories": { + "packagist": { + "type": "composer", + "url": "https://mirrors.aliyun.com/composer/" + } } } diff --git a/composer.lock b/composer.lock index 6096380..e792221 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5ef26788c00e2aefd589a66715e24ac0", + "content-hash": "b5a4d09fa55d0deca37e307ccb669e36", "packages": [ { "name": "behat/gherkin", @@ -18,7 +18,13 @@ "type": "zip", "url": "https://api.github.com/repos/Behat/Gherkin/zipball/ab0a02ea14893860bca00f225f5621d351a3ad07", "reference": "ab0a02ea14893860bca00f225f5621d351a3ad07", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=5.3.1" @@ -282,7 +288,13 @@ "type": "zip", "url": "https://api.github.com/repos/cebe/markdown/zipball/9bac5e971dd391e2802dca5400bbeacbaea9eb86", "reference": "9bac5e971dd391e2802dca5400bbeacbaea9eb86", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "lib-pcre": "*", @@ -342,7 +354,13 @@ "type": "zip", "url": "https://api.github.com/repos/Codeception/Codeception/zipball/afc52609e590998fd293028699ad4a61d6afd7bc", "reference": "afc52609e590998fd293028699ad4a61d6afd7bc", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "behat/gherkin": "^4.4.0", @@ -437,7 +455,13 @@ "type": "zip", "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/7090736f36b4398cae6ef838b9a2bdfe8d8d104b", "reference": "7090736f36b4398cae6ef838b9a2bdfe8d8d104b", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=7.2", @@ -481,7 +505,13 @@ "type": "zip", "url": "https://api.github.com/repos/Codeception/Stub/zipball/016a035c287c898745504f7f2916f4dae14265e0", "reference": "016a035c287c898745504f7f2916f4dae14265e0", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "codeception/phpunit-wrapper": "^8.0.4", @@ -512,7 +542,13 @@ "type": "zip", "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a", "reference": "a2c590166b2133a4633738648b6b064edae0814a", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.1" @@ -568,7 +604,13 @@ "type": "zip", "url": "https://api.github.com/repos/doctrine/lexer/zipball/e17f069ede36f7534b95adec71910ed1b49c74ea", "reference": "e17f069ede36f7534b95adec71910ed1b49c74ea", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.2" @@ -630,7 +672,13 @@ "type": "zip", "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/92dd169c32f6f55ba570c309d83f5209cefb5e23", "reference": "92dd169c32f6f55ba570c309d83f5209cefb5e23", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "doctrine/lexer": "^1.0.1", @@ -688,7 +736,13 @@ "type": "zip", "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/83ab08bc1af7d808a9e0fbf024f1c24bfd73c0a7", "reference": "83ab08bc1af7d808a9e0fbf024f1c24bfd73c0a7", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=5.2" @@ -735,7 +789,13 @@ "type": "zip", "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/e43de70f3c7166169d0f14a374505392734160e5", "reference": "e43de70f3c7166169d0f14a374505392734160e5", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "ext-curl": "*", @@ -795,7 +855,13 @@ "type": "zip", "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba", "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "guzzlehttp/promises": "^1.0", @@ -860,7 +926,13 @@ "type": "zip", "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646", "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=5.5.0" @@ -911,7 +983,13 @@ "type": "zip", "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a", "reference": "239400de7a173fe9901b9ac7c06497751f00727a", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=5.4.0", @@ -982,7 +1060,13 @@ "type": "zip", "url": "https://api.github.com/repos/hoaproject/Consistency/zipball/fd7d0adc82410507f332516faf655b6ed22e4c2f", "reference": "fd7d0adc82410507f332516faf655b6ed22e4c2f", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "hoa/exception": "~1.0", @@ -1045,7 +1129,13 @@ "type": "zip", "url": "https://api.github.com/repos/hoaproject/Console/zipball/e231fd3ea70e6d773576ae78de0bdc1daf331a66", "reference": "e231fd3ea70e6d773576ae78de0bdc1daf331a66", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "hoa/consistency": "~1.0", @@ -1121,7 +1211,13 @@ "type": "zip", "url": "https://api.github.com/repos/hoaproject/Event/zipball/6c0060dced212ffa3af0e34bb46624f990b29c54", "reference": "6c0060dced212ffa3af0e34bb46624f990b29c54", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "hoa/consistency": "~1.0", @@ -1177,7 +1273,13 @@ "type": "zip", "url": "https://api.github.com/repos/hoaproject/Exception/zipball/091727d46420a3d7468ef0595651488bfc3a458f", "reference": "091727d46420a3d7468ef0595651488bfc3a458f", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "hoa/consistency": "~1.0", @@ -1231,7 +1333,13 @@ "type": "zip", "url": "https://api.github.com/repos/hoaproject/File/zipball/35cb979b779bc54918d2f9a4e02ed6c7a1fa67ca", "reference": "35cb979b779bc54918d2f9a4e02ed6c7a1fa67ca", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "hoa/consistency": "~1.0", @@ -1293,7 +1401,13 @@ "type": "zip", "url": "https://api.github.com/repos/hoaproject/Iterator/zipball/d1120ba09cb4ccd049c86d10058ab94af245f0cc", "reference": "d1120ba09cb4ccd049c86d10058ab94af245f0cc", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "hoa/consistency": "~1.0", @@ -1347,7 +1461,13 @@ "type": "zip", "url": "https://api.github.com/repos/hoaproject/Protocol/zipball/5c2cf972151c45f373230da170ea015deecf19e2", "reference": "5c2cf972151c45f373230da170ea015deecf19e2", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "hoa/consistency": "~1.0", @@ -1407,7 +1527,13 @@ "type": "zip", "url": "https://api.github.com/repos/hoaproject/Stream/zipball/3293cfffca2de10525df51436adf88a559151d82", "reference": "3293cfffca2de10525df51436adf88a559151d82", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "hoa/consistency": "~1.0", @@ -1471,7 +1597,13 @@ "type": "zip", "url": "https://api.github.com/repos/hoaproject/Ustring/zipball/e6326e2739178799b1fe3fdd92029f9517fa17a0", "reference": "e6326e2739178799b1fe3fdd92029f9517fa17a0", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "hoa/consistency": "~1.0", @@ -1519,6 +1651,70 @@ ], "time": "2017-01-16T07:08:25+00:00" }, + { + "name": "imagine/imagine", + "version": "1.2.2", + "source": { + "type": "git", + "url": "https://github.com/avalanche123/Imagine.git", + "reference": "eec39b2092bc8008a92b8d63824476413dbe7511" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/avalanche123/Imagine/zipball/eec39b2092bc8008a92b8d63824476413dbe7511", + "reference": "eec39b2092bc8008a92b8d63824476413dbe7511", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "php": ">=5.3.2" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "2.2.*", + "phpunit/phpunit": "^4.8 || ^5.7 || ^6.5 || ^7.4" + }, + "suggest": { + "ext-gd": "to use the GD implementation", + "ext-gmagick": "to use the Gmagick implementation", + "ext-imagick": "to use the Imagick implementation" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-develop": "0.7-dev" + } + }, + "autoload": { + "psr-4": { + "Imagine\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bulat Shakirzyanov", + "email": "mallluhuct@gmail.com", + "homepage": "http://avalanche123.com" + } + ], + "description": "Image processing for PHP 5.3", + "homepage": "http://imagine.readthedocs.org/", + "keywords": [ + "drawing", + "graphics", + "image manipulation", + "image processing" + ], + "time": "2019-07-09T06:55:48+00:00" + }, { "name": "markbaker/complex", "version": "1.4.7", @@ -1531,7 +1727,13 @@ "type": "zip", "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/1ea674a8308baf547cbcbd30c5fcd6d301b7c000", "reference": "1ea674a8308baf547cbcbd30c5fcd6d301b7c000", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^5.6.0|^7.0.0" @@ -1626,7 +1828,13 @@ "type": "zip", "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/5348c5a67e3b75cd209d70103f916a93b1f1ed21", "reference": "5348c5a67e3b75cd209d70103f916a93b1f1ed21", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^5.6.0|^7.0.0" @@ -1695,7 +1903,13 @@ "type": "zip", "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/007c053ae6f31bba39dfa19a7726f56e9763bbea", "reference": "007c053ae6f31bba39dfa19a7726f56e9763bbea", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.1" @@ -1743,7 +1957,13 @@ "type": "zip", "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "ext-dom": "*", @@ -1798,7 +2018,13 @@ "type": "zip", "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6", "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^5.6 || ^7.0" @@ -1845,7 +2071,13 @@ "type": "zip", "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/63a995caa1ca9e5590304cd845c15ad6d482a62a", "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=7.1" @@ -1897,7 +2129,13 @@ "type": "zip", "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/b83ff7cfcfee7827e1e78b637a5904fe6a96698e", "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.0", @@ -1948,7 +2186,13 @@ "type": "zip", "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/2e32a6d48972b2c1976ed5d8967145b6cec4a4a9", "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.1", @@ -1995,7 +2239,13 @@ "type": "zip", "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/8dea03eaf60a349b6097e4bcad11f894668280df", "reference": "8dea03eaf60a349b6097e4bcad11f894668280df", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "ext-ctype": "*", @@ -2088,7 +2338,13 @@ "type": "zip", "url": "https://api.github.com/repos/phpspec/prophecy/zipball/f6811d96d97bdf400077a0cc100ae56aa32b9203", "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "doctrine/instantiator": "^1.0.2", @@ -2151,7 +2407,13 @@ "type": "zip", "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa0d179a13284c7420fc281fc32750e6cc7c9e2f", "reference": "aa0d179a13284c7420fc281fc32750e6cc7c9e2f", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "ext-dom": "*", @@ -2214,7 +2476,13 @@ "type": "zip", "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/050bedf145a257b1ff02746c31894800e5122946", "reference": "050bedf145a257b1ff02746c31894800e5122946", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.1" @@ -2264,7 +2532,13 @@ "type": "zip", "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=5.3.3" @@ -2305,7 +2579,13 @@ "type": "zip", "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/1038454804406b0b5f5f520358e78c1c2f71501e", "reference": "1038454804406b0b5f5f520358e78c1c2f71501e", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.1" @@ -2354,7 +2634,13 @@ "type": "zip", "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/995192df77f63a59e47f025390d2d1fdf8f425ff", "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "ext-tokenizer": "*", @@ -2403,7 +2689,13 @@ "type": "zip", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/366a4a0f2b971fd43b7c351d621e8dd7d7131869", "reference": "366a4a0f2b971fd43b7c351d621e8dd7d7131869", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "doctrine/instantiator": "^1.2.0", @@ -2486,7 +2778,13 @@ "type": "zip", "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=5.3.0" @@ -2535,7 +2833,13 @@ "type": "zip", "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=5.3.0" @@ -2585,7 +2889,13 @@ "type": "zip", "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=5.3.0" @@ -2633,7 +2943,13 @@ "type": "zip", "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", "reference": "120b605dfeb996808c31b6477290a714d356e822", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=5.6" @@ -2673,7 +2989,13 @@ "type": "zip", "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^5.6 || ^7.0" @@ -2718,7 +3040,13 @@ "type": "zip", "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5de4fc177adf9bce8df98d8d141a7559d7ccf6da", "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.1", @@ -2782,7 +3110,13 @@ "type": "zip", "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/720fcc7e9b5cf384ea68d9d930d480907a0c1a29", "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.1" @@ -2838,7 +3172,13 @@ "type": "zip", "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/f2a2c8e1c97c11ace607a7a667d73d47c19fe404", "reference": "f2a2c8e1c97c11ace607a7a667d73d47c19fe404", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.1" @@ -2891,7 +3231,13 @@ "type": "zip", "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/68609e1261d215ea5b21b7987539cbfbe156ec3e", "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.0", @@ -2958,7 +3304,13 @@ "type": "zip", "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4", "reference": "edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.2", @@ -3012,7 +3364,13 @@ "type": "zip", "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5", "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.0", @@ -3059,7 +3417,13 @@ "type": "zip", "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be", "reference": "773f97c67f28de00d397be301821b06708fca0be", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.0" @@ -3104,7 +3468,13 @@ "type": "zip", "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.0" @@ -3157,7 +3527,13 @@ "type": "zip", "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/4d7a795d35b889bf80a0cc04e08d77cedfa917a9", "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.1" @@ -3199,7 +3575,13 @@ "type": "zip", "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/3aaaa15fa71d27650d62a948be022fe3b48541a3", "reference": "3aaaa15fa71d27650d62a948be022fe3b48541a3", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.2" @@ -3245,7 +3627,13 @@ "type": "zip", "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=5.6" @@ -3288,7 +3676,13 @@ "type": "zip", "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/5397cd05b0a0f7937c47b0adcb4c60e5ab936b6a", "reference": "5397cd05b0a0f7937c47b0adcb4c60e5ab936b6a", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "egulias/email-validator": "~2.0", @@ -3350,7 +3744,13 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/browser-kit/zipball/78b7611c45039e8ce81698be319851529bf040b1", "reference": "78b7611c45039e8ce81698be319851529bf040b1", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.1.3", @@ -3409,7 +3809,13 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/console/zipball/929ddf360d401b958f611d44e726094ab46a7369", "reference": "929ddf360d401b958f611d44e726094ab46a7369", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.1.3", @@ -3484,7 +3890,13 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/css-selector/zipball/f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9", "reference": "f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.1.3" @@ -3537,7 +3949,13 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/e9f7b4d19d69b133bd638eeddcdc757723b4211f", "reference": "e9f7b4d19d69b133bd638eeddcdc757723b4211f", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.1.3", @@ -3598,7 +4016,13 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/6229f58993e5a157f6096fc7145c0717d0be8807", "reference": "6229f58993e5a157f6096fc7145c0717d0be8807", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.1.3", @@ -3668,7 +4092,13 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c43ab685673fb6c8d84220c77897b1d6cdbe1d18", "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.1.3" @@ -3726,7 +4156,13 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/finder/zipball/5e575faa95548d0586f6bedaeabec259714e44d1", "reference": "5e575faa95548d0586f6bedaeabec259714e44d1", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.1.3" @@ -3775,7 +4211,13 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4", "reference": "550ebaac289296ce228a706d0867afc34687e3f4", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=5.3.3" @@ -3833,7 +4275,13 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/685968b11e61a347c18bf25db32effa478be610f", "reference": "685968b11e61a347c18bf25db32effa478be610f", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=5.3.3" @@ -3892,7 +4340,13 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6af626ae6fa37d396dc90a399c0ff08e5cfc45b2", "reference": "6af626ae6fa37d396dc90a399c0ff08e5cfc45b2", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=5.3.3", @@ -3954,7 +4408,13 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17", "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=5.3.3" @@ -4013,7 +4473,13 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/04ce3335667451138df4307d6a9b61565560199e", "reference": "04ce3335667451138df4307d6a9b61565560199e", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=5.3.3" @@ -4068,7 +4534,13 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/2ceb49eaccb9352bff54d22570276bb75ba4a188", "reference": "2ceb49eaccb9352bff54d22570276bb75ba4a188", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=5.3.3" @@ -4126,7 +4598,13 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/process/zipball/50556892f3cc47d4200bfd1075314139c4c9ff4b", "reference": "50556892f3cc47d4200bfd1075314139c4c9ff4b", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.1.3" @@ -4175,7 +4653,13 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ffcde9615dc5bb4825b9f6aed07716f1f57faae0", "reference": "ffcde9615dc5bb4825b9f6aed07716f1f57faae0", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.1.3", @@ -4233,7 +4717,13 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/yaml/zipball/41e16350a2a1c7383c4735aa2f9fce74cf3d1178", "reference": "41e16350a2a1c7383c4735aa2f9fce74cf3d1178", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.1.3", @@ -4292,7 +4782,13 @@ "type": "zip", "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9", "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "ext-dom": "*", @@ -4332,7 +4828,13 @@ "type": "zip", "url": "https://api.github.com/repos/webmozart/assert/zipball/88e6d84706d09a236046d686bbea96f07b3a34f4", "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^5.3.3 || ^7.0", @@ -4382,7 +4884,13 @@ "type": "zip", "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/80bf3a6e04a0128f753cb73ba7255d8e2ae3a02f", "reference": "80bf3a6e04a0128f753cb73ba7255d8e2ae3a02f", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "bower-asset/inputmask": "~3.2.2 | ~3.3.5", @@ -4482,7 +4990,13 @@ "type": "zip", "url": "https://api.github.com/repos/yiisoft/yii2-bootstrap/zipball/073c9ab0a4eb71f2485d84c96a1967130300d8fc", "reference": "073c9ab0a4eb71f2485d84c96a1967130300d8fc", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "bower-asset/bootstrap": "3.4.* | 3.3.* | 3.2.* | 3.1.*", @@ -4545,7 +5059,13 @@ "type": "zip", "url": "https://api.github.com/repos/yiisoft/yii2-composer/zipball/5c7ca9836cf80b34db265332a7f2f8438eb469b9", "reference": "5c7ca9836cf80b34db265332a7f2f8438eb469b9", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "composer-plugin-api": "^1.0" @@ -4588,6 +5108,63 @@ ], "time": "2019-07-16T13:22:30+00:00" }, + { + "name": "yiisoft/yii2-imagine", + "version": "2.2.0", + "source": { + "type": "git", + "url": "https://github.com/yiisoft/yii2-imagine.git", + "reference": "8637f63ee2eb81b7fe1f4c0e16cc8cc474a68bae" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/yiisoft/yii2-imagine/zipball/8637f63ee2eb81b7fe1f4c0e16cc8cc474a68bae", + "reference": "8637f63ee2eb81b7fe1f4c0e16cc8cc474a68bae", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "imagine/imagine": "^0.6 | ^0.7 | ^1.0", + "yiisoft/yii2": "~2.0.0" + }, + "require-dev": { + "phpunit/phpunit": "<7" + }, + "type": "yii2-extension", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "yii\\imagine\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Antonio Ramirez", + "email": "amigo.cobos@gmail.com" + } + ], + "description": "The Imagine integration for the Yii framework", + "keywords": [ + "helper", + "image", + "imagine", + "yii2" + ], + "time": "2019-06-04T12:38:50+00:00" + }, { "name": "yiisoft/yii2-swiftmailer", "version": "2.1.2", @@ -4600,7 +5177,13 @@ "type": "zip", "url": "https://api.github.com/repos/yiisoft/yii2-swiftmailer/zipball/09659a55959f9e64b8178d842b64a9ffae42b994", "reference": "09659a55959f9e64b8178d842b64a9ffae42b994", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "swiftmailer/swiftmailer": "~6.0", @@ -4801,7 +5384,13 @@ "type": "zip", "url": "https://api.github.com/repos/yiisoft/yii2-debug/zipball/62679af3183c308c0edffecc69778afc32ae55aa", "reference": "62679af3183c308c0edffecc69778afc32ae55aa", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "ext-mbstring": "*", @@ -4906,7 +5495,13 @@ "type": "zip", "url": "https://api.github.com/repos/yiisoft/yii2-gii/zipball/cf3e81953a9e9796eed4021f3065bc5c18ee3356", "reference": "cf3e81953a9e9796eed4021f3065bc5c18ee3356", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "phpspec/php-diff": "^1.1.0", diff --git a/frontend/controllers/CarController.php b/frontend/controllers/CarController.php index 603fe3c..c45d559 100644 --- a/frontend/controllers/CarController.php +++ b/frontend/controllers/CarController.php @@ -2290,6 +2290,10 @@ class CarController extends BaseController $seats = (int)$request->post('seats'); $register_date = $request->post('register_date'); $car_use_id = $request->post('car_use_id'); + $purchase_price = $request->post('purchase_price'); + $car_frame_no = $request->post('car_frame_no'); + $engine_no = $request->post('engine_no'); + $factory_model = $request->post('factory_model'); //策略信息 $celuo_id = $request->post('celuo_id'); @@ -2310,6 +2314,7 @@ class CarController extends BaseController $link_man_number = $request->post('link_man_number'); $link_man_type = $request->post('link_man_type'); $link_man_phone = $request->post('link_man_phone'); + $pay_type_id = $request->post('pay_type_id'); //送单地址信息 $send_district_id = $request->post('send_district_id'); @@ -2319,12 +2324,10 @@ class CarController extends BaseController //保单信息 $order_id = $request->post('id', 0); $email = $request->post('email'); - $send_date = $request->post('send_date'); $company2_id = $request->post('company2_id'); $insurer1_begin_date = $request->post('insurer1_begin_date'); $insurer2_begin_date = $request->post('insurer2_begin_date'); $order_remark = $request->post('order_remark'); - $success_id = $request->post('success_id'); //报价信息 $total1_clear = $request->post('total1_clear'); @@ -2378,6 +2381,10 @@ class CarController extends BaseController $car_info->car_man = $car_man; $car_info->car_man_number = $car_man_number; $car_info->car_use_id = $car_use_id; + $car_info->engine_no = $engine_no; + $car_info->car_frame_no = $car_frame_no; + $car_info->factory_model = $factory_model; + $car_info->purchase_price = $purchase_price; if(!$car_info->save()) { throw new \Exception(print_r($car_info->getErrors(), true)); } @@ -2385,8 +2392,10 @@ class CarController extends BaseController //保单信息 $order_info->car_no = $car_no; $order_info->seats = $seats; - $order_info->engine_no = $car_info->engine_no; - $order_info->car_frame_no = $car_info->car_frame_no; + $order_info->engine_no = $engine_no; + $order_info->car_frame_no = $car_frame_no; + $order_info->factory_model = $factory_model; + $order_info->purchase_price = $purchase_price; $order_info->car_man = $car_man; $order_info->car_man_phone = $car_man_phone; $order_info->car_man_type = $car_man_type; @@ -2411,18 +2420,20 @@ class CarController extends BaseController } } $order_info->submit_date = date('Y-m-d'); + //商业保险日期 $order_info->insurer1_begin_date = $insurer1_begin_date; $insurer1_end_date = ''; if ($insurer1_begin_date != '') { $insurer1_end_date = date('Y-m-d', strtotime(date('Y-m-d', strtotime($insurer1_begin_date . "+1 year")) . '-1 day')); } $order_info->insurer1_end_date = $insurer1_end_date; + //交强保险日期 $order_info->insurer2_begin_date = $insurer2_begin_date; $insurer2_end_date = ''; if ($insurer2_begin_date != '') $insurer2_end_date = date('Y-m-d', strtotime(date('Y-m-d', strtotime($insurer2_begin_date . "+1 year")) . '-1 day')); $order_info->insurer2_end_date = $insurer2_end_date; - $order_info->send_date = $send_date; + $order_info->send_district_id = $send_district_id; $order_info->send_city_id = $send_city_id; $order_info->send_address = $send_address; @@ -2441,6 +2452,7 @@ class CarController extends BaseController $order_info->total_real = $total_real; $order_info->price_remark = $price_remark; $order_info->yuangong_money = $yuangong_money; + $order_info->pay_type_id = $pay_type_id; $order_info->money_man = $money_man; $order_info->money_bank = $money_bank; @@ -2484,9 +2496,10 @@ class CarController extends BaseController } //处理预约 + $result['msg'] = '保存成功'; if ($status_id > 1) { $tmp_row = AppointmentT::findOne(['car_id' => $car_info->id]); - if (!empty($tmp_row)) { + if($tmp_row) { $tmp_row->delete(); } $tmp_status_info = StatusT::findOne(['id' => $status_id]); @@ -2495,9 +2508,9 @@ class CarController extends BaseController $log_msg = '进入' . $tmp_status_info->name; } $this->addLog($car_info->id, $log_msg, 1); + $result['msg'] = '提交成功'; } - // 处理财务-如果是在线支付-生成财务分支 - + // 处理财务-如果是在线支付-生成财务分支-返现记录 if ($status_id > 1) { $order_caiwu = OrderCaiwuT::findOne(['order_id'=>$order_info->id]); @@ -2563,7 +2576,6 @@ class CarController extends BaseController } $result['success'] = true; - $result['msg'] = '保存成功'; $tran->commit(); } catch (\Exception $e) { diff --git a/frontend/controllers/CarController_bak.php b/frontend/controllers/CarController_bak.php deleted file mode 100644 index 586bb89..0000000 --- a/frontend/controllers/CarController_bak.php +++ /dev/null @@ -1,1411 +0,0 @@ -renderPartial('index'); - } - - public function actionMycars() - { - $user_id = $this->my->id; - - return $this->renderPartial('mycars',[ - 'user_id' => $user_id - ]); - } - - public function actionJsonData() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $result = array(); - $user_id = $request->get('user_id',0); - - $car_man = $request->get('car_man',''); - $car_no = $request->get('car_no',''); - $engine_no = $request->get('engine_no',''); - $car_frame_no = $request->get('car_frame_no',''); - $register_begin = $request->get('register_begin',''); - $register_end = $request->get('register_end',''); - $resurer_begin = $request->get('resurer_begin',''); - $resurer_end = $request->get('resurer_end',''); - $sort = $request->get('sort','id'); - $order = $request->get('order','asc'); - - $page = $request->get('page',1); - $limit = $request->get('rows',20); - - $start = ($page-1)*$limit; - - $query = CarT::find(); - if($user_id > 0) { - $user_items = $this->my->getChildren(); - $user_ids = array(); - if($user_items != null) { - foreach($user_items as $user_item) { - $user_ids[] = $user_item->id; - } - } - $user_ids[] = $this->my->id; - $query = $query->andWhere(['in','user_id',$user_ids]); - } - if($car_man != '') { - $query = $query->andWhere('car_man="'.$car_man.'"'); - } - if($car_no != '') { - $query = $query->andWhere('car_no="'.$car_no.'"'); - } - if($engine_no != '') { - $query = $query->andWhere('engine_no="'.$engine_no.'"'); - } - if($car_frame_no != '') { - $query = $query->andWhere('car_frame_no="'.$car_frame_no.'"'); - } - if($register_begin != '') { - $query = $query->andWhere('register_date>="'.$register_begin.'"'); - } - if($register_end != '') { - $query = $query->andWhere('register_date<="'.$register_end.'"'); - } - $query = $query->orderBy($sort.' '.$order); - $total = $query->count(); - $query = $query->offset($start)->limit($limit); - $items = $query->all(); - $data = array(); - foreach($items as $item) { - $row = array(); - $row['id'] = $item->id; - $row['car_no'] = $item->car_no; - $row['car_man'] = $item->car_man; - $row['phone'] = $item->phone; - $row['engine_no'] = $item->engine_no; - $row['car_frame_no'] = $item->car_frame_no; - $row['seats'] = $item->seats; - $row['register_date'] = $item->register_date; - $row['user'] = $item->user?$item->user->getShowName():''; - $row['created_at'] = $item->created_at; - $data[] = $row; - } - $result['total'] = $total; - $result['rows'] = $data; - return $result; - } - - public function actionEdit() - { - $request = Yii::$app->request; - $id = $request->get('id',0); - $back_params = $request->get('back_params'); - $user_id = $request->get('user_id',0); - if($id > 0) { - $info = CarT::findOne(['id'=>$id]); - } else { - $info = new CarT(); - } - $car_use_items = CarUseT::find()->all(); - $car_type_items = CarTypeT::find()->all(); - $brand_items = BrandT::find()->all(); - $series_items = SeriesT::find() - ->where('brand_id='.intval($info->brand_id)) - ->all(); - $displacement_items = DisplacementT::find() - ->where('series_id='.intval($info->series_id)) - ->all(); - - return $this->render('edit',[ - 'user_id' => $user_id, - 'info' => $info, - 'car_use_items' => $car_use_items, - 'car_type_items' => $car_type_items, - 'brand_items' => $brand_items, - 'series_items' => $series_items, - 'displacement_items' => $displacement_items, - 'back_params' => $back_params - ]); - } - - public function actionSave() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $result = array(); - $result['success'] = false; - $result['msg'] = '保存失败'; - - if($request->isPost) { - $id = $request->post('id',0); - $car_no = $request->post('car_no'); - $engine_no = $request->post('engine_no'); - $car_frame_no = $request->post('car_frame_no'); - $factory_model = $request->post('factory_model'); - $seats = $request->post('seats'); - $car_type_id = $request->post('car_type_id'); - $car_use_id = $request->post('car_use_id'); - $register_date = $request->post('register_date'); - $displacement_id = $request->post('displacement_id',0); - $car_year = $request->post('car_year'); - $brand_id = $request->post('brand_id',0); - $series_id = $request->post('series_id',0); - $car_man = $request->post('car_man'); - $phone = $request->post('phone'); - $car_man_number = $request->post('car_man_number'); - $remark = $request->post('remark'); - - if($car_no == '') { - $result['msg'] = '请输入车牌号码!'; - return $result; - } - - $row = null; - if($id > 0) { - $row = CarT::findOne(['id'=>$id]); - } else { - $row = new CarT(); - $row->user_id = 0; - $row->location = 1; - } - $row->car_no = $car_no; - $row->engine_no = $engine_no; - $row->car_frame_no = $car_frame_no; - $row->factory_model = $factory_model; - $row->car_model = $factory_model; - $row->seats = $seats; - $row->car_type_id = $car_type_id; - $row->car_use_id = $car_use_id; - $row->register_date = $register_date; - $row->displacement_id = $displacement_id; - $row->car_year = $car_year; - $row->brand_id = $brand_id; - $row->series_id = $series_id; - $row->car_man = $car_man; - $row->phone = $phone; - $row->car_man_number = $car_man_number; - $row->remark = $remark; - $row->save(); - - $result['success'] = true; - $result['msg'] = '保存成功'; - } - return $result; - } - - public function actionDelete() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $result = array(); - $result['success'] = false; - $result['msg'] = '删除失败'; - - if($request->isPost) { - $id = $request->post('id',0); - - $tran = CarT::getDb()->beginTransaction(); - try { - $ids = $request->post('ids',array()); - - if($id > 0) { - $car_info = CarT::findOne(['id'=>$id]); - - //删除预约信息 - AppointmentT::deleteAll('car_id='.$id); - AppointmentHistoryT::deleteAll('car_id='.$id); - - //删除保单信息 - $items = OrderT::find() - ->where('car_id='.$id) - ->all(); - foreach ($items as $item) { - PriceT::deleteAll(['order_id'=>$item->id]); - $item->delete(); - } - - //删除B、C、D库数据 - if($car_info->location == 2) - CarBT::deleteAll('id='.$car_info->id); - if($car_info->location == 3) - CarCT::deleteAll('id='.$car_info->id); - if($car_info->location == 4) - CarDT::deleteAll('id='.$car_info->id); - $car_info->delete(); - - //清除操作记录 - $this->removeLog($id); - } - - $tran->commit(); - $result['success'] = true; - $result['msg'] = '删除成功'; - - } catch(\Exception $e) { - $tran->rollBack(); - throw $e; - } - } - return $result; - } - - public function actionDeleteAll() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $result = array(); - $result['success'] = false; - $result['msg'] = '删除失败'; - - if($request->isPost) { - $tran = CarT::getDb()->beginTransaction(); - try { - $ids = $request->post('ids',array()); - - foreach($ids as $id) { - if($id > 0) { - $row = CarT::findOne(['id'=>$id]); - AppointmentT::deleteAll('car_id='.$id); - AppointmentHistoryT::deleteAll('car_id='.$id); - $items = OrderT::find() - ->where('car_id='.$id) - ->all(); - foreach ($items as $item) { - PriceT::deleteAll(['order_id'=>$item->id]); - $item->delete(); - } - - $row->delete(); - } - } - - $tran->commit(); - $result['success'] = true; - $result['msg'] = '删除成功'; - - } catch(\Exception $e) { - $tran->rollBack(); - throw $e; - } - } - return $result; - } - - public function actionAppointment() - { - $request = Yii::$app->request; - $car_id = $request->get('car_id'); - return $this->renderPartial('appointment',[ - 'car_id' => $car_id - ]); - } - - public function actionAppointmentJsonData() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $result = array(); - $car_id = $request->get('car_id'); - $car_info = CarT::findOne(['id'=>$car_id]); - - $page = $request->get('page',1); - $limit = $request->get('rows',20); - - $start = ($page-1)*$limit; - - $query = $car_info->getAppointments() - ->orderBy('pdate DESC,ptime ASC,id DESC'); - $total = $query->count(); - $query = $query->offset($start)->limit($limit); - $items = $query->all(); - $data = array(); - foreach($items as $item) { - $row = array(); - $row['id'] = $item->id; - $row['pdate'] = $item->pdate; - $row['ptime'] = $item->ptime; - $row['remark'] = $item->remark; - $row['user'] = $item->user?$item->user->getShowName():''; - $data[] = $row; - } - $result['total'] = $total; - $result['rows'] = $data; - return $result; - } - - public function actionInsurer() - { - $request = Yii::$app->request; - $car_id = $request->get('car_id'); - return $this->renderPartial('insurer',[ - 'car_id' => $car_id - ]); - } - - public function actionInfo() - { - $request = Yii::$app->request; - $id = $request->get('id',0); - $type = $request->get('type',0); - $car_man = $request->get('car_man'); - $phone = $request->get('phone'); - $car_no = $request->get('car_no'); - $page = $request->get('page',1); - $sort_key = $request->get('sort_key','appointment_t.pdate'); - $sort_value = $request->get('sort_value','ASC'); - $next_index = $request->get('next_index',0); - $back_params = $request->get('back_params'); - - $car_info = CarT::findOne(['id'=>$id]); - $order_info = $car_info->getOrders()->orderBy('id DESC')->one(); - if(!$order_info) { - $user_id = 0; - if($car_info->location == 2) { - $b_info = CarBT::findOne(['id'=>$car_info->id]); - $user_id = $b_info->user_id; - } - if($car_info->location == 3) { - $c_info = CarCT::findOne(['id'=>$car_info->id]); - $user_id = $c_info->user_id; - } - if($car_info->location == 4) { - $d_info = CarDT::findOne(['id'=>$car_info->id]); - $user_id = $d_info->user_id; - } - $order_info = new OrderT(); - $order_info->car_id = $car_info->id; - $order_info->car_no = $car_info->car_no; - $order_info->engine_no = $car_info->engine_no; - $order_info->car_frame_no = $car_info->car_frame_no; - $order_info->car_man = $car_info->car_man; - $order_info->user_id = $user_id; - $order_info->status_id = 1; - $order_info->id_man = $car_info->car_man; - $order_info->link_man = $car_info->car_man; - $order_info->link_phone = $car_info->phone; - $order_info->save(); - } - $insurer_type_items = InsurerTypeT::find()->all(); - $insurer_company_items = InsurerCompanyT::find()->all(); - $pay_type_items = PayTypeT::find()->all(); - $car_use_items = CarUseT::find()->all(); - $car_type_items = CarTypeT::find()->all(); - $brand_items = BrandT::find()->all(); - $series_items = SeriesT::find() - ->where('brand_id='.intval($car_info->brand_id)) - ->all(); - $displacement_items = DisplacementT::find() - ->where('series_id='.intval($car_info->series_id)) - ->all(); - $direction_items = DirectionT::find() - ->all(); - $range_items = RangeT::find() - ->all(); - $city_items = CityT::find() - ->all(); - $district_items = DistrictT::find() - ->orderBy('order_id ASC') - ->all(); - $gift_items = GiftT::find() - ->where('type_id=1') - ->all(); - $success_items = InvalidT::getTree(1); - $failure_items = InvalidT::getTree(2); - - //下一辆 - $next_id = 0; - if($type == 1) { - $query = AppointmentT::find() - ->leftJoin('car_t','`car_t`.`id`=`appointment_t`.`car_id`') - ->where('appointment_t.is_first=1 and car_t.is_track=0') - ->andWhere('appointment_t.pdate<="'.date('Y-m-d').'"'); - - $user_ids = $this->getChildrenUserIDs(); - $query = $query->andWhere(['in','appointment_t.user_id',$user_ids]); - - if($car_man != '') { - $query = $query->andWhere('car_t.car_man like "'.$car_man.'"'); - } - if($phone != '') { - $query = $query->andWhere('car_t.phone="'.$phone.'"'); - } - if($car_no != '') { - $query = $query->andWhere('car_t.car_no like "'.$car_no.'"'); - } - if($sort_key != '') { - $query = $query->orderBy($sort_key.' '.$sort_value); - } - $next_item = $query->offset($next_index)->one(); - if($next_item) { - $next_id = $next_item->car_id; - } - $next_index++; - } - if($type == 2) { - $query = AppointmentT::find() - ->leftJoin('car_t','`car_t`.`id`=`appointment_t`.`car_id`') - ->where('appointment_t.is_first=0 and car_t.is_track=0') - ->andWhere('appointment_t.pdate<="'.date('Y-m-d').'"'); - - $user_ids = $this->getChildrenUserIDs(); - $query = $query->andWhere(['in','appointment_t.user_id',$user_ids]); - - if($car_man != '') { - $query = $query->andWhere('car_t.car_man like "'.$car_man.'"'); - } - if($phone != '') { - $query = $query->andWhere('car_t.phone="'.$phone.'"'); - } - if($car_no != '') { - $query = $query->andWhere('car_t.car_no like "'.$car_no.'"'); - } - if($sort_key != '') { - $query = $query->orderBy($sort_key.' '.$sort_value); - } - $next_item = $query->offset($next_index)->one(); - if($next_item) { - $next_id = $next_item->car_id; - } - $next_index++; - } - if($type == 3) { - $query = AppointmentT::find() - ->leftJoin('car_t','`car_t`.`id`=`appointment_t`.`car_id`') - ->where('appointment_t.is_first=0 and car_t.is_track=0'); - - $user_ids = $this->getChildrenUserIDs(); - $query = $query->andWhere(['in','appointment_t.user_id',$user_ids]); - - if($car_man != '') { - $query = $query->andWhere('car_t.car_man like "'.$car_man.'"'); - } - if($phone != '') { - $query = $query->andWhere('car_t.phone="'.$phone.'"'); - } - if($car_no != '') { - $query = $query->andWhere('car_t.car_no like "'.$car_no.'"'); - } - if($sort_key != '') { - $query = $query->orderBy($sort_key.' '.$sort_value); - } - $next_item = $query->offset($next_index)->one(); - if($next_item) { - $next_id = $next_item->car_id; - } - $next_index++; - } - if($type == 4) { - $query = OrderT::find() - ->where('status_id=1 and return_status_id>0') - ->orderBy('submit_date DESC, id DESC'); - $user_items = $this->my->getChildren(); - $user_ids[] = $this->my->id; - if($user_items) { - foreach($user_items as $user_item) { - $user_ids[] = $user_item->id; - } - } - $query = $query->andWhere(['in','user_id',$user_ids]); - if($car_man != '') { - $query = $query->andWhere('car_man="'.$car_man.'"'); - } - if($phone != '') { - $query = $query->andWhere('link_phone="'.$phone.'"'); - } - if($car_no != '') { - $query = $query->andWhere('car_no="'.$car_no.'"'); - } - $next_item = $query->offset($next_index)->one(); - if($next_item) { - $next_id = $next_item->car_id; - } - $next_index++; - } - return $this->render('info',[ - 'type' => $type, - 'car_info' => $car_info, - 'insurer_type_items' => $insurer_type_items, - 'order_info' => $order_info, - 'insurer_company_items' => $insurer_company_items, - 'pay_type_items' => $pay_type_items, - 'car_use_items' => $car_use_items, - 'car_type_items' => $car_type_items, - 'brand_items' => $brand_items, - 'series_items' => $series_items, - 'displacement_items' => $displacement_items, - 'direction_items' => $direction_items, - 'range_items' => $range_items, - 'city_items' => $city_items, - 'district_items' => $district_items, - 'gift_items' => $gift_items, - 'success_items' => $success_items, - 'failure_items' => $failure_items, - 'next_id' => $next_id, - 'next_index' => $next_index, - 'car_man' => $car_man, - 'car_no' => $car_no, - 'phone' => $phone, - 'page' => $page, - 'sort_key' => $sort_key, - 'sort_value' => $sort_value, - 'back_params' => $back_params - ]); - } - - public function actionInfoView() - { - $request = Yii::$app->request; - $id = $request->get('id',0); - $type = $request->get('type',0); - $car_man = $request->get('car_man'); - $phone = $request->get('phone'); - $car_no = $request->get('car_no'); - $page = $request->get('page',1); - $sort_key = $request->get('sort_key','appointment_t.pdate'); - $sort_value = $request->get('sort_value','ASC'); - $next_index = $request->get('next_index',0); - - $car_info = CarT::findOne(['id'=>$id]); - $failure_items = InvalidT::getTree(2); - - //礼品 - $gift_items = CarGiftT::find() - ->where('car_id='.$car_info->id) - ->orderBy('strategy_id DESC') - ->all(); - - //下一辆 - $next_id = 0; - if($type == 1) { - $query = AppointmentT::find() - ->leftJoin('car_t','`car_t`.`id`=`appointment_t`.`car_id`') - ->where('appointment_t.is_first=1 and car_t.is_track=1') - ->andWhere('appointment_t.pdate<="'.date('Y-m-d').'"'); - - $user_ids = $this->getChildrenUserIDs(); - $query = $query->andWhere(['in','appointment_t.user_id',$user_ids]); - - if($car_man != '') { - $query = $query->andWhere('car_t.car_man like "'.$car_man.'"'); - } - if($phone != '') { - $query = $query->andWhere('car_t.phone="'.$phone.'"'); - } - if($car_no != '') { - $query = $query->andWhere('car_t.car_no like "'.$car_no.'"'); - } - if($sort_key != '') { - $query = $query->orderBy($sort_key.' '.$sort_value); - } - $next_item = $query->offset($next_index)->one(); - if($next_item) { - $next_id = $next_item->car_id; - } - $next_index++; - } - if($type == 2) { - $query = AppointmentT::find() - ->leftJoin('car_t','`car_t`.`id`=`appointment_t`.`car_id`') - ->where('appointment_t.is_first=0 and car_t.is_track=1') - ->andWhere('appointment_t.pdate<="'.date('Y-m-d').'"'); - - $user_ids = $this->getChildrenUserIDs(); - $query = $query->andWhere(['in','appointment_t.user_id',$user_ids]); - - if($car_man != '') { - $query = $query->andWhere('car_t.car_man like "'.$car_man.'"'); - } - if($phone != '') { - $query = $query->andWhere('car_t.phone="'.$phone.'"'); - } - if($car_no != '') { - $query = $query->andWhere('car_t.car_no like "'.$car_no.'"'); - } - if($sort_key != '') { - $query = $query->orderBy($sort_key.' '.$sort_value); - } - $next_item = $query->offset($next_index)->one(); - if($next_item) { - $next_id = $next_item->car_id; - } - $next_index++; - } - if($type == 3) { - $query = AppointmentT::find() - ->leftJoin('car_t','`car_t`.`id`=`appointment_t`.`car_id`') - ->where('appointment_t.is_first=0 and car_t.is_track=1'); - - $user_ids = $this->getChildrenUserIDs(); - $query = $query->andWhere(['in','appointment_t.user_id',$user_ids]); - - if($car_man != '') { - $query = $query->andWhere('car_t.car_man like "'.$car_man.'"'); - } - if($phone != '') { - $query = $query->andWhere('car_t.phone="'.$phone.'"'); - } - if($car_no != '') { - $query = $query->andWhere('car_t.car_no like "'.$car_no.'"'); - } - if($sort_key != '') { - $query = $query->orderBy($sort_key.' '.$sort_value); - } - $next_item = $query->offset($next_index)->one(); - if($next_item) { - $next_id = $next_item->car_id; - } - $next_index++; - } - return $this->render('info-view',[ - 'type' => $type, - 'car_info' => $car_info, - 'failure_items' => $failure_items, - 'next_id' => $next_id, - 'next_index' => $next_index, - 'car_man' => $car_man, - 'car_no' => $car_no, - 'phone' => $phone, - 'page' => $page, - 'sort_key' => $sort_key, - 'sort_value' => $sort_value, - 'gift_items' => $gift_items - ]); - } - - public function actionInfoTrack() - { - $request = Yii::$app->request; - $id = $request->get('id',0); - $type = $request->get('type',0); - $car_man = $request->get('car_man'); - $phone = $request->get('phone'); - $car_no = $request->get('car_no'); - $page = $request->get('page',1); - $sort_key = $request->get('sort_key','appointment_t.pdate'); - $sort_value = $request->get('sort_value','ASC'); - $next_index = $request->get('next_index',0); - $back_params = $request->get('back_params'); - - $car_info = CarT::findOne(['id'=>$id]); - - $car_use_items = CarUseT::find()->all(); - $car_type_items = CarTypeT::find()->all(); - $brand_items = BrandT::find()->all(); - $series_items = SeriesT::find() - ->where('brand_id='.intval($car_info->brand_id)) - ->all(); - $displacement_items = DisplacementT::find() - ->where('series_id='.intval($car_info->series_id)) - ->all(); - $failure_items = InvalidT::getTree(2); - - //礼品 - $gift_items = CarGiftT::find() - ->where('car_id='.$car_info->id) - ->orderBy('strategy_id DESC') - ->all(); - - //下一辆 - $next_id = 0; - if($type == 1) { - $query = AppointmentT::find() - ->leftJoin('car_t','`car_t`.`id`=`appointment_t`.`car_id`') - ->where('appointment_t.is_first=1 and car_t.is_track=1') - ->andWhere('appointment_t.pdate<="'.date('Y-m-d').'"'); - - $user_ids = $this->getChildrenUserIDs(); - $query = $query->andWhere(['in','appointment_t.user_id',$user_ids]); - - if($car_man != '') { - $query = $query->andWhere('car_t.car_man like "'.$car_man.'"'); - } - if($phone != '') { - $query = $query->andWhere('car_t.phone="'.$phone.'"'); - } - if($car_no != '') { - $query = $query->andWhere('car_t.car_no like "'.$car_no.'"'); - } - if($sort_key != '') { - $query = $query->orderBy($sort_key.' '.$sort_value); - } - $next_item = $query->offset($next_index)->one(); - if($next_item) { - $next_id = $next_item->car_id; - } - $next_index++; - } - if($type == 2) { - $query = AppointmentT::find() - ->leftJoin('car_t','`car_t`.`id`=`appointment_t`.`car_id`') - ->where('appointment_t.is_first=0 and car_t.is_track=1') - ->andWhere('appointment_t.pdate<="'.date('Y-m-d').'"'); - - $user_ids = $this->getChildrenUserIDs(); - $query = $query->andWhere(['in','appointment_t.user_id',$user_ids]); - - if($car_man != '') { - $query = $query->andWhere('car_t.car_man like "'.$car_man.'"'); - } - if($phone != '') { - $query = $query->andWhere('car_t.phone="'.$phone.'"'); - } - if($car_no != '') { - $query = $query->andWhere('car_t.car_no like "'.$car_no.'"'); - } - if($sort_key != '') { - $query = $query->orderBy($sort_key.' '.$sort_value); - } - $next_item = $query->offset($next_index)->one(); - if($next_item) { - $next_id = $next_item->car_id; - } - $next_index++; - } - if($type == 3) { - $query = AppointmentT::find() - ->leftJoin('car_t','`car_t`.`id`=`appointment_t`.`car_id`') - ->where('appointment_t.is_first=0 and car_t.is_track=1'); - - $user_ids = $this->getChildrenUserIDs(); - $query = $query->andWhere(['in','appointment_t.user_id',$user_ids]); - - if($car_man != '') { - $query = $query->andWhere('car_t.car_man like "'.$car_man.'"'); - } - if($phone != '') { - $query = $query->andWhere('car_t.phone="'.$phone.'"'); - } - if($car_no != '') { - $query = $query->andWhere('car_t.car_no like "'.$car_no.'"'); - } - if($sort_key != '') { - $query = $query->orderBy($sort_key.' '.$sort_value); - } - $next_item = $query->offset($next_index)->one(); - if($next_item) { - $next_id = $next_item->car_id; - } - $next_index++; - } - return $this->render('info-track',[ - 'type' => $type, - 'car_info' => $car_info, - 'failure_items' => $failure_items, - 'next_id' => $next_id, - 'next_index' => $next_index, - 'car_man' => $car_man, - 'car_no' => $car_no, - 'phone' => $phone, - 'page' => $page, - 'sort_key' => $sort_key, - 'sort_value' => $sort_value, - 'gift_items' => $gift_items, - 'car_use_items' => $car_use_items, - 'car_type_items' => $car_type_items, - 'brand_items' => $brand_items, - 'series_items' => $series_items, - 'displacement_items' => $displacement_items, - 'back_params' => $back_params - ]); - } - - public function actionInfoEdit() - { - $request = Yii::$app->request; - $id = $request->get('id',0); - $info = CarT::findOne(['id'=>$id]); - - $car_use_items = CarUseT::find()->all(); - $car_type_items = CarTypeT::find()->all(); - $brand_items = BrandT::find()->all(); - $series_items = SeriesT::find() - ->where('brand_id='.intval($info->brand_id)) - ->all(); - $displacement_items = DisplacementT::find() - ->where('series_id='.intval($info->series_id)) - ->all(); - - return $this->render('info-edit',[ - 'info' => $info, - 'car_use_items' => $car_use_items, - 'car_type_items' => $car_type_items, - 'brand_items' => $brand_items, - 'series_items' => $series_items, - 'displacement_items' => $displacement_items - ]); - } - - public function actionSeries() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $result = array(); - $brand_id = $request->get('brand_id',0); - - $query = SeriesT::find() - ->where('brand_id='.$brand_id); - $items = $query->all(); - $html = ''; - foreach($items as $item) { - $html .= ''; - } - $result['success'] = true; - $result['html'] = $html; - return $result; - } - - public function actionDisplacement() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $result = array(); - $series_id = $request->get('series_id',0); - - $query = DisplacementT::find() - ->where('series_id='.$series_id); - $items = $query->all(); - $html = ''; - foreach($items as $item) { - $html .= ''; - } - $result['success'] = true; - $result['html'] = $html; - return $result; - } - - //保单信息保存 - public function actionOrderSave() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $result = array(); - $result['success'] = false; - $result['msg'] = '保存失败'; - - if($request->isPost) { - //状态 - $status_id = $request->post('status_id',1); - //车辆信息 - $car_id = $request->post('car_id',0); - $car_no = $request->post('car_no'); - $seats = (int)$request->post('seats'); - $register_date = $request->post('register_date'); - $car_man = $request->post('car_man'); - $car_man_number = $request->post('car_man_number'); - - //保单信息 - $order_id = $request->post('order_id',0); - $id_man = $request->post('id_man'); - $id_number = $request->post('id_number'); - $link_man = $request->post('link_man'); - $link_phone = $request->post('link_phone'); - $send_date = $request->post('send_date'); - $company_id = $request->post('company_id'); - $pay_type_id = $request->post('pay_type_id'); - $email = $request->post('email'); - $insurer1_begin_date = $request->post('insurer1_begin_date'); - $insurer2_begin_date = $request->post('insurer2_begin_date'); - $order_remark = $request->post('order_remark'); - $direction1_id = $request->post('direction1_id'); - $range1_id = $request->post('range1_id'); - $city1_id = $request->post('city1_id'); - $district1_id = $request->post('district1_id'); - $send_address1 = $request->post('send_address1'); - $send_address2 = $request->post('send_address2'); - $success_id = $request->post('success_id'); - - //报价信息 - $total1_clear = $request->post('total1_clear'); - $total1 = $request->post('total1'); - $total1_real = $request->post('total1_real'); - $total1_dis = $request->post('total1_dis'); - $total1_percent = $request->post('total1_percent'); - $total2_clear = $request->post('total2_clear'); - $total2 = $request->post('total2'); - $total3 = $request->post('total3'); - $total_all = $request->post('total_all'); - $total_real = $request->post('total_real'); - $price_remark = $request->post('price_remark'); - - //报价明细 - $types = $request->post('types',array()); - $nopays = $request->post('nopays', array()); - - //礼品 - $gifts = $request->post('gifts',array()); - - if($car_no == '') { - $result['msg'] = '请输入车牌号码!'; - return $result; - } - - $tran = CarT::getDb()->beginTransaction(); - try { - $order_info = OrderT::findOne(['id'=>$order_id]); - $car_info = $order_info->car; - //车辆信息 - $car_info->car_no = $car_no; - $car_info->seats = $seats; - $car_info->register_date = $register_date; - $car_info->car_man = $car_man; - $car_info->car_man_number = $car_man_number; - $car_info->save(); - - //保单信息 - $order_info->car_no = $car_no; - $order_info->engine_no = $car_info->engine_no; - $order_info->car_frame_no = $car_info->car_frame_no; - $order_info->car_man = $car_man; - $order_info->company_id = $company_id; - $order_info->success_id = $success_id; - $order_info->status_id = $status_id; - if($status_id > 1) { - $order_info->return_status_id = 0; - $order_info->return_remark = ''; - $order_info->return_time = 0; - } - $order_info->submit_date = date('Y-m-d'); - $order_info->id_man = $id_man; - $order_info->id_number = $id_number; - $order_info->link_man = $link_man; - $order_info->link_phone = $link_phone; - $order_info->insurer1_begin_date = $insurer1_begin_date; - $insurer1_end_date = ''; - if($insurer1_begin_date) - $insurer1_end_date = date('Y-m-d',strtotime(date('Y-m-d',strtotime($insurer1_begin_date."+1 year")).'-1 day')); - $order_info->insurer1_end_date = $insurer1_end_date; - $order_info->insurer2_begin_date = $insurer2_begin_date; - $insurer2_begin_date = ''; - if($insurer2_begin_date != '') - $insurer2_begin_date = date('Y-m-d',strtotime(date('Y-m-d',strtotime($insurer2_begin_date."+1 year")).'-1 day')); - $order_info->insurer2_end_date = $insurer2_begin_date; - $order_info->send_date = $send_date; - $order_info->direction1_id = $direction1_id; - $order_info->range1_id = $range1_id; - $order_info->city1_id = $city1_id; - $order_info->district1_id = $district1_id; - $order_info->send_address1 = $send_address1; - $order_info->send_address2 = $send_address2; - $order_info->pay_type_id = $pay_type_id; - $order_info->email = $email; - $order_info->remark = $order_remark; - - $order_info->total1_clear = $total1_clear; - $order_info->total1 = $total1; - $order_info->total1_real = $total1_real; - $order_info->total1_dis = $total1_dis; - $order_info->total1_percent = $total1_percent; - $order_info->total2_clear = $total2_clear; - $order_info->total2 = $total2; - $order_info->total3 = $total3; - $order_info->total_all = $total_all; - $order_info->total_real = $total_real; - $order_info->price_remark = $price_remark; - - $order_info->save(); - - //险种明细 - foreach($types as $id=>$val) { - $price_row = PriceT::find() - ->where('order_id='.$order_info->id.' and type_id='.$id) - ->one(); - if(empty($price_row)) { - $price_row = new PriceT(); - $price_row->order_id = $order_info->id; - $price_row->type_id = $id; - } - $price_row->val = $val; - if(!empty($nopays[$id])) - $price_row->is_nopay = 1; - else - $price_row->is_nopay = 0; - $price_row->save(); - } - - //处理预约 - if($status_id > 1) { - $tmp_row = AppointmentT::findOne(['car_id'=>$car_info->id]); - if(!empty($tmp_row)) { - $tmp_row->delete(); - } - - $this->addLog($car_info->id,'提交内勤,进入核保管理',1); - } - - //处理公司礼品 - //清除原公司礼品 - CarGiftT::deleteAll('user_id='.$this->my->id.' and car_id='.$car_info->id.' and order_id='.$order_info->id.' and type=1 and status=0'); - foreach($gifts as $id_str) { - $gift_ids = explode('-',$id_str); - if(count($gift_ids) != 2) continue; - $strategy_id = $gift_ids[0]; - $gift_id = $gift_ids[1]; - $car_gift_info = CarGiftT::find() - ->where('strategy_id='.$strategy_id.' and order_id='.$order_info->id.' and gift_id='.$gift_id) - ->one(); - if(!$car_gift_info && $gift_id > 0) { - $car_gift_info = new CarGiftT(); - $car_gift_info->user_id = $this->my->id; - $car_gift_info->car_id = $car_info->id; - $car_gift_info->order_id = $order_info->id; - $car_gift_info->strategy_id = $strategy_id; - $car_gift_info->gift_id = $gift_id; - $car_gift_info->submit_time = time(); - $car_gift_info->status = 0; - $car_gift_info->type = 1; - $car_gift_info->save(); - } - } - //处理自费礼品 - $gift_items = CarGiftT::find() - ->where('car_id='.$car_info->id.' and order_id=0') - ->all(); - foreach($gift_items as $item) { - $item->order_id = $order_info->id; - $item->save(); - } - - $result['success'] = true; - $result['msg'] = '保存成功'; - - $tran->commit(); - } catch (\Exception $e) { - $tran->rollBack(); - throw $e; - } - - } - return $result; - } - - public function actionAjaxHistoryIndex() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $car_id = $request->get('car_id'); - $page = $request->get('page',1); - - $result = array(); - $result['success'] = false; - $result['msg'] = '读取失败'; - - $query = CarLogT::find() - ->where(['car_id'=>$car_id,'type'=>1]) - ->orderBy('id DESC'); - - $total = $query->count(); - - $pagination = new Pagination(['totalCount' => $total,'pageSize'=>20]); - $pagination->setPage($page-1); - - $query = $query->offset($pagination->offset)->limit($pagination->limit); - $items = $query->all(); - - $page_info = MyLib::getAjaxPageInfo($pagination,'car_history_list'); - $html = $this->renderPartial('ajax-history-index',[ - 'car_id' => $car_id, - 'items' => $items, - 'page' => $page, - 'page_info' => $page_info - ]); - $result['success'] = true; - $result['html'] = $html; - return $result; - } - - public function actionInvalid() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $result = array(); - $result['success'] = false; - $result['msg'] = '操作失败'; - - if($request->isPost) { - $car_id = $request->post('car_id'); - $invalid_id = $request->post('invalid_id',0); - - $tran = CarT::getDb()->beginTransaction(); - try { - $car_info = CarT::findOne(['id'=>$car_id]); - $car_info->location = 5; - $car_info->save(); - - CarInvalidT::deleteAll('id='.$car_info->id); - $invalid_info = new CarInvalidT(); - $invalid_info->id = $car_info->id; - $invalid_info->invalid_id = $invalid_id; - $invalid_info->user_id = $this->my->id; - $invalid_info->save(); - - CarBT::deleteAll(['id'=>$car_info->id]); - CarCT::deleteAll(['id'=>$car_info->id]); - CarDT::deleteAll(['id'=>$car_info->id]); - - //删除预约 - AppointmentT::deleteAll('car_id='.$car_info->id); - - //删除保单 - OrderT::deleteAll('car_id='.$car_info->id.' and status_id<2'); - - $this->addLog($car_info->id,'无效车辆数据:'.$invalid_info->invalid->name,1); - - $result['success'] = true; - $result['msg'] = '操作成功'; - - $tran->commit(); - } catch (\Exception $e) { - $tran->rollBack(); - throw $e; - } - } - return $result; - } - - public function actionSearch() - { - $request = Yii::$app->request; - $car_man = $request->get('car_man'); - $phone = $request->get('phone'); - $car_no = $request->get('car_no'); - $car_model = $request->get('car_model'); - $register_date = $request->get('register_date'); - $insurer_date = $request->get('insurer_date'); - $id_man = $request->get('id_man'); - $op = $request->get('op',1); - $page = $request->get('page',1); - if($page < 1) $page = 1; - - $query = CarT::find() - ->leftJoin('order_t','`order_t`.`car_id`=`car_t`.`id`'); - - if($op==0) { - $query = $query->andWhere('car_t.id=-1'); - } - if($car_man != '') { - $query = $query->andWhere('car_t.car_man like "'.$car_man.'"'); - } - if($phone != '') { - $linkman_items = LinkmanT::find() - ->where('phone like "'.$phone.'"') - ->all(); - $car_ids = array(); - foreach($linkman_items as $linkman_info) { - $car_ids[] = $linkman_info->car_id; - } - $car_ids_str = join(',',$car_ids); - if($car_ids_str == '') - $car_ids_str = '0'; - - $query = $query->andWhere('(car_t.phone like "'.$phone.'" or car_t.id in ('.$car_ids_str.'))'); - } - if($car_no != '') { - $query = $query->andWhere('car_t.car_no like "'.$car_no.'"'); - } - if($car_model != '') { - $query = $query->andWhere('car_t.car_model="'.$car_model.'"'); - } - if($register_date != '') { - $query = $query->andWhere('car_t.register_date='.$register_date); - } - if($insurer_date != '') { - $query = $query->andWhere('car_t.insurer1_date="'.$insurer_date.'" or car_t.insurer2_date="'.$insurer_date.'"'); - } - if($id_man != '') { - $query = $query->andWhere('order_t.id_man="'.$id_man.'"'); - } - $total = $query->count(); - - $pagination = new Pagination(['totalCount' => $total,'pageSize'=>20]); - $pagination->setPage($page-1); - - $query = $query->offset($pagination->offset)->limit($pagination->limit); - $items = $query->all(); - - $page_info = MyLib::getPageInfo($pagination); - - return $this->render('search',[ - 'items' => $items, - 'car_man' => $car_man, - 'phone' => $phone, - 'car_no' => $car_no, - 'car_model' => $car_model, - 'register_date' => $register_date, - 'insurer_date' => $insurer_date, - 'id_man' => $id_man, - 'page' => $page, - 'page_info' => $page_info - ]); - } - public function actionSmsMake() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $result = array(); - $result['success'] = false; - $result['msg'] = '生成失败'; - - $order_id = $request->post('order_id'); - $order_info = OrderT::findOne(['id'=>$order_id]); - $car_info = $order_info->car; - - $total1 = $request->post('total1'); - $total2 = $request->post('total2'); - $total3 = $request->post('total3'); - $total_all = $request->post('total_all'); - $types = $request->post('types'); - $nopays = $request->post('nopays'); - - $insurer_type_items = InsurerTypeT::find()->all(); - - $msg = '尊敬的'.$car_info->car_no.'客户您好,人保车险'.$this->my->name.'为您报价!'; - $msg .= '交强险'.$total2.'元,'; - $msg .= '商业险'.$total1.'元,'; - $msg .= '其中包含'; - $bj = ''; - foreach($insurer_type_items as $item) { - if($item->id == 10 || $item->id == 11) continue; - if($types[$item->id] != '' && $types[$item->id] != '否' && $types[$item->id] != '无') { - $msg .= $item->name; - if($types[$item->id] != '是') - $msg .= $types[$item->id]; - $msg .= '、'; - if(isset($nopays[$item->id]) && ($nopays[$item->id] == 1)) - $bj .= $item->code; - } - } - if($total3 > 0) { - $msg .= '车船税'.$total3.'元,'; - } - $msg .= '总计'.$total_all.'元,'; - if($bj != '') { - $msg .= '不计免赔覆盖'.$bj.'。'; - } - $msg .= '以上价格仅供参考,价格可能受您的历史理赔情况等的影响,最终价格以出单为准。详情请咨询010-53778188,回复TD拒收。'; - - $result['success'] = true; - $result['msg'] = $msg; - return $result; - } - - public function actionSmsSend() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $MessageContent = $request->post('msg'); - $UserNumber = $request->post('tel'); - $url = 'http://api.ums86.com:8899/sms/Api/Send.do'; - $params['SpCode'] = '230525'; - $params['LoginName'] = 'sr_ys'; - $params['Password'] = 'chbj123456'; - $params['UserNumber'] = $UserNumber; - $params['MessageContent'] = mb_convert_encoding($MessageContent,'gbk','utf8'); - $params['SerialNumber'] = date('YmdHis').rand(100,999); - $params['ScheduleTime'] = ''; - $params['f'] = 1; - $post_url = http_build_query($params); - $msg = MyLib::Get($url.'?'.$post_url); - $msg = mb_convert_encoding($msg,'UTF8','GBK'); - parse_str($msg,$obj); - $result = array(); - $result['success'] = true; - $result['msg'] = '发送成功'; - if($obj['result'] != 0) { - $result['msg'] = $obj['description']; - } - return $result; - } - - public function actionLinkmanSave() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $result = array(); - $result['success'] = false; - $result['msg'] = '保存失败'; - - if($request->isPost) { - $car_id = $request->post('car_id',0); - $name = $request->post('name'); - $phone = $request->post('phone'); - $id_number = $request->post('id_number'); - $type = $request->post('type'); - - if($name == '' || $phone == '') { - $result['msg'] = '请输入姓名和联系电话!'; - return $result; - } - - $row = null; - $linkman_info = new LinkmanT(); - $linkman_info->car_id = $car_id; - $linkman_info->name = $name; - $linkman_info->phone = $phone; - $linkman_info->type = $type; - $linkman_info->id_number = $id_number; - if(!$linkman_info->save()) { - var_dump($linkman_info->errors); - } - - $result['success'] = true; - $result['msg'] = '保存成功'; - } - return $result; - } - - public function actionAjaxLinkmanIndex() - { - Yii::$app->response->format = Response::FORMAT_JSON; - $request = Yii::$app->request; - $car_id = $request->get('car_id'); - - $result = array(); - $result['success'] = false; - $result['msg'] = '读取失败'; - - $query = LinkmanT::find() - ->where(['car_id'=>$car_id]) - ->orderBy('id ASC'); - - $items = $query->all(); - - $html = $this->renderPartial('ajax-linkman-index',[ - 'items' => $items - ]); - $result['success'] = true; - $result['html'] = $html; - return $result; - } -} diff --git a/frontend/controllers/GiftController.php b/frontend/controllers/GiftController.php index 28aae4d..06b88da 100644 --- a/frontend/controllers/GiftController.php +++ b/frontend/controllers/GiftController.php @@ -8,6 +8,7 @@ use common\models\EmsT; use common\models\GiftT; use common\models\GiftTicketTUse; use common\models\GiftTypeT; +use common\models\GiftUseLogT; use common\models\GroupT; use common\models\InsurerTypeT; use common\models\OrderT; @@ -111,7 +112,6 @@ class GiftController extends \yii\web\Controller $img = $request->post('img'); $price = $request->post('price'); $remark = $request->post('remark'); - $total = (int)$request->post('total'); $use_num = (int)$request->post('use_num'); if($name == '') { @@ -132,7 +132,6 @@ class GiftController extends \yii\web\Controller $row->price = $price; $row->original_img = $img; $row->remark = $remark; - $row->total = $total; $row->use_num = $use_num; $row->pinyin_name = $pin_name; $row->save(); @@ -785,16 +784,16 @@ class GiftController extends \yii\web\Controller return $data; } - public function actionGiftUse() { + public function actionTicketUse() { $type_items = GiftT::find() ->where(['type_id'=>2,'is_delete'=>0]) ->all(); - return $this->render('gift-use', [ + return $this->render('ticket-use', [ 'type_items' => $type_items ]); } - public function actionGiftUseJson() + public function actionTicketUseJson() { Yii::$app->response->format = Response::FORMAT_JSON; $request = Yii::$app->request; @@ -888,7 +887,8 @@ class GiftController extends \yii\web\Controller $row['car_frame_no'] = $order_info->car_no; $row['op'] = $item->op?$item->op->getShowName():''; $row['finished_date'] = $item->finished_date != '0000-00-00'?$item->finished_date:''; - $row['user'] = ($item->user && $item->status > 0)?$item->user->getShowName():''; + $row['username'] = ($item->user && $item->status > 0)?$item->user->getShowName():''; + $row['submit_user'] = $order_info->user ? $order_info->user->getShowName():''; $row['status'] = $item->getStatus(); $row['use_num'] = $gift_info->use_num; $data['rows'][] = $row; @@ -968,4 +968,115 @@ class GiftController extends \yii\web\Controller return $data; } + public function actionTicketUseEdit() + { + $request = Yii::$app->request; + $id = $request->get('id',0); + $back_params = $request->get('back_params'); + if($id > 0) { + $info = GiftTicketTUse::findOne(['id'=>$id]); + } else { + $info = new GiftTicketTUse(); + } + + + + return $this->render('ticket-use-edit',[ + 'info' => $info + ]); + } + public function actionHistoryLogJson() + { + Yii::$app->response->format = Response::FORMAT_JSON; + Yii::$app->response->format = Response::FORMAT_JSON; + $request = Yii::$app->request; + $id = $request->get('id'); + $offset = $request->get('offset', 0); + $limit = $request->get('limit', 10); + + $query = GiftUseLogT::find() + ->where('gift_use_id='.$id) + ->orderBy('op_time DESC'); + + $total = $query->count(); + + $query->offset($offset)->limit($limit); + $items = $query->all(); + + $data = []; + $data['total'] = $total; + $data['rows'] = []; + foreach($items as $item) { + $row = $item->toArray(); + $row['op_time'] = date('Y-m-d H:i:s', $item->op_time); + $data['rows'][] = $row; + } + + return $data; + } + public function actionUseSave() + { + Yii::$app->response->format = Response::FORMAT_JSON; + $request = Yii::$app->request; + $result = array(); + $result['success'] = false; + $result['msg'] = '保存失败'; + + if($request->isPost) { + $id = $request->post('id'); + $remark = $request->post('remark'); + + $tran = GiftTicketTUse::getDb()->beginTransaction(); + try { + $ticket_info = GiftTicketTUse::findOne(['id'=>$id]); + if(!$ticket_info) { + $result['msg'] = '礼品券不存在!'; + return $result; + } + + $use_num = $ticket_info->typeNew->use_num; + $finished_num = $ticket_info->finished_num + 1; + $ticket_info->user_id = $this->my->id; + $ticket_info->finished_num = $finished_num; + $ticket_info->finished_date = date('Y-m-d'); + $ticket_info->use_date = date('Y-m-d H:i:s'); + + if($finished_num < $use_num){ + $ticket_info->status = 2; + }elseif ($finished_num >= $use_num){ + $ticket_info->status = 3; + } + + if(!$ticket_info->save()) { + throw new \Exception(print_r($ticket_info->getErrors(), true)); + } + + $this->addGiftUseLog($id,'使用了一次',$remark); + $result['success'] = true; + $result['msg'] = '保存成功'; + + $tran->commit(); + } catch (\Exception $e) { + $tran->rollBack(); + $result['msg'] = $e->getMessage(); + } + + } + return $result; + } + + public function addGiftUseLog($id,$info,$remark,$type=1) + { + $log_info = new GiftUseLogT(); + $log_info->gift_use_id = $id; + $log_info->op_time = time(); + $log_info->op_man = $this->my->getShowName(); + $log_info->group_name = $this->my->group?$this->my->group->getPath():''; + $log_info->type = $type; + $log_info->remark = $remark; + $log_info->info = $info; + if(!$log_info->save()) { + throw new \Exception(print_r($log_info->getErrors(), true)); + } + } } diff --git a/frontend/controllers/InsurerController.php b/frontend/controllers/InsurerController.php index 266a1d4..785f473 100644 --- a/frontend/controllers/InsurerController.php +++ b/frontend/controllers/InsurerController.php @@ -26,9 +26,11 @@ use common\models\ExpressT; use common\models\GiftGroupT; use common\models\GiftT; use common\models\GiftTicketT; +use common\models\GiftTicketTUse; use common\models\GiftType2T; use common\models\GiftType3T; use common\models\GroupT; +use common\models\InsurerCompany2T; use common\models\InsurerCompanyT; use common\models\InsurerTypeT; use common\models\InvalidT; @@ -50,8 +52,10 @@ use common\models\SeriesT; use common\models\UserT; use common\models\CaiwuStatusT; use common\models\ZhongjiGiftT; +use Faker\Provider\Image; use Yii; use yii\data\Pagination; +use yii\helpers\FileHelper; use yii\web\Response; use yii\web\User; use yii\helpers\ArrayHelper; @@ -470,54 +474,6 @@ class InsurerController extends BaseController return $data; } -// public function actionMyListInfo() -// { -// $request = Yii::$app->request; -// $id = $request->get('id',0); -// $order_info = OrderT::findOne(['id'=>$id]); -// $car_info = $order_info->car; -// -// //快递 -// $ems_items = EmsT::find() -// ->where(['car_id'=>$car_info->id,'order_id'=>$order_info->id]) -// ->orderBy('id ASC') -// ->all(); -// //礼品 -// $gift_items = GiftT::find() -// ->where('type_id=1') -// ->all(); -// //礼品 -// $gift_group_items = GiftGroupT::find()->all(); -// //获取礼品数据 -// $sel_gifts = array(); -// $tmp_items = OrderGiftT::find() -// ->where('order_id='.$order_info->id) -// ->all(); -// foreach($tmp_items as $item) { -// $sel_gifts[$item->group_id] = $item; -// } -// -// $insurer_type_items = InsurerTypeT::find() -// ->all(); -// -// //登陆用户ID -// $uid = $this->my->role_id; -// //转账信息 -// $caiwu_status = CaiwuStatusT::find()->asArray()->all(); -// $caiwu_status= ArrayHelper::map($caiwu_status,'id', 'name'); -// -// return $this->render('my-list-info',[ -// 'car_info' => $car_info, -// 'caiwu_status' => $caiwu_status, -// 'insurer_type_items' => $insurer_type_items, -// 'order_info' => $order_info, -// 'ems_items' => $ems_items, -// 'uid' => $uid, -// 'gift_items' => $gift_items, -// 'gift_group_items' => $gift_group_items, -// 'sel_gifts' => $sel_gifts, -// ]); -// } public function actionMyListInfo() { $request = Yii::$app->request; @@ -557,6 +513,7 @@ class InsurerController extends BaseController //登陆用户ID $uid = $this->my->role_id; + $my_id = $this->my->id; //转账信息 $caiwu_status = CaiwuStatusT::find()->asArray()->all(); $caiwu_status= ArrayHelper::map($caiwu_status,'id', 'name'); @@ -569,6 +526,7 @@ class InsurerController extends BaseController 'ems_items' => $ems_items, 'ems_items1' => $ems_items1, 'uid' => $uid, + 'my_id' => $my_id, 'gift_items' => $gift_items, 'gift_group_items' => $gift_group_items, 'sel_gifts' => $sel_gifts, @@ -670,29 +628,44 @@ class InsurerController extends BaseController * @return string */ public function actionOfficeMng() { - return $this->render('office-mng'); + $insurer_company_items = InsurerCompanyT::find()->all(); + + return $this->render('office-mng',[ + 'insurer_company_items' => $insurer_company_items + ]); } public function actionOfficeMngJson() { Yii::$app->response->format = Response::FORMAT_JSON; $request = Yii::$app->request; + $type = $request->get('type'); $car_man = $request->get('car_man'); $phone = $request->get('phone'); $car_no = $request->get('car_no'); + $company2_id = $request->get('company2_id'); $offset = $request->get('offset', 0); $limit = $request->get('limit', 10); $query = OrderT::find() ->where('status_id=2') ->orderBy('submit_date DESC, id DESC'); + if($type == 1) { + $query->andWhere('lock_id=0'); + } + if($type == 2) { + $query->andWhere('lock_id>0'); + } if($car_man != '') { - $query = $query->andWhere('car_man="'.$car_man.'"'); + $query->andWhere('car_man="'.$car_man.'"'); } if($phone != '') { - $query = $query->andWhere('link_phone="'.$phone.'"'); + $query->andWhere('car_man_phone like :phone1 or id_man_phone like :phone2 or link_man_phone like :phone3',[':phone1'=>$phone,':phone2'=>$phone,':phone3'=>$phone]); } if($car_no != '') { - $query = $query->andWhere('car_no="'.$car_no.'"'); + $query->andWhere('car_no="'.$car_no.'"'); + } + if($company2_id > 0) { + $query->andWhere('company2_id=:company2_id',[':company2_id'=>$company2_id]); } $query = $query->orderBy('updated_at asc'); $total = $query->count(); @@ -754,7 +727,7 @@ class InsurerController extends BaseController $insurer_type_items = InsurerTypeT::find() ->all(); - $insurer_company_items = InsurerCompanyT::find() + $insurer_company2_items = InsurerCompany2T::find() ->all(); $payee_items=PayeeT::find()->all(); $payment_items=Payment::find()->all(); @@ -763,10 +736,9 @@ class InsurerController extends BaseController 'car_info' => $car_info, 'insurer_type_items' => $insurer_type_items, 'order_info' => $order_info, - 'insurer_company_items' => $insurer_company_items, + 'insurer_company2_items' => $insurer_company2_items, 'payee_items' => $payee_items, 'payment_items' => $payment_items, - 'type_items' => $type_items ]); } /** @@ -856,57 +828,22 @@ class InsurerController extends BaseController $result['msg'] = '保单错误!'; return $result; } - //更新车辆车牌号 - $car_info = $order_info->car; - $car_info->car_no = $order_info->car_no; - $car_info->save(); $old_status_id = $order_info->status_id; $order_info->total1_rate = $total1_rate; $order_info->total2_rate = $total2_rate; $order_info->company_id = $company_id; - $order_info->payee_id = $payee_id; - $order_info->payment_id = $payment_id; - $order_info->zhifu_date = date('Y-m-d'); $order_info->pay_no = $pay_no; $order_info->status_id = $status_id; - //如果是在线支付和自上门,更改订单状态 - - -// echo '
'; -// print_r($old_status_id); -// echo '
'; -// print_r($status_id); -// die; - - - + $result['msg'] = '保存成功'; if($status_id > $old_status_id) { -// if($order_info->shoufei_id ==2 || $order_info->shoufei_id ==3){ -// -// $order_info->status_id = 5; -// } $order_info->op1_id = $this->my->id; -// echo '
'; - $order_info->lock_id = 0; -// if($order_info->shoufei_id ==2){ -// $this->addLog($car_id,'核保结束,在线支付,直接进入正本生成',1); -//// echo 1; -// }elseif( $order_info->shoufei_id ==3){ -// $this->addLog($car_id,'核保结束,客户自上门,直接进入正本生成',1); -//// echo 2; -// } else{ - $this->addLog($car_id,'核保结束,进入正本生成',1); -// echo 3; -// } -// echo '
'; -// print_r($order_info->status_id); -// print_r($status_id); -// print_r($old_status_id); -// die; +// $order_info->lock_id = 0; + $result['msg'] = '提交成功'; + $this->addLog($car_id,'核保结束,进入正本生成',1); //处理操作人员状态 $order_user_info = OrderUserT::findOne(['order_id'=>$order_info->id,'user_id'=>$this->my->id,'type_id'=>$old_status_id,'status'=>0]); @@ -915,17 +852,16 @@ class InsurerController extends BaseController $order_user_info->save(); } } - $order_info->save(); + if(!$order_info->save()) { + throw new \Exception(print_r($order_info->getErrors(), true)); + } + $result['success'] = true; $tran->commit(); - } catch(\Exception $e) { $tran->rollBack(); - throw $e; + $result['msg'] = $e->getMessage(); } - - $result['success'] = true; - $result['msg'] = '保存成功'; } return $result; } @@ -1182,7 +1118,11 @@ class InsurerController extends BaseController * @return string */ public function actionOriginalMng() { - return $this->render('original-mng'); + $pay_type_items = PayTypeT::find()->all(); + + return $this->render('original-mng',[ + 'pay_type_items' => $pay_type_items + ]); } public function actionOriginalMngJson() { @@ -1191,9 +1131,7 @@ class InsurerController extends BaseController $id_man = $request->get('id_man'); $phone = $request->get('phone'); $car_no = $request->get('car_no'); - $send_date = $request->get('send_date'); - $payee_id = $request->get('payee_id'); - $payment_id = $request->get('payment_id'); + $pay_type_id = $request->get('pay_type_id'); $offset = $request->get('offset',0); $limit = $request->get('limit',10); @@ -1201,27 +1139,21 @@ class InsurerController extends BaseController ->where('status_id=5') ->orderBy('submit_date DESC, id DESC'); if($id_man != '') { - $query = $query->andWhere('id_man="'.$id_man.'"'); + $query->andWhere('id_man="'.$id_man.'"'); } if($phone != '') { - $query = $query->andWhere('link_phone="'.$phone.'"'); + $query->andWhere('car_man_phone like :phone1 or id_man_phone like :phone2 or link_man_phone like :phone3',[':phone1'=>$phone,':phone2'=>$phone,':phone3'=>$phone]); } if($car_no != '') { - $query = $query->andWhere('car_no="'.$car_no.'"'); + $query->andWhere('car_no=:car_no',[':car_no'=>$car_no]); } - if($send_date != '') { - $query = $query->andWhere('send_date="'.$send_date.'"'); + if($pay_type_id > 0) { + $query->andWhere('pay_type_id=:pay_type_id',[':pay_type_id'=>$pay_type_id]); } - if($payee_id != '') { - $query = $query->andWhere('payee_id="'.$payee_id.'"'); - } - if($payment_id != '') { - $query = $query->andWhere('payment_id="'.$payment_id.'"'); - } - $query = $query->orderBy('updated_at ASC'); + $query->orderBy('updated_at ASC'); $total = $query->count(); - $query = $query->offset($offset)->limit($limit); + $query->offset($offset)->limit($limit); $items = $query->all(); $data = []; @@ -5119,6 +5051,37 @@ class InsurerController extends BaseController } return $result; } + public function actionGiftUnSave() + { + Yii::$app->response->format = Response::FORMAT_JSON; + + $request = Yii::$app->request; + $result = array(); + $result['success'] = false; + $result['msg'] = '取消失败'; + + if ($request->isPost) { + $id = $request->post('order_id', 0); + + $order_info = OrderT::findOne($id); + + $tran = OrderT::getDb()->beginTransaction(); + try { + $order_info->gift_status = 0; + if(!$order_info->save()) { + throw new \Exception(print_r($order_info->getErrors(), true)); + } + $result['success'] = true; + $result['msg'] = '取消成功'; + + $tran->commit(); + } catch (\Exception $e) { + $tran->rollBack(); + $result['msg'] = $e->getMessage(); + } + } + return $result; + } public function actionGiftSave() { Yii::$app->response->format = Response::FORMAT_JSON; @@ -5154,6 +5117,7 @@ class InsurerController extends BaseController $zhongjigift_item = ZhongjiGiftT::findOne(['id'=>$tmp[0]]); $gift_id = $tmp[1]; $gift_item = GiftT::findOne(['id'=>$gift_id]); + $order_gift_id = 0; if($zhongjigift_item && $gift_item) { $row = new OrderGiftT(); $row->order_id = $order_info->id; @@ -5168,6 +5132,11 @@ class InsurerController extends BaseController if (!$row->save()) { throw new \Exception(print_r($row->getErrors(), true)); } + $order_gift_id = $row->id; + } + //生成礼品图片 + if($gift_item) { + $this->getGift(0, $gift_id, $order_info->car_no, $order_info, $order_gift_id); } } //礼券 @@ -5176,6 +5145,7 @@ class InsurerController extends BaseController $zhongjigift_item = ZhongjiGiftT::findOne(['id'=>$tmp[0]]); $gift_id = $tmp[1]; $gift_item = GiftT::findOne(['id'=>$gift_id]); + $order_gift_id = 0; if($zhongjigift_item && $gift_item) { $row = new OrderGiftT(); $row->order_id = $order_info->id; @@ -5190,6 +5160,11 @@ class InsurerController extends BaseController if (!$row->save()) { throw new \Exception(print_r($row->getErrors(), true)); } + $order_gift_id = $row->id; + } + //生成礼券图片 + if($gift_item) { + $this->getGift(0, $gift_id, $order_info->car_no, $order_info, $order_gift_id); } } $order_info->gift_status = 1; @@ -5207,5 +5182,143 @@ class InsurerController extends BaseController } return $result; } + public function getGift($k, $v, $car_no, $order_info, $order_gift_id) + { + $result = array(); + $result['tishi'] = true; + $result['teshu'] = false; + $gift_info = GiftT::findOne(['id' => $v]); + if($order_gift_id == 0) { + return; + } + $bianhao = ''; + $endDate = ''; + //礼券 + if ($gift_info && $gift_info->type_id == 2) { + $pinyin_arr = explode(' ', $gift_info->pinyin_name); +// dd($pinyin_arr); + $liquan_str = 'ch'; + //获取礼券拼音首字母 + foreach ($pinyin_arr as $first) { + $liquan_str .= substr($first, 0, 1); + } + $liquan_str = strtolower($liquan_str); + //获取提单日期 + $liquan_str .= date('Ymd', strtotime($order_info->print_date)); + + //获取该礼券下的最后一条记录 + $gift_use = GiftTicketTUse::find()->where(['type_id' => $v, 'status' => 1])->orderBy('created_at desc')->one(); + + //礼券的使用 + $new_gift_use = new GiftTicketTUse(); + if ($gift_use) { + $liquan_str .= sprintf("%04d", $gift_use->gift_shuzi + 1); + $new_gift_use->gift_shuzi = $gift_use->gift_shuzi + 1; + $new_gift_use->code = $liquan_str; + + } else { + $liquan_str .= sprintf("%04d", 1); + $new_gift_use->gift_shuzi = 1; + $new_gift_use->code = strtoupper($liquan_str); + } + $new_gift_use->op_id = $this->my->id; + $new_gift_use->type_id = $v; //礼券ID + $new_gift_use->input_date = date('Y-m-d H:i:s'); + $new_gift_use->car_no = $car_no; + $new_gift_use->order_id = $order_info->id; + $new_gift_use->status = 1; + $new_gift_use->end_date = $order_info->insurer1_end_date; + + if(!$new_gift_use->save()) { + throw new \Exception(print_r($new_gift_use->getErrors(), true)); + } + + //表头 + $bianhao = strtoupper($liquan_str); //转换成大写编号 + $endDate = '有效期' . $order_info->insurer1_end_date; + } + //礼品的使用 + if ($gift_info && $gift_info->type_id == 1) { + $shiwu_use = GiftTicketTUse::find()->where(['type_id' => $v, 'status' => 1])->orderBy('created_at desc')->one(); + + $new_shiwu = new GiftTicketTUse(); + + if ($shiwu_use) { + $new_shiwu->gift_shuzi = $shiwu_use->gift_shuzi + 1; + $new_shiwu->code = sprintf("%04d", $gift_use->gift_shuzi + 1); + } else { + $new_shiwu->gift_shuzi = 1; + $new_shiwu->code = sprintf("%04d", 1); + } + $new_shiwu->op_id = $this->my->id; + $new_shiwu->type_id = $v; + $new_shiwu->input_date = date('Y-m-d H:i:s'); + $new_shiwu->car_no = $car_no; + $new_shiwu->status = 1; + $new_shiwu->order_id = $order_info->id; + $new_shiwu->end_date = $order_info->insurer1_end_date; + if(!$new_shiwu->save()) { + throw new \Exception(print_r($new_shiwu->getErrors(), true)); + } + //表头 + $bianhao = ''; + $endDate = ''; + } + + $gift_name = $gift_info->name; + + //生成png文件 + $gift_src = ''; + $panduan = (object)array(); + $datetime = date('YmdHis'); + $name = md5(rand(100, 200)); + $imgstr = '@frontend/web/upload/images/'.date('Ym'); + $imgstr .= '/gift' . $name . '' . $datetime . '.png'; + FileHelper::createDirectory(dirname(str_replace('@frontend/web/', '',$imgstr))); + + //生成新的图片 + if ($gift_info && $gift_info->type_id == 1) { // 实物 + \yii\imagine\Image::thumbnail('@frontend/web/images/gift.png', 400, 252) + ->save(Yii::getAlias($imgstr), + ['quality' => 100]);//生成缩略图的质量 + //图片打水印 + \yii\imagine\Image::text('@frontend/web/images/gift.png', $bianhao, Yii::getAlias('@frontend/web/fonts/msyh.ttc'), [15, 15], ['color' => '000000', 'size' => 12]) + ->save(Yii::getAlias($imgstr)); + \yii\imagine\Image::text($imgstr, $gift_name, Yii::getAlias('@frontend/web/fonts/msyh.ttc'), [20, 50], ['color' => '000000', 'size' => 20]) + ->save(Yii::getAlias($imgstr)); + + \yii\imagine\Image::text($imgstr, $car_no, Yii::getAlias('@frontend/web/fonts/msyh.ttc'), [20, 120], ['color' => '000000', 'size' => 20]) + ->save(Yii::getAlias($imgstr)); + + $panduan = \yii\imagine\Image::text($imgstr, $endDate, Yii::getAlias('@frontend/web/fonts/msyh.ttc'), [20, 200], ['color' => '000000', 'size' => 20]) + ->save(Yii::getAlias($imgstr)); + + } elseif ($gift_info && $gift_info->type_id == 2) { + $liquanSrc = '@frontend/web' . $gift_info->original_img; + \yii\imagine\Image::thumbnail($liquanSrc, 1097, 979) + ->save(Yii::getAlias($imgstr), + ['quality' => 100]);//生成缩略图的质量 + //图片打水印 + $bianhao = '券号:' . $bianhao; + \yii\imagine\Image::text($liquanSrc, $bianhao, Yii::getAlias('@frontend/web/fonts/msyh.ttc'), [325, 85], ['color' => 'ffffff', 'size' => 14]) + ->save(Yii::getAlias($imgstr)); + + \yii\imagine\Image::text($imgstr, $car_no, Yii::getAlias('@frontend/web/fonts/msyh.ttc'), [900, 400], ['color' => 'ffffff', 'size' => 16]) + ->save(Yii::getAlias($imgstr)); + + $panduan = \yii\imagine\Image::text($imgstr, $endDate, Yii::getAlias('@frontend/web/fonts/msyh.ttc'), [850, 440], ['color' => 'ffffff', 'size' => 16]) + ->save(Yii::getAlias($imgstr)); + } + + + $gift_src = str_replace('@frontend/web', '', $imgstr); + //保存order_gift_t表里png文件地址 + + $order_gift_info = OrderGiftT::findOne(['id' => $order_gift_id]); + $order_gift_info->gift_src = $gift_src; + if(!$order_gift_info->save()) { + throw new \Exception(print_r($order_gift_info->getErrors(), true)); + } + } } diff --git a/frontend/controllers/MarketingStrategyController.php b/frontend/controllers/MarketingStrategyController.php index 91f954b..97c1867 100644 --- a/frontend/controllers/MarketingStrategyController.php +++ b/frontend/controllers/MarketingStrategyController.php @@ -521,6 +521,7 @@ class MarketingStrategyController extends UserBaseController } $result['success'] = true; $result['ids'] = join(',',$ids); + $result['num'] = count($ids); $result['celuo_id'] = $yingxiao_item->id; return $result; } @@ -569,8 +570,10 @@ class MarketingStrategyController extends UserBaseController ->where(['order_id'=>$order_id,'gift_type'=>$type]) ->all(); $order_gift_ids = []; + $order_gift_srcs = []; foreach($order_gift_items as $order_gift_item) { $order_gift_ids[] = $order_gift_item->gift_id; + $order_gift_srcs[$order_gift_item->gift_id] = $order_gift_item->gift_src; } $gifts = ZhongjiGiftT::find() ->where(['fanxian_id'=>$fanxian_id,'gift_type'=>$type]) @@ -584,6 +587,7 @@ class MarketingStrategyController extends UserBaseController foreach($tmp_row['gifts'] as $index => $gift_info) { if(in_array($gift_info['id'], $order_gift_ids)) { $tmp_row['gifts'][$index]['selected'] = 1; + $tmp_row['gifts'][$index]['gift_src'] = $order_gift_srcs[$gift_info['id']]; } else { $tmp_row['gifts'][$index]['selected'] = 0; } @@ -593,4 +597,23 @@ class MarketingStrategyController extends UserBaseController } return $result; } + + public function actionDelete() { + Yii::$app->response->format = Response::FORMAT_JSON; + $request = Yii::$app->request; + $result['success'] = false; + $result['msg'] = '删除失败'; + + $id = $request->post('id'); + + $info = ZhongjiYingxiao::findOne(['id'=>$id]); + if($info) { + $info->is_delete = 1; + $info->save(); + } + $result['success'] = true; + $result['msg'] = '删除成功'; + return $result; + } + } \ No newline at end of file diff --git a/frontend/views/appointment/all.php b/frontend/views/appointment/all.php index d9d6680..6d207de 100644 --- a/frontend/views/appointment/all.php +++ b/frontend/views/appointment/all.php @@ -17,17 +17,23 @@ use \common\libs\MyLib;