mkm/erp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

资料模块内容完善

Browse Source
This commit is contained in:
weiz 2024-05-10 16:51:19 +08:00
parent c627dcf45d
commit ee81f18076
7 changed files with 133 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/admin/lists/merchant/MerchantLists.php
View File

@ -6,6 +6,7 @@ namespace app\admin\lists\merchant;
use app\admin\lists\BaseAdminDataLists;
use app\common\model\merchant\Merchant;
use app\common\lists\ListsSearchInterface;
use think\facade\Db;
/**
@ -42,11 +43,21 @@ class MerchantLists extends BaseAdminDataLists implements ListsSearchInterface
*/
public function lists(): array
{
return Merchant::where($this->searchWhere)
->field(['mer_id', 'category_id', 'type_id', 'mer_name', 'credit_buy', 'settle_cycle', 'interest_rate', 'city_id', 'area_id', 'street_id', 'village_id', 'mer_address', 'mer_avatar', 'mark', 'commission_rate', 'service_phone','service_user', 'mer_money', 'financial_bank', 'financial_wechat', 'financial_alipay'])
return Merchant::where($this->searchWhere)->withoutField(['update_time','delete_time'])
->limit($this->limitOffset, $this->limitLength)
->order(['mer_id' => 'desc'])
->select()
->select()->each(function($data){
$province = Db::name('geo_province')->field('province_name')->where('province_code',$data['province_id'])->findOrEmpty();
$city = Db::name('geo_city')->field('city_name')->where('city_code',$data['city_id'])->findOrEmpty();
$area = Db::name('geo_area')->field('area_name')->where('area_code',$data['area_id'])->findOrEmpty();
$street = Db::name('geo_street')->field('street_name')->where('street_code',$data['street_id'])->findOrEmpty();
$village = Db::name('geo_village')->field('village_name')->where('village_code',$data['village_id'])->findOrEmpty();
$data['province_name'] = !empty($province) ? $province['province_name'] : '';
$data['city_name'] = !empty($city) ? $city['city_name'] : '';
$data['area_name'] = !empty($area) ? $area['area_name'] : '';
$data['street_name'] = !empty($street) ? $street['street_name'] : '';
$data['village_name'] = !empty($village) ? $village['village_name'] : '';
})
->toArray();
}

13
app/admin/lists/supplier/SupplierLists.php
View File

@ -4,6 +4,7 @@ namespace app\admin\lists\supplier;
use app\admin\lists\BaseAdminDataLists;
use app\common\model\goods\GoodsLabel;
use app\common\model\supplier\Supplier;
use app\common\lists\ListsSearchInterface;
@ -42,11 +43,17 @@ class SupplierLists extends BaseAdminDataLists implements ListsSearchInterface
*/
public function lists(): array
{
return Supplier::where($this->searchWhere)
->field(['id', 'category_id', 'type_id', 'mer_name', 'settle_cycle', 'interest_rate', 'sys_labels', 'mer_address', 'status', 'commission_rate', 'commission_switch', 'mer_money'])
return Supplier::where($this->searchWhere)->withoutField(['update_time','delete_time'])
->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc'])
->select()
->select()->each(function($data){
if(!empty($data['sys_labels'])){
$goodslabel = GoodsLabel::where('id','in',trim($data['sys_labels'],','))->column('name');
$data['sys_labels_text'] = implode(',',$goodslabel);
}else{
$data['sys_labels_text'] = '';
}
})
->toArray();
}

2
app/admin/lists/user/UserLists.php
View File

@ -35,7 +35,7 @@ class UserLists extends BaseAdminDataLists implements ListsExcelInterface
*/
public function lists(): array
{
$field = "id,nickname,sex,avatar,account,mobile,channel,create_time";
$field = "id,nickname,real_name,sex,avatar,account,mobile,channel,create_time";
$lists = User::withSearch($this->setSearch(), $this->params)
->limit($this->limitOffset, $this->limitLength)
->field($field)

78
app/admin/logic/merchant/MerchantLogic.php
View File

@ -29,32 +29,32 @@ class MerchantLogic extends BaseLogic
Db::startTrans();
try {
Merchant::create([
'mer_id' => $params['mer_id'],
'category_id' => $params['category_id'],
'type_id' => $params['type_id'],
'type_id' => $params['type_id'] ?? '',
'mer_name' => $params['mer_name'],
'credit_buy' => $params['credit_buy'],
'settle_cycle' => $params['settle_cycle'],
'interest_rate' => $params['interest_rate'],
'city_id' => $params['city_id'],
'area_id' => $params['area_id'],
'street_id' => $params['street_id'],
'village_id' => $params['village_id'],
'province_id' => $params['province_id'] ?? '',
'city_id' => $params['city_id'] ?? '',
'area_id' => $params['area_id'] ?? '',
'street_id' => $params['street_id'] ?? '',
'village_id' => $params['village_id'] ?? '',
'mer_address' => $params['mer_address'],
'mer_avatar' => $params['mer_avatar'],
'mer_avatar' => $params['mer_avatar'] ?? '',
'mark' => $params['mark'],
'sort' => $params['sort'],
'status' => $params['status'],
'commission_rate' => $params['commission_rate'],
'commission_switch' => $params['commission_switch'],
'long' => $params['long'],
'lat' => $params['lat'],
'commission_rate' => $params['commission_rate'] ?? '',
'commission_switch' => $params['commission_switch'] ?? '',
'long' => $params['long'] ?? '',
'lat' => $params['lat'] ?? '',
'service_phone' => $params['service_phone'],
'service_user' => $params['service_user'],
'mer_money' => $params['mer_money'],
'financial_bank' => $params['financial_bank'],
'financial_wechat' => $params['financial_wechat'],
'financial_alipay' => $params['financial_alipay']
'financial_bank' => $params['financial_bank'] ?? '',
'financial_wechat' => $params['financial_wechat'] ?? '',
'financial_alipay' => $params['financial_alipay'] ?? ''
]);
Db::commit();
@ -79,32 +79,32 @@ class MerchantLogic extends BaseLogic
Db::startTrans();
try {
Merchant::where('mer_id', $params['mer_id'])->update([
'mer_id' => $params['mer_id'],
'category_id' => $params['category_id'],
'type_id' => $params['type_id'],
'mer_name' => $params['mer_name'],
'credit_buy' => $params['credit_buy'],
'settle_cycle' => $params['settle_cycle'],
'interest_rate' => $params['interest_rate'],
'city_id' => $params['city_id'],
'area_id' => $params['area_id'],
'street_id' => $params['street_id'],
'village_id' => $params['village_id'],
'mer_address' => $params['mer_address'],
'mer_avatar' => $params['mer_avatar'],
'mark' => $params['mark'],
'sort' => $params['sort'],
'status' => $params['status'],
'commission_rate' => $params['commission_rate'],
'commission_switch' => $params['commission_switch'],
'long' => $params['long'],
'lat' => $params['lat'],
'service_phone' => $params['service_phone'],
'category_id' => $params['category_id'],
'type_id' => $params['type_id'] ?? '',
'mer_name' => $params['mer_name'],
'credit_buy' => $params['credit_buy'],
'settle_cycle' => $params['settle_cycle'],
'interest_rate' => $params['interest_rate'],
'province_id' => $params['province_id'] ?? '',
'city_id' => $params['city_id'] ?? '',
'area_id' => $params['area_id'] ?? '',
'street_id' => $params['street_id'] ?? '',
'village_id' => $params['village_id'] ?? '',
'mer_address' => $params['mer_address'],
'mer_avatar' => $params['mer_avatar'] ?? '',
'mark' => $params['mark'],
'sort' => $params['sort'],
'status' => $params['status'],
'commission_rate' => $params['commission_rate'] ?? '',
'commission_switch' => $params['commission_switch'] ?? '',
'long' => $params['long'] ?? '',
'lat' => $params['lat'] ?? '',
'service_phone' => $params['service_phone'],
'service_user' => $params['service_user'],
'mer_money' => $params['mer_money'],
'financial_bank' => $params['financial_bank'],
'financial_wechat' => $params['financial_wechat'],
'financial_alipay' => $params['financial_alipay']
'mer_money' => $params['mer_money'],
'financial_bank' => $params['financial_bank'] ?? '',
'financial_wechat' => $params['financial_wechat'] ?? '',
'financial_alipay' => $params['financial_alipay'] ?? ''
]);
Db::commit();

86
app/admin/logic/supplier/SupplierLogic.php
View File

@ -30,29 +30,30 @@ class SupplierLogic extends BaseLogic
try {
Supplier::create([
'category_id' => $params['category_id'],
'type_id' => $params['type_id'],
'type_id' => $params['type_id'] ?? '',
'mer_name' => $params['mer_name'],
'settle_cycle' => $params['settle_cycle'],
'interest_rate' => $params['interest_rate'],
'sys_labels' => $params['sys_labels'],
'city_id' => $params['city_id'],
'area_id' => $params['area_id'],
'street_id' => $params['street_id'],
'village_id' => $params['village_id'],
'mer_address' => $params['mer_address'],
'mer_avatar' => $params['mer_avatar'],
'mark' => $params['mark'],
'status' => $params['status'],
'commission_rate' => $params['commission_rate'],
'commission_switch' => $params['commission_switch'],
'long' => $params['long'],
'lat' => $params['lat'],
'sys_labels' => $params['sys_labels'] ?? '',
'province_id' => $params['province_id'] ?? '',
'city_id' => $params['city_id'] ?? '',
'area_id' => $params['area_id'] ?? '',
'street_id' => $params['street_id'] ?? '',
'village_id' => $params['village_id'] ?? '',
'mer_address' => $params['mer_address'] ?? '',
'mer_avatar' => $params['mer_avatar'] ?? '',
'mark' => $params['mark'] ?? '',
'status' => $params['status'] ?? 0,
'commission_rate' => $params['commission_rate'] ?? '',
'commission_switch' => $params['commission_switch'] ?? '',
'long' => $params['long'] ?? '',
'lat' => $params['lat'] ?? '',
'service_phone' => $params['service_phone'],
'mer_money' => $params['mer_money'],
'financial_bank' => $params['financial_bank'],
'financial_wechat' => $params['financial_wechat'],
'financial_alipay' => $params['financial_alipay'],
'financial_type' => $params['financial_type']
'financial_bank' => $params['financial_bank'] ?? '',
'financial_wechat' => $params['financial_wechat'] ?? '',
'financial_alipay' => $params['financial_alipay'] ?? '',
'financial_type' => $params['financial_type'] ?? ''
]);
Db::commit();
@ -77,30 +78,31 @@ class SupplierLogic extends BaseLogic
Db::startTrans();
try {
Supplier::where('id', $params['id'])->update([
'category_id' => $params['category_id'],
'type_id' => $params['type_id'],
'mer_name' => $params['mer_name'],
'settle_cycle' => $params['settle_cycle'],
'interest_rate' => $params['interest_rate'],
'sys_labels' => $params['sys_labels'],
'city_id' => $params['city_id'],
'area_id' => $params['area_id'],
'street_id' => $params['street_id'],
'village_id' => $params['village_id'],
'mer_address' => $params['mer_address'],
'mer_avatar' => $params['mer_avatar'],
'mark' => $params['mark'],
'status' => $params['status'],
'commission_rate' => $params['commission_rate'],
'commission_switch' => $params['commission_switch'],
'long' => $params['long'],
'lat' => $params['lat'],
'service_phone' => $params['service_phone'],
'mer_money' => $params['mer_money'],
'financial_bank' => $params['financial_bank'],
'financial_wechat' => $params['financial_wechat'],
'financial_alipay' => $params['financial_alipay'],
'financial_type' => $params['financial_type']
'category_id' => $params['category_id'],
'type_id' => $params['type_id'] ?? '',
'mer_name' => $params['mer_name'],
'settle_cycle' => $params['settle_cycle'],
'interest_rate' => $params['interest_rate'],
'sys_labels' => $params['sys_labels'] ?? '',
'province_id' => $params['province_id'] ?? '',
'city_id' => $params['city_id'] ?? '',
'area_id' => $params['area_id'] ?? '',
'street_id' => $params['street_id'] ?? '',
'village_id' => $params['village_id'] ?? '',
'mer_address' => $params['mer_address'] ?? '',
'mer_avatar' => $params['mer_avatar'] ?? '',
'mark' => $params['mark'] ?? '',
'status' => $params['status'] ?? 0,
'commission_rate' => $params['commission_rate'] ?? '',
'commission_switch' => $params['commission_switch'] ?? '',
'long' => $params['long'] ?? '',
'lat' => $params['lat'] ?? '',
'service_phone' => $params['service_phone'],
'mer_money' => $params['mer_money'],
'financial_bank' => $params['financial_bank'] ?? '',
'financial_wechat' => $params['financial_wechat'] ?? '',
'financial_alipay' => $params['financial_alipay'] ?? '',
'financial_type' => $params['financial_type'] ?? ''
]);
Db::commit();

24
app/admin/validate/merchant/MerchantValidate.php
View File

@ -20,18 +20,20 @@ class MerchantValidate extends BaseValidate
*/
protected $rule = [
'mer_id' => 'require',
'category_id' => 'require',
'category_id' => 'require|integer',
'mer_name' => 'require',
'credit_buy' => 'require',
'settle_cycle' => 'require',
'interest_rate' => 'require',
'credit_buy' => 'require|in:0,1',
'settle_cycle' => 'require|integer',
'interest_rate' => 'require|float',
'mer_address' => 'require',
'mark' => 'require',
'sort' => 'require',
'status' => 'require',
'service_phone' => 'require',
'status' => 'require|in:0,1',
'service_phone' => 'require|mobile',
'service_user' => 'require',
'mer_money' => 'require',
'mer_money' => 'require|float',
'commission_switch' => 'in:0,1',
'financial_type' => 'in:1,2,3',
];
@ -53,6 +55,8 @@ class MerchantValidate extends BaseValidate
'service_phone' => '店铺电话',
'service_user' => '店主姓名',
'mer_money' => '商户余额',
'commission_switch' => '商户手续费单独设置',
'financial_type' => '默认使用类型',
];
@ -64,7 +68,7 @@ class MerchantValidate extends BaseValidate
*/
public function sceneAdd()
{
return $this->only(['category_id','mer_name','credit_buy','settle_cycle','interest_rate','mer_address','mark','sort','status','service_phone','service_user','mer_money']);
return $this->remove('id',true);
}
@ -75,9 +79,7 @@ class MerchantValidate extends BaseValidate
* @date 2024/04/23 16:35
*/
public function sceneEdit()
{
return $this->only(['mer_id','category_id','mer_name','credit_buy','settle_cycle','interest_rate','mer_address','mark','sort','status','service_phone','service_user','mer_money']);
}
{}
/**

22
app/admin/validate/supplier/SupplierValidate.php
View File

@ -20,15 +20,17 @@ class SupplierValidate extends BaseValidate
*/
protected $rule = [
'id' => 'require',
'category_id' => 'require',
'category_id' => 'require|integer',
'mer_name' => 'require',
'settle_cycle' => 'require',
'interest_rate' => 'require',
'settle_cycle' => 'require|integer',
'interest_rate' => 'require|float',
'mer_address' => 'require',
'mark' => 'require',
'status' => 'require',
'service_phone' => 'require',
'mer_money' => 'require',
'status' => 'require|in:0,1',
'service_phone' => 'require|mobile',
'mer_money' => 'require|float',
'commission_switch' => 'in:0,1',
'financial_type' => 'integer,in:i,2,3'
];
@ -47,6 +49,8 @@ class SupplierValidate extends BaseValidate
'status' => '商户是否禁用0锁定,1正常',
'service_phone' => '店铺电话',
'mer_money' => '商户余额',
'commission_switch' => '商户手续费单独设置',
'financial_type' => '默认使用类型',
];
@ -58,7 +62,7 @@ class SupplierValidate extends BaseValidate
*/
public function sceneAdd()
{
return $this->only(['category_id','mer_name','settle_cycle','interest_rate','mer_address','mark','status','service_phone','mer_money']);
return $this->remove('id',true);
}
@ -69,9 +73,7 @@ class SupplierValidate extends BaseValidate
* @date 2024/04/27 14:33
*/
public function sceneEdit()
{
return $this->only(['id','category_id','mer_name','settle_cycle','interest_rate','mer_address','mark','status','service_phone','mer_money']);
}
{}
/**