diff --git "a/\\" "b/\\" new file mode 100644 index 0000000..caab504 --- /dev/null +++ "b/\\" @@ -0,0 +1,5 @@ +合并分支：更新 +# 请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支 +# 合并到主题分支。 +# +# 以 '#' 开头的行将被忽略，而且空提交说明将会终止提交。 diff --git a/app/admin/controller/merchant/system/Cache.php b/app/admin/controller/merchant/system/Cache.php index 2391ed7..f737077 100644 --- a/app/admin/controller/merchant/system/Cache.php +++ b/app/admin/controller/merchant/system/Cache.php @@ -1,77 +1,77 @@ -cache = $cache; - } - - /** - * - */ - public function getKeyLst() - { - $type = $this->request->param('type',0); - $data = $this->cache->getAgreeList($type); - - return to_assign(0,'',$data); - } - - - /** - * @return mixed - */ - public function getAgree($key) - { - $allow = $this->cache->getAgreeKey(); - if (!in_array($key, $allow)) return app('json')->fail('数据不存在'); - $data = $this->cache->getResult($key); - - return to_assign(0,'success', $data); - } - - /** - * @return mixed - */ - public function saveAgree($key) - { - $allow = $this->cache->getAgreeKey(); - if (!in_array($key, $allow)) return app('json')->fail('KEY不存在'); - - $value = get_params('agree'); - $this->cache->saveCache($key, $value); - - if ($key == CacheModel::USER_PRIVACY) - $this->cache->setUserAgreement($value); - if ($key == CacheModel::USER_AGREE) - $this->cache->setUserRegister($value); - - return to_assign(0, '保存成功'); - } - - /** - * TODO 清除缓存 - * @return \think\response\Json - */ - public function clearCache() - { - return to_assign(0,'清除缓存成功'); - } +cache = $cache; + } + + /** + * + */ + public function getKeyLst() + { + $type = $this->request->param('type',0); + $data = $this->cache->getAgreeList($type); + + return to_assign(0,'',$data); + } + + + /** + * @return mixed + */ + public function getAgree($key) + { + $allow = $this->cache->getAgreeKey(); + if (!in_array($key, $allow)) return app('json')->fail('数据不存在'); + $data = $this->cache->getResult($key); + + return to_assign(0,'success', $data); + } + + /** + * @return mixed + */ + public function saveAgree($key) + { + $allow = $this->cache->getAgreeKey(); + if (!in_array($key, $allow)) return app('json')->fail('KEY不存在'); + + $value = get_params('agree'); + $this->cache->saveCache($key, $value); + + if ($key == CacheModel::USER_PRIVACY) + $this->cache->setUserAgreement($value); + if ($key == CacheModel::USER_AGREE) + $this->cache->setUserRegister($value); + + return to_assign(0, '保存成功'); + } + + /** + * TODO 清除缓存 + * @return \think\response\Json + */ + public function clearCache() + { + return to_assign(0,'清除缓存成功'); + } } \ No newline at end of file diff --git a/app/admin/controller/merchant/system/merchant/Merchant.php b/app/admin/controller/merchant/system/merchant/Merchant.php index 44d1f57..66c8241 100644 --- a/app/admin/controller/merchant/system/merchant/Merchant.php +++ b/app/admin/controller/merchant/system/merchant/Merchant.php @@ -1,30 +1,30 @@ -model = $model; - } - - /** - * TODO 创建申请 - * @param MerchantApplymentsValidate $validate - * @return \think\response\Json - * @author Qinii - * @day 6/22/21 - */ - public function create(MerchantApplymentsValidate $validate) - { - // if(!systemConfig('open_wx_sub_mch')) return app('json')->fail('未开启子商户入驻'); - $data = $this->checkParams($validate); - - } - - /** - * TODO 创建申请 - * @param MerchantApplymentsValidate $validate - * @return \think\response\Json - * @author Qinii - * @day 6/22/21 - */ - public function detail() - {} - - /** - * TODO 编辑提交 - * @param MerchantApplymentsValidate $validate - * @return \think\response\Json - * @author Qinii - * @day 6/22/21 - */ - public function update($id,MerchantApplymentsValidate $validate) - {} - - /** - * TODO 查询更新状态 - * @param MerchantApplymentsValidate $validate - * @return \think\response\Json - * @author Qinii - * @day 6/22/21 - */ - public function check() - {} - - /** - * TODO 上传图片 - * @param MerchantApplymentsValidate $validate - * @return \think\response\Json - * @author Qinii - * @day 6/22/21 - */ - public function uploadImage($field) - {} - - /** - * TODO 检验参数 - * @param MerchantApplymentsValidate $validate - * @return \think\response\Json - * @author Qinii - * @day 6/22/21 - */ - public function checkParams(MerchantApplymentsValidate $validate) - { - //'organization_cert_info', - $data = $this->request->params([ - 'organization_type','business_license_info','id_doc_type','id_card_info','id_doc_info','need_account_info','account_info','contact_info','sales_scene_info','merchant_shortname','qualifications','business_addition_pics','business_addition_desc' - ]); - - if($data['id_doc_type'] == 1){ - unset($data['id_doc_info']); - }else{ - unset($data['id_card_info']); - } - - if(in_array($data['organization_type'],['2401','2500'])){ - unset($data['business_license_info']); - } - - if(isset($data['qualifications']) && !$data['qualifications']) unset($data['qualifications']); - - if(isset($data['business_addition_pics']) && !$data['business_addition_pics']) unset($data['business_addition_pics']); - if($data['organization_type'] !== 2 && isset($data['id_card_info']['id_card_address'])){ - unset($data['id_card_info']['id_card_address']); - } - $validate->check($data); - return $data; - } +model = $model; + } + + /** + * TODO 创建申请 + * @param MerchantApplymentsValidate $validate + * @return \think\response\Json + * @author Qinii + * @day 6/22/21 + */ + public function create(MerchantApplymentsValidate $validate) + { + // if(!systemConfig('open_wx_sub_mch')) return app('json')->fail('未开启子商户入驻'); + $data = $this->checkParams($validate); + + } + + /** + * TODO 创建申请 + * @param MerchantApplymentsValidate $validate + * @return \think\response\Json + * @author Qinii + * @day 6/22/21 + */ + public function detail() + {} + + /** + * TODO 编辑提交 + * @param MerchantApplymentsValidate $validate + * @return \think\response\Json + * @author Qinii + * @day 6/22/21 + */ + public function update($id,MerchantApplymentsValidate $validate) + {} + + /** + * TODO 查询更新状态 + * @param MerchantApplymentsValidate $validate + * @return \think\response\Json + * @author Qinii + * @day 6/22/21 + */ + public function check() + {} + + /** + * TODO 上传图片 + * @param MerchantApplymentsValidate $validate + * @return \think\response\Json + * @author Qinii + * @day 6/22/21 + */ + public function uploadImage($field) + {} + + /** + * TODO 检验参数 + * @param MerchantApplymentsValidate $validate + * @return \think\response\Json + * @author Qinii + * @day 6/22/21 + */ + public function checkParams(MerchantApplymentsValidate $validate) + { + //'organization_cert_info', + $data = $this->request->params([ + 'organization_type','business_license_info','id_doc_type','id_card_info','id_doc_info','need_account_info','account_info','contact_info','sales_scene_info','merchant_shortname','qualifications','business_addition_pics','business_addition_desc' + ]); + + if($data['id_doc_type'] == 1){ + unset($data['id_doc_info']); + }else{ + unset($data['id_card_info']); + } + + if(in_array($data['organization_type'],['2401','2500'])){ + unset($data['business_license_info']); + } + + if(isset($data['qualifications']) && !$data['qualifications']) unset($data['qualifications']); + + if(isset($data['business_addition_pics']) && !$data['business_addition_pics']) unset($data['business_addition_pics']); + if($data['organization_type'] !== 2 && isset($data['id_card_info']['id_card_address'])){ + unset($data['id_card_info']['id_card_address']); + } + $validate->check($data); + return $data; + } } \ No newline at end of file diff --git a/app/admin/controller/product/StoreCategory.php b/app/admin/controller/product/StoreCategory.php index 2411dc1..ef7d927 100644 --- a/app/admin/controller/product/StoreCategory.php +++ b/app/admin/controller/product/StoreCategory.php @@ -1,56 +1,56 @@ -category = $category; - } - - protected function getMerId(UserMerchant $user) - { - // $user->isMerUser($uid, $mer_id); - } - - /** - * 平台商品分类Tree列表 - * - */ - public function getList() - { - $where['mer_id'] = 0; - $where['is_show'] = 0; - $list = $this->category->getList($where); - $list = FormatList::DropDownMenu($list); - - return to_assign(0,'', $list); - } - - /** - * 商户商品分类Tree列表 - */ - public function getStoreCategoryList(){ - $data = $this->category->getStoreCategoryList($this->mer_id, 1); - $list = FormatList::FormatCategory($data,'store_category_id', 'pid', 'cate_name','child', 'id', 'title'); - - return to_assign(0, '', $list); - } - +category = $category; + } + + protected function getMerId(UserMerchant $user) + { + // $user->isMerUser($uid, $mer_id); + } + + /** + * 平台商品分类Tree列表 + * + */ + public function getList() + { + $where['mer_id'] = 0; + $where['is_show'] = 0; + $list = $this->category->getList($where); + $list = FormatList::DropDownMenu($list); + + return to_assign(0,'', $list); + } + + /** + * 商户商品分类Tree列表 + */ + public function getStoreCategoryList(){ + $data = $this->category->getStoreCategoryList($this->mer_id, 1); + $list = FormatList::FormatCategory($data,'store_category_id', 'pid', 'cate_name','child', 'id', 'title'); + + return to_assign(0, '', $list); + } + } \ No newline at end of file diff --git a/app/admin/controller/supplychain/Merchant.php b/app/admin/controller/supplychain/Merchant.php index 9e9e74e..d77e5f8 100644 --- a/app/admin/controller/supplychain/Merchant.php +++ b/app/admin/controller/supplychain/Merchant.php @@ -129,10 +129,8 @@ class Merchant extends BaseController $total = StoreOrderModel::where($where)->count(); - $list = StoreOrderModel::with(['merchant'])->order('order_id desc')->page($params['page'])->limit($params['limit'])->select(); - foreach ($list as $k =>$v){ - $list[$k]['uid'] = Db::connect('shop')->table('eb_user')->where('uid',$v['uid'])->value('nickname'); - } + $list = StoreOrderModel::with(['merchant'])->order('order_id desc')->select(); + View::assign('url', $this->url); View::assign('list', $list); diff --git a/app/admin/model/ProductLabel.php b/app/admin/model/ProductLabel.php index 0063aff..e7d8c38 100644 --- a/app/admin/model/ProductLabel.php +++ b/app/admin/model/ProductLabel.php @@ -1,58 +1,58 @@ - -// +---------------------------------------------------------------------- -namespace app\common\model\store\product; - -use app\common\model\BaseModel; - -class ProductLabel extends BaseModel -{ - /** - * TODO - * @return string - * @author Qinii - * @day 8/17/21 - */ - public static function tablePk(): string - { - return 'product_label_id'; - } - - /** - * TODO - * @return string - * @author Qinii - * @day 8/17/21 - */ - public static function tableName(): string - { - return 'store_product_label'; - } - - public function searchMerIdAttr($query, $value) - { - $query->where('mer_id', $value); - } - - public function searchStatusAttr($query, $value) - { - $query->where('status', $value); - } - - public function searchNameAttr($query, $value) - { - $query->whereLike('name', "%{$value}%"); - } - - public function searchIsDelAttr($query, $value) - { - $query->where('is_del', $value); - } -} + +// +---------------------------------------------------------------------- +namespace app\common\model\store\product; + +use app\common\model\BaseModel; + +class ProductLabel extends BaseModel +{ + /** + * TODO + * @return string + * @author Qinii + * @day 8/17/21 + */ + public static function tablePk(): string + { + return 'product_label_id'; + } + + /** + * TODO + * @return string + * @author Qinii + * @day 8/17/21 + */ + public static function tableName(): string + { + return 'store_product_label'; + } + + public function searchMerIdAttr($query, $value) + { + $query->where('mer_id', $value); + } + + public function searchStatusAttr($query, $value) + { + $query->where('status', $value); + } + + public function searchNameAttr($query, $value) + { + $query->whereLike('name', "%{$value}%"); + } + + public function searchIsDelAttr($query, $value) + { + $query->where('is_del', $value); + } +} diff --git a/app/admin/model/store/Product.php b/app/admin/model/store/Product.php index abacbae..ec16fc5 100644 --- a/app/admin/model/store/Product.php +++ b/app/admin/model/store/Product.php @@ -1,542 +1,542 @@ - -// +---------------------------------------------------------------------- - -namespace app\common\model\store\product; - -use app\common\dao\store\StoreSeckillActiveDao; -use app\common\model\BaseModel; -use app\common\model\store\coupon\StoreCouponProduct; -use app\common\model\store\Guarantee; -use app\common\model\store\GuaranteeTemplate; -use app\common\model\store\GuaranteeValue; -use app\common\model\store\parameter\ParameterValue; -use app\common\model\store\shipping\ShippingTemplate; -use app\common\model\store\StoreBrand; -use app\common\model\store\StoreCategory; -use app\common\model\store\StoreSeckillActive; -use app\common\model\system\merchant\Merchant; -use app\common\repositories\store\StoreCategoryRepository; -use crmeb\services\VicWordService; -use Darabonba\GatewaySpi\Models\InterceptorContext\request; -use think\db\BaseQuery; -use think\facade\Db; -use think\model\concern\SoftDelete; - -/** - * TODO: - */ -class Product extends BaseModel -{ - use SoftDelete; - - - protected $deleteTime = 'is_del'; - protected $defaultSoftDelete = 0; - - - /** - * @Author:Qinii - * @Date: 2020/5/8 - * @return string - */ - public static function tablePk(): string - { - return 'product_id'; - } - - /** - * @Author:Qinii - * @Date: 2020/5/8 - * @return string - */ - public static function tableName(): string - { - return 'store_product'; - } - - /* - * ----------------------------------------------------------------------------------------------------------------- - * 属性 - * ----------------------------------------------------------------------------------------------------------------- - */ - public function getSliderImageAttr($value) - { - return $value ? explode(',',$value) : []; - } - public function getGiveCouponIdsAttr($value) - { - return $value ? explode(',',$value) : []; - } - public function getMaxExtensionAttr($value) - { - if($this->extension_type){ - $org_extension = ($this->attrValue()->order('extension_two DESC')->value('extension_one')); - } else { - $org_extension = bcmul(($this->attrValue()->order('price DESC')->value('price')) , systemConfig('extension_one_rate'),2); - } - $spreadUser = (request()->isLogin() && request()->userType() == 1 ) ? request()->userInfo() : null; - if ($spreadUser && $spreadUser->brokerage_level > 0 && $spreadUser->brokerage && $spreadUser->brokerage->extension_one_rate > 0) { - $org_extension = bcmul($org_extension, 1 + $spreadUser->brokerage->extension_one_rate, 2); - } - return $org_extension; - } - public function getMinExtensionAttr($value) - { - if($this->extension_type){ - $org_extension = ($this->attrValue()->order('extension_two ASC')->value('extension_two')); - } else { - $org_extension = bcmul(($this->attrValue()->order('price ASC')->value('price')) , systemConfig('extension_one_rate'),2); - } - $spreadUser = (request()->isLogin() && request()->userType() == 1 ) ? request()->userInfo() : null; - if ($spreadUser && $spreadUser->brokerage_level > 0 && $spreadUser->brokerage && $spreadUser->brokerage->extension_one_rate > 0) { - $org_extension = bcmul($org_extension, 1 + $spreadUser->brokerage->extension_one_rate, 2); - } - return $org_extension; - } - - public function check() - { - if(!$this || !$this->is_show || !$this->is_used || !$this->status || $this->is_del || !$this->mer_status) return false; - return true; - } - - /** - * TODO 秒杀商品结束时间 - * @return false|int - * @author Qinii - * @day 2020-08-15 - */ - public function getEndTimeAttr() - { - if($this->product_type !== 1) return true; - $day = date('Y-m-d',time()); - $_day = strtotime($day); - $end_day = strtotime($this->seckillActive['end_day']); - if($end_day >= $_day) - return strtotime($day.$this->seckillActive['end_time'].':00:00'); - if($end_day < strtotime($day)) - return strtotime(date('Y-m-d',$end_day).$this->seckillActive['end_time'].':00:00'); - } - - /** - * TODO 秒杀商品状态 - * @return array|int - * @author Qinii - * @day 2020-08-19 - */ - public function getSeckillStatusAttr() - { - if($this->product_type !== 1) return true; - $day = strtotime(date('Y-m-d',time())); - $_h = date('H',time()); - $start_day = strtotime($this->seckillActive['start_day']); - $end_day = strtotime($this->seckillActive['end_day']); - if(!$this->seckillActive) return ''; - if($this->seckillActive['status'] !== -1){ - //还未开始 - if($start_day > time() || $this->is_show !== 1)return 0; - //已结束 - if($end_day < $day) return -1; - //开始 - 结束 - if($start_day <= $day && $day <= $end_day){ - //未开始 - if($this->seckillActive['start_time'] > $_h) return 0; - //已结束 - if($this->seckillActive['end_time'] <= $_h) return -1; - //进行中 - if($this->seckillActive['start_time'] <= $_h && $this->seckillActive['end_time'] > $_h) return 1; - } - } - //已结束 - return -1; - - } - - public function getImageAttr($value) - { - if (is_int(strpos($value, 'http'))){ - return $value; - }else{ - return rtrim(systemConfig('site_url'),'/') .$value; - } - } - - public function getTopReplyAttr() - { - $res = ProductReply::where('product_id',$this->product_id)->where('is_del',0)->with(['orderProduct'])->field('reply_id,uid,nickname,merchant_reply_content,avatar,order_product_id,product_id,product_score,service_score,postage_score,comment,pics,rate,create_time') - ->order('sort DESC,create_time DESC')->limit(1)->find(); - if(!$res) return null; - if ($res['orderProduct']) - $res['sku'] = $res['orderProduct']['cart_info']['productAttr']['sku']; - unset($res['orderProduct']); - if (strlen($res['nickname']) > 1) { - $str = mb_substr($res['nickname'],0,1) . '*'; - if (strlen($res['nickname']) > 2) { - $str .= mb_substr($res['nickname'], -1,1); - } - $res['nickname'] = $str; - } - - return $res; - } - - public function getUsStatusAttr() - { - return ($this->status == 1) ? ($this->is_used == 1 ? ( $this->is_show ? 1 : 0 ) : -1) : -1; - } - - public function getGuaranteeTemplateAttr() - { - $gua = GuaranteeTemplate::where('guarantee_template_id',$this->guarantee_template_id)->where('status',1)->where('is_del',0)->find(); - if(!$gua) return []; - $guarantee_id = GuaranteeValue::where('guarantee_template_id',$this->guarantee_template_id)->column('guarantee_id'); - return Guarantee::where('guarantee_id','in',$guarantee_id)->where('status',1)->where('is_del',0)->select(); - } - - public function getMaxIntegralAttr() - { - if(systemConfig('integral_status') && merchantConfig($this->mer_id,'mer_integral_status')){ - $price = ($this->attrValue()->order('price DESC')->value('price')); - $rate = ($this->integral_rate < 0) ? merchantConfig($this->mer_id,'mer_integral_rate') : $this->integral_rate; - $rate = $rate < 0 ? $rate / 100 : 0; - return bcmul($price ,$rate,2); - } - return '0'; - } - - public function getHotRankingAttr() - { - if ($this->product_type == 0) { - $where = [ - 'is_show' => 1, - 'status' => 1, - 'is_used' => 1, - 'product_type' => 0, - 'mer_status' => 1, - 'is_gift_bag' => 0, - 'cate_id' => $this->cate_id - ]; - self::where($where)->order('sales DESC'); - } - } - - /** - * TODO 商品参数 - * @author Qinii - * @day 2022/11/24 - */ - public function getParamsAttr() - { - if(in_array($this->product_type,[0,2])) { - $product_id = $this->product_id; - } else { - $product_id = $this->old_product_id; - } - return ParameterValue::where('product_id',$product_id)->order('parameter_value_id ASC')->select(); - } - - public function getParamTempIdAttr($value) - { - return $value ? explode(',',$value) : $value; - } - - /* - * ----------------------------------------------------------------------------------------------------------------- - * 关联模型 - * ----------------------------------------------------------------------------------------------------------------- - */ - public function merCateId() - { - return $this->hasMany(ProductCate::class,'product_id','product_id')->field('product_id,mer_cate_id'); - } - public function attr() - { - return $this->hasMany(ProductAttr::class,'product_id','product_id'); - } - public function attrValue() - { - return $this->hasMany(ProductAttrValue::class,'product_id','product_id'); - } - public function oldAttrValue() - { - return $this->hasMany(ProductAttrValue::class,'product_id','old_product_id'); - } - public function content() - { - return $this->hasOne(ProductContent::class,'product_id','product_id'); - } - protected function temp() - { - return $this->hasOne(ShippingTemplate::class,'shipping_template_id','temp_id'); - } - public function storeCategory() - { - return $this->hasOne(StoreCategory::class,'store_category_id','cate_id')->field('store_category_id,cate_name'); - } - public function merchant() - { - return $this->hasOne(Merchant::class,'mer_id','mer_id')->field('is_trader,type_id,mer_id,mer_name,mer_avatar,product_score,service_score,postage_score,service_phone,care_count'); - } - public function reply() - { - return $this->hasMany(ProductReply::class,'product_id','product_id')->order('create_time DESC'); - } - public function brand() - { - return $this->hasOne(StoreBrand::class,'brand_id','brand_id')->field('brand_id,brand_name'); - } - public function seckillActive() - { - return $this->hasOne(StoreSeckillActive::class,'product_id','product_id'); - } - public function issetCoupon() - { - return $this->hasOne(StoreCouponProduct::class, 'product_id', 'product_id')->alias('A') - ->rightJoin('StoreCoupon B', 'A.coupon_id = B.coupon_id')->where(function (BaseQuery $query) { - $query->where('B.is_limited', 0)->whereOr(function (BaseQuery $query) { - $query->where('B.is_limited', 1)->where('B.remain_count', '>', 0); - }); - })->where(function (BaseQuery $query) { - $query->where('B.is_timeout', 0)->whereOr(function (BaseQuery $query) { - $time = date('Y-m-d H:i:s'); - $query->where('B.is_timeout', 1)->where('B.start_time', '<', $time)->where('B.end_time', '>', $time); - }); - })->field('A.product_id,B.*')->where('status', 1)->where('type', 1)->where('send_type', 0)->where('is_del', 0) - ->order('sort DESC,coupon_id DESC')->hidden(['is_del', 'status']); - } - public function assist() - { - return $this->hasOne(ProductAssist::class,'product_id','product_id'); - } - public function productGroup() - { - return $this->hasOne(ProductGroup::class,'product_id','product_id'); - } - public function guarantee() - { - return $this->hasOne(GuaranteeTemplate::class,'guarantee_template_id','guarantee_template_id')->where('status',1)->where('is_del',0); - } - - - /** - * TODO 是否是会员 - * @return bool - * @author Qinii - * @day 2023/1/4 - */ - public function getIsVipAttr() - { - if (request()->isLogin()) { - if (request()->userType() == 1) { - $userInfo = request()->userInfo(); - return $userInfo->is_svip ? true : false; - } else { - return true; - } - } - return false; - } - /** - * TODO 是否展示会员价 - * @return bool - * @author Qinii - * @day 2023/1/4 - */ - public function getShowSvipPriceAttr() - { - if ($this->mer_svip_status != 0 && (systemConfig('svip_show_price') != 1 || $this->is_vip) && $this->svip_price_type > 0 ) { - return true; - } - return false; - } - - - /** - * TODO 是否显示会员价等信息 - * @return array - * @author Qinii - * @day 2022/11/24 - */ - public function getShowSvipInfoAttr() - { - $res = [ - 'show_svip' => true, //是否展示会员入口 - 'is_svip' => false, //当前用户是否是会员 - 'show_svip_price' => false, //是否展示会员价 - 'save_money' => 0, //当前商品会员优化多少钱 - ]; - if ($this->product_type == 0) { - if (!systemConfig('svip_switch_status')) { - $res['show_svip'] = false; - } else { - $res['is_svip'] = $this->is_vip; - if ($this->show_svip_price) { - $res['show_svip_price'] = true; - $res['save_money'] = bcsub($this->price, $this->svip_price, 2); - } - } - } - return $res; - } - - /** - * TODO 获取会员价 - * @return int|string - * @author Qinii - * @day 2023/1/4 - */ - public function getSvipPriceAttr() - { - if ($this->product_type == 0 && $this->mer_svip_status != 0 && $this->show_svip_price) { - //默认比例 - if ($this->svip_price_type == 1) { - $rate = merchantConfig($this->mer_id,'svip_store_rate'); - $svip_store_rate = $rate > 0 ? bcdiv($rate,100,2) : 0; - $price = $this->attrValue()->order('price ASC')->value('price'); - return bcmul($price,$svip_store_rate,2); - } - //自定义 - if ($this->svip_price_type == 2) { - return $this->getData('svip_price'); - } - } - return 0; - } - - - /* - * ----------------------------------------------------------------------------------------------------------------- - * 搜索器 - * ----------------------------------------------------------------------------------------------------------------- - */ - public function searchMerCateIdAttr($query, $value) - { - $cate_ids = (StoreCategory::where('path','like','%/'.$value.'/%'))->column('store_category_id'); - $cate_ids[] = intval($value); - $product_id = ProductCate::whereIn('mer_cate_id',$cate_ids)->column('product_id'); - $query->whereIn('Product.product_id',$product_id); - } - public function searchKeywordAttr($query, $value) - { - if (!$value) return; - if (is_numeric($value)) { - $query->whereLike("Product.store_name|Product.keyword|bar_code|Product.product_id", "%{$value}%"); - } else { - $word = app()->make(VicWordService::class)->getWord($value); - $query->where(function ($query) use ($word, $value) { - foreach ($word as $item) { - $query->whereOr('Product.store_name|Product.keyword', 'LIKE', "%$item%"); - } - $query->order(Db::raw('REPLACE(Product.store_name,\'' . $value . '\',\'\')')); - }); - } - } - public function searchStatusAttr($query, $value) - { - if($value === -1){ - $query->where('Product.status', 'in',[-1,-2]); - }else { - $query->where('Product.status',$value); - } - } - public function searchCateIdAttr($query, $value) - { - $query->where('cate_id',$value); - } - public function searchCateIdsAttr($query, $value) - { - $query->whereIn('cate_id',$value); - } - public function searchIsShowAttr($query, $value) - { - $query->where('is_show',$value); - } - public function searchPidAttr($query, $value) - { - $cateId = app()->make(StoreCategoryRepository::class)->allChildren(intval($value)); - $query->whereIn('cate_id', $cateId); - } - public function searchStockAttr($query, $value) - { - $value ? $query->where('stock','<=', $value) : $query->where('stock', $value); - } - public function searchIsNewAttr($query, $value) - { - $query->where('is_new',$value); - } - public function searchPriceAttr($query, $value) - { - if(empty($value[0]) && !empty($value[1])) - $query->where('price','<',$value[1]); - if(!empty($value[0]) && empty($value[1])) - $query->where('price','>',$value[0]); - if(!empty($value[0]) && !empty($value[1])) - $query->whereBetween('price',[$value[0],$value[1]]); - } - public function searchBrandIdAttr($query, $value) - { - $query->whereIn('brand_id',$value); - } - public function searchIsGiftBagAttr($query, $value) - { - $query->where('is_gift_bag',$value); - } - public function searchIsGoodAttr($query, $value) - { - $query->where('is_good',$value); - } - public function searchIsUsedAttr($query, $value) - { - $query->where('is_used',$value); - } - public function searchProductTypeAttr($query, $value) - { - $query->where('Product.product_type',$value); - } - public function searchSeckillStatusAttr($query, $value) - { - $product_id = (new StoreSeckillActiveDao())->getStatus($value)->column('product_id'); - $query->whereIn('Product.product_id',$product_id); - } - public function searchStoreNameAttr($query, $value) - { - $query->where('Product.store_name','like','%'.$value.'%'); - } - public function searchMerStatusAttr($query, $value) - { - $query->where('mer_status',$value); - } - public function searchProductIdAttr($query, $value) - { - $query->where('Product.product_id',$value); - } - public function searchPriceOnAttr($query, $value) - { - $query->where('price','>=',$value); - } - public function searchPriceOffAttr($query, $value) - { - $query->where('price','<=',$value); - } - public function searchisFictiAttr($query, $value) - { - $query->where('type',$value); - } - public function searchGuaranteeTemplateIdAttr($query, $value) - { - $query->whereIn('guarantee_template_id',$value); - } - public function searchTempIdAttr($query, $value) - { - $query->whereIn('Product.temp_id',$value); - } -} + +// +---------------------------------------------------------------------- + +namespace app\common\model\store\product; + +use app\common\dao\store\StoreSeckillActiveDao; +use app\common\model\BaseModel; +use app\common\model\store\coupon\StoreCouponProduct; +use app\common\model\store\Guarantee; +use app\common\model\store\GuaranteeTemplate; +use app\common\model\store\GuaranteeValue; +use app\common\model\store\parameter\ParameterValue; +use app\common\model\store\shipping\ShippingTemplate; +use app\common\model\store\StoreBrand; +use app\common\model\store\StoreCategory; +use app\common\model\store\StoreSeckillActive; +use app\common\model\system\merchant\Merchant; +use app\common\repositories\store\StoreCategoryRepository; +use crmeb\services\VicWordService; +use Darabonba\GatewaySpi\Models\InterceptorContext\request; +use think\db\BaseQuery; +use think\facade\Db; +use think\model\concern\SoftDelete; + +/** + * TODO: + */ +class Product extends BaseModel +{ + use SoftDelete; + + + protected $deleteTime = 'is_del'; + protected $defaultSoftDelete = 0; + + + /** + * @Author:Qinii + * @Date: 2020/5/8 + * @return string + */ + public static function tablePk(): string + { + return 'product_id'; + } + + /** + * @Author:Qinii + * @Date: 2020/5/8 + * @return string + */ + public static function tableName(): string + { + return 'store_product'; + } + + /* + * ----------------------------------------------------------------------------------------------------------------- + * 属性 + * ----------------------------------------------------------------------------------------------------------------- + */ + public function getSliderImageAttr($value) + { + return $value ? explode(',',$value) : []; + } + public function getGiveCouponIdsAttr($value) + { + return $value ? explode(',',$value) : []; + } + public function getMaxExtensionAttr($value) + { + if($this->extension_type){ + $org_extension = ($this->attrValue()->order('extension_two DESC')->value('extension_one')); + } else { + $org_extension = bcmul(($this->attrValue()->order('price DESC')->value('price')) , systemConfig('extension_one_rate'),2); + } + $spreadUser = (request()->isLogin() && request()->userType() == 1 ) ? request()->userInfo() : null; + if ($spreadUser && $spreadUser->brokerage_level > 0 && $spreadUser->brokerage && $spreadUser->brokerage->extension_one_rate > 0) { + $org_extension = bcmul($org_extension, 1 + $spreadUser->brokerage->extension_one_rate, 2); + } + return $org_extension; + } + public function getMinExtensionAttr($value) + { + if($this->extension_type){ + $org_extension = ($this->attrValue()->order('extension_two ASC')->value('extension_two')); + } else { + $org_extension = bcmul(($this->attrValue()->order('price ASC')->value('price')) , systemConfig('extension_one_rate'),2); + } + $spreadUser = (request()->isLogin() && request()->userType() == 1 ) ? request()->userInfo() : null; + if ($spreadUser && $spreadUser->brokerage_level > 0 && $spreadUser->brokerage && $spreadUser->brokerage->extension_one_rate > 0) { + $org_extension = bcmul($org_extension, 1 + $spreadUser->brokerage->extension_one_rate, 2); + } + return $org_extension; + } + + public function check() + { + if(!$this || !$this->is_show || !$this->is_used || !$this->status || $this->is_del || !$this->mer_status) return false; + return true; + } + + /** + * TODO 秒杀商品结束时间 + * @return false|int + * @author Qinii + * @day 2020-08-15 + */ + public function getEndTimeAttr() + { + if($this->product_type !== 1) return true; + $day = date('Y-m-d',time()); + $_day = strtotime($day); + $end_day = strtotime($this->seckillActive['end_day']); + if($end_day >= $_day) + return strtotime($day.$this->seckillActive['end_time'].':00:00'); + if($end_day < strtotime($day)) + return strtotime(date('Y-m-d',$end_day).$this->seckillActive['end_time'].':00:00'); + } + + /** + * TODO 秒杀商品状态 + * @return array|int + * @author Qinii + * @day 2020-08-19 + */ + public function getSeckillStatusAttr() + { + if($this->product_type !== 1) return true; + $day = strtotime(date('Y-m-d',time())); + $_h = date('H',time()); + $start_day = strtotime($this->seckillActive['start_day']); + $end_day = strtotime($this->seckillActive['end_day']); + if(!$this->seckillActive) return ''; + if($this->seckillActive['status'] !== -1){ + //还未开始 + if($start_day > time() || $this->is_show !== 1)return 0; + //已结束 + if($end_day < $day) return -1; + //开始 - 结束 + if($start_day <= $day && $day <= $end_day){ + //未开始 + if($this->seckillActive['start_time'] > $_h) return 0; + //已结束 + if($this->seckillActive['end_time'] <= $_h) return -1; + //进行中 + if($this->seckillActive['start_time'] <= $_h && $this->seckillActive['end_time'] > $_h) return 1; + } + } + //已结束 + return -1; + + } + + public function getImageAttr($value) + { + if (is_int(strpos($value, 'http'))){ + return $value; + }else{ + return rtrim(systemConfig('site_url'),'/') .$value; + } + } + + public function getTopReplyAttr() + { + $res = ProductReply::where('product_id',$this->product_id)->where('is_del',0)->with(['orderProduct'])->field('reply_id,uid,nickname,merchant_reply_content,avatar,order_product_id,product_id,product_score,service_score,postage_score,comment,pics,rate,create_time') + ->order('sort DESC,create_time DESC')->limit(1)->find(); + if(!$res) return null; + if ($res['orderProduct']) + $res['sku'] = $res['orderProduct']['cart_info']['productAttr']['sku']; + unset($res['orderProduct']); + if (strlen($res['nickname']) > 1) { + $str = mb_substr($res['nickname'],0,1) . '*'; + if (strlen($res['nickname']) > 2) { + $str .= mb_substr($res['nickname'], -1,1); + } + $res['nickname'] = $str; + } + + return $res; + } + + public function getUsStatusAttr() + { + return ($this->status == 1) ? ($this->is_used == 1 ? ( $this->is_show ? 1 : 0 ) : -1) : -1; + } + + public function getGuaranteeTemplateAttr() + { + $gua = GuaranteeTemplate::where('guarantee_template_id',$this->guarantee_template_id)->where('status',1)->where('is_del',0)->find(); + if(!$gua) return []; + $guarantee_id = GuaranteeValue::where('guarantee_template_id',$this->guarantee_template_id)->column('guarantee_id'); + return Guarantee::where('guarantee_id','in',$guarantee_id)->where('status',1)->where('is_del',0)->select(); + } + + public function getMaxIntegralAttr() + { + if(systemConfig('integral_status') && merchantConfig($this->mer_id,'mer_integral_status')){ + $price = ($this->attrValue()->order('price DESC')->value('price')); + $rate = ($this->integral_rate < 0) ? merchantConfig($this->mer_id,'mer_integral_rate') : $this->integral_rate; + $rate = $rate < 0 ? $rate / 100 : 0; + return bcmul($price ,$rate,2); + } + return '0'; + } + + public function getHotRankingAttr() + { + if ($this->product_type == 0) { + $where = [ + 'is_show' => 1, + 'status' => 1, + 'is_used' => 1, + 'product_type' => 0, + 'mer_status' => 1, + 'is_gift_bag' => 0, + 'cate_id' => $this->cate_id + ]; + self::where($where)->order('sales DESC'); + } + } + + /** + * TODO 商品参数 + * @author Qinii + * @day 2022/11/24 + */ + public function getParamsAttr() + { + if(in_array($this->product_type,[0,2])) { + $product_id = $this->product_id; + } else { + $product_id = $this->old_product_id; + } + return ParameterValue::where('product_id',$product_id)->order('parameter_value_id ASC')->select(); + } + + public function getParamTempIdAttr($value) + { + return $value ? explode(',',$value) : $value; + } + + /* + * ----------------------------------------------------------------------------------------------------------------- + * 关联模型 + * ----------------------------------------------------------------------------------------------------------------- + */ + public function merCateId() + { + return $this->hasMany(ProductCate::class,'product_id','product_id')->field('product_id,mer_cate_id'); + } + public function attr() + { + return $this->hasMany(ProductAttr::class,'product_id','product_id'); + } + public function attrValue() + { + return $this->hasMany(ProductAttrValue::class,'product_id','product_id'); + } + public function oldAttrValue() + { + return $this->hasMany(ProductAttrValue::class,'product_id','old_product_id'); + } + public function content() + { + return $this->hasOne(ProductContent::class,'product_id','product_id'); + } + protected function temp() + { + return $this->hasOne(ShippingTemplate::class,'shipping_template_id','temp_id'); + } + public function storeCategory() + { + return $this->hasOne(StoreCategory::class,'store_category_id','cate_id')->field('store_category_id,cate_name'); + } + public function merchant() + { + return $this->hasOne(Merchant::class,'mer_id','mer_id')->field('is_trader,type_id,mer_id,mer_name,mer_avatar,product_score,service_score,postage_score,service_phone,care_count'); + } + public function reply() + { + return $this->hasMany(ProductReply::class,'product_id','product_id')->order('create_time DESC'); + } + public function brand() + { + return $this->hasOne(StoreBrand::class,'brand_id','brand_id')->field('brand_id,brand_name'); + } + public function seckillActive() + { + return $this->hasOne(StoreSeckillActive::class,'product_id','product_id'); + } + public function issetCoupon() + { + return $this->hasOne(StoreCouponProduct::class, 'product_id', 'product_id')->alias('A') + ->rightJoin('StoreCoupon B', 'A.coupon_id = B.coupon_id')->where(function (BaseQuery $query) { + $query->where('B.is_limited', 0)->whereOr(function (BaseQuery $query) { + $query->where('B.is_limited', 1)->where('B.remain_count', '>', 0); + }); + })->where(function (BaseQuery $query) { + $query->where('B.is_timeout', 0)->whereOr(function (BaseQuery $query) { + $time = date('Y-m-d H:i:s'); + $query->where('B.is_timeout', 1)->where('B.start_time', '<', $time)->where('B.end_time', '>', $time); + }); + })->field('A.product_id,B.*')->where('status', 1)->where('type', 1)->where('send_type', 0)->where('is_del', 0) + ->order('sort DESC,coupon_id DESC')->hidden(['is_del', 'status']); + } + public function assist() + { + return $this->hasOne(ProductAssist::class,'product_id','product_id'); + } + public function productGroup() + { + return $this->hasOne(ProductGroup::class,'product_id','product_id'); + } + public function guarantee() + { + return $this->hasOne(GuaranteeTemplate::class,'guarantee_template_id','guarantee_template_id')->where('status',1)->where('is_del',0); + } + + + /** + * TODO 是否是会员 + * @return bool + * @author Qinii + * @day 2023/1/4 + */ + public function getIsVipAttr() + { + if (request()->isLogin()) { + if (request()->userType() == 1) { + $userInfo = request()->userInfo(); + return $userInfo->is_svip ? true : false; + } else { + return true; + } + } + return false; + } + /** + * TODO 是否展示会员价 + * @return bool + * @author Qinii + * @day 2023/1/4 + */ + public function getShowSvipPriceAttr() + { + if ($this->mer_svip_status != 0 && (systemConfig('svip_show_price') != 1 || $this->is_vip) && $this->svip_price_type > 0 ) { + return true; + } + return false; + } + + + /** + * TODO 是否显示会员价等信息 + * @return array + * @author Qinii + * @day 2022/11/24 + */ + public function getShowSvipInfoAttr() + { + $res = [ + 'show_svip' => true, //是否展示会员入口 + 'is_svip' => false, //当前用户是否是会员 + 'show_svip_price' => false, //是否展示会员价 + 'save_money' => 0, //当前商品会员优化多少钱 + ]; + if ($this->product_type == 0) { + if (!systemConfig('svip_switch_status')) { + $res['show_svip'] = false; + } else { + $res['is_svip'] = $this->is_vip; + if ($this->show_svip_price) { + $res['show_svip_price'] = true; + $res['save_money'] = bcsub($this->price, $this->svip_price, 2); + } + } + } + return $res; + } + + /** + * TODO 获取会员价 + * @return int|string + * @author Qinii + * @day 2023/1/4 + */ + public function getSvipPriceAttr() + { + if ($this->product_type == 0 && $this->mer_svip_status != 0 && $this->show_svip_price) { + //默认比例 + if ($this->svip_price_type == 1) { + $rate = merchantConfig($this->mer_id,'svip_store_rate'); + $svip_store_rate = $rate > 0 ? bcdiv($rate,100,2) : 0; + $price = $this->attrValue()->order('price ASC')->value('price'); + return bcmul($price,$svip_store_rate,2); + } + //自定义 + if ($this->svip_price_type == 2) { + return $this->getData('svip_price'); + } + } + return 0; + } + + + /* + * ----------------------------------------------------------------------------------------------------------------- + * 搜索器 + * ----------------------------------------------------------------------------------------------------------------- + */ + public function searchMerCateIdAttr($query, $value) + { + $cate_ids = (StoreCategory::where('path','like','%/'.$value.'/%'))->column('store_category_id'); + $cate_ids[] = intval($value); + $product_id = ProductCate::whereIn('mer_cate_id',$cate_ids)->column('product_id'); + $query->whereIn('Product.product_id',$product_id); + } + public function searchKeywordAttr($query, $value) + { + if (!$value) return; + if (is_numeric($value)) { + $query->whereLike("Product.store_name|Product.keyword|bar_code|Product.product_id", "%{$value}%"); + } else { + $word = app()->make(VicWordService::class)->getWord($value); + $query->where(function ($query) use ($word, $value) { + foreach ($word as $item) { + $query->whereOr('Product.store_name|Product.keyword', 'LIKE', "%$item%"); + } + $query->order(Db::raw('REPLACE(Product.store_name,\'' . $value . '\',\'\')')); + }); + } + } + public function searchStatusAttr($query, $value) + { + if($value === -1){ + $query->where('Product.status', 'in',[-1,-2]); + }else { + $query->where('Product.status',$value); + } + } + public function searchCateIdAttr($query, $value) + { + $query->where('cate_id',$value); + } + public function searchCateIdsAttr($query, $value) + { + $query->whereIn('cate_id',$value); + } + public function searchIsShowAttr($query, $value) + { + $query->where('is_show',$value); + } + public function searchPidAttr($query, $value) + { + $cateId = app()->make(StoreCategoryRepository::class)->allChildren(intval($value)); + $query->whereIn('cate_id', $cateId); + } + public function searchStockAttr($query, $value) + { + $value ? $query->where('stock','<=', $value) : $query->where('stock', $value); + } + public function searchIsNewAttr($query, $value) + { + $query->where('is_new',$value); + } + public function searchPriceAttr($query, $value) + { + if(empty($value[0]) && !empty($value[1])) + $query->where('price','<',$value[1]); + if(!empty($value[0]) && empty($value[1])) + $query->where('price','>',$value[0]); + if(!empty($value[0]) && !empty($value[1])) + $query->whereBetween('price',[$value[0],$value[1]]); + } + public function searchBrandIdAttr($query, $value) + { + $query->whereIn('brand_id',$value); + } + public function searchIsGiftBagAttr($query, $value) + { + $query->where('is_gift_bag',$value); + } + public function searchIsGoodAttr($query, $value) + { + $query->where('is_good',$value); + } + public function searchIsUsedAttr($query, $value) + { + $query->where('is_used',$value); + } + public function searchProductTypeAttr($query, $value) + { + $query->where('Product.product_type',$value); + } + public function searchSeckillStatusAttr($query, $value) + { + $product_id = (new StoreSeckillActiveDao())->getStatus($value)->column('product_id'); + $query->whereIn('Product.product_id',$product_id); + } + public function searchStoreNameAttr($query, $value) + { + $query->where('Product.store_name','like','%'.$value.'%'); + } + public function searchMerStatusAttr($query, $value) + { + $query->where('mer_status',$value); + } + public function searchProductIdAttr($query, $value) + { + $query->where('Product.product_id',$value); + } + public function searchPriceOnAttr($query, $value) + { + $query->where('price','>=',$value); + } + public function searchPriceOffAttr($query, $value) + { + $query->where('price','<=',$value); + } + public function searchisFictiAttr($query, $value) + { + $query->where('type',$value); + } + public function searchGuaranteeTemplateIdAttr($query, $value) + { + $query->whereIn('guarantee_template_id',$value); + } + public function searchTempIdAttr($query, $value) + { + $query->whereIn('Product.temp_id',$value); + } +} diff --git a/app/admin/model/store/ProductCate.php b/app/admin/model/store/ProductCate.php index be17341..bd5cbc6 100644 --- a/app/admin/model/store/ProductCate.php +++ b/app/admin/model/store/ProductCate.php @@ -1,32 +1,32 @@ - -// +---------------------------------------------------------------------- - -namespace app\admin\model\store; - -use think\Model; -use app\admin\model\StoreCategory; - -class ProductCate extends Model -{ - protected $connection = 'shop'; - protected $table = 'eb_store_product_cate'; - - public function category() - { - return $this->hasOne(StoreCategory::class,'store_category_id','mer_cate_id')->field('store_category_id, cate_name'); - } - - public function searchProductIdAttr($query, $value) - { - $query->where('product_id',$value); - } -} + +// +---------------------------------------------------------------------- + +namespace app\admin\model\store; + +use think\Model; +use app\admin\model\StoreCategory; + +class ProductCate extends Model +{ + protected $connection = 'shop'; + protected $table = 'eb_store_product_cate'; + + public function category() + { + return $this->hasOne(StoreCategory::class,'store_category_id','mer_cate_id')->field('store_category_id, cate_name'); + } + + public function searchProductIdAttr($query, $value) + { + $query->where('product_id',$value); + } +} diff --git a/app/admin/model/store/paramter/ParameterTemplate.php b/app/admin/model/store/paramter/ParameterTemplate.php index 96eee51..0d16e07 100644 --- a/app/admin/model/store/paramter/ParameterTemplate.php +++ b/app/admin/model/store/paramter/ParameterTemplate.php @@ -1,129 +1,129 @@ -hasOne(Merchant::class,'mer_id','mer_id'); - } - - public function parameter() - { - return $this->hasMany(Parameter::class,'template_id','template_id'); - } - - public function cateId() - { - return $this->hasMany(Relevance::class,'left_id','template_id')->where('type', 'product_params_cate'); - } - - public function searchCateIdAttr($query, $value) - { - $id = Relevance::where('right_id',$value)->where('type', 'product_params_cate')->column('left_id'); - $query->where('template_id','in',$id); - } - - public function searchTemplateNameAttr($query, $value) - { - $query->whereLike('template_name',"%{$value}%"); - } - - public function searchTemplateIdsAttr($query, $value) - { - $query->whereIn('template_id',$value); - } - - public function searchMerIdAttr($query, $value) - { - $query->where('mer_id',$value); - } - - public function searchMerNameAttr($query, $value) - { - $value = Merchant::whereLike('mer_name',"%{$value}%")->coupon('mer_id'); - $query->whereIn('mer_id',$value); - } - - public function searchIsMerAttr($query, $value) - { - if ($value == 1) { - $query->where('mer_id','>',0); - } else { - $query->where('mer_id',0); - } - } - - - public function getList($where, $page, $limit) - { - $paramterModel = new Parameter(); - $query = self::getSearch($where)->field('template_id,mer_id,template_name,sort,create_time') - ->with([ - 'cateId' => function($query){ - $query->with(['category' =>function($query) { - $query->field('store_category_id,cate_name'); - }]); - }, - 'merchant' => function($query) { - $query->field('mer_id,mer_name'); - } -// 'parameter' =>function($query){ -// $query->field('parameter_id,template_id,name,value,sort')->order('sort DESC'); -// } - ]) - ->order('sort DESC,create_time DESC'); - $count = $query->count(); - $list = $query->page($page, $limit)->select(); - - return compact('count', 'list'); - } - - -/** - * TODO 搜索 - * @param $where - */ - public static function getSearch(array $where) - { - foreach ($where as $key => $item) { - if ($item !== '') { - $keyArray[] = $key; - $whereArr[$key] = $item; - } - } - - if(empty($keyArray)){ - return new self; - }else{ - return self::withSearch($keyArray, $whereArr); - } - } - +hasOne(Merchant::class,'mer_id','mer_id'); + } + + public function parameter() + { + return $this->hasMany(Parameter::class,'template_id','template_id'); + } + + public function cateId() + { + return $this->hasMany(Relevance::class,'left_id','template_id')->where('type', 'product_params_cate'); + } + + public function searchCateIdAttr($query, $value) + { + $id = Relevance::where('right_id',$value)->where('type', 'product_params_cate')->column('left_id'); + $query->where('template_id','in',$id); + } + + public function searchTemplateNameAttr($query, $value) + { + $query->whereLike('template_name',"%{$value}%"); + } + + public function searchTemplateIdsAttr($query, $value) + { + $query->whereIn('template_id',$value); + } + + public function searchMerIdAttr($query, $value) + { + $query->where('mer_id',$value); + } + + public function searchMerNameAttr($query, $value) + { + $value = Merchant::whereLike('mer_name',"%{$value}%")->coupon('mer_id'); + $query->whereIn('mer_id',$value); + } + + public function searchIsMerAttr($query, $value) + { + if ($value == 1) { + $query->where('mer_id','>',0); + } else { + $query->where('mer_id',0); + } + } + + + public function getList($where, $page, $limit) + { + $paramterModel = new Parameter(); + $query = self::getSearch($where)->field('template_id,mer_id,template_name,sort,create_time') + ->with([ + 'cateId' => function($query){ + $query->with(['category' =>function($query) { + $query->field('store_category_id,cate_name'); + }]); + }, + 'merchant' => function($query) { + $query->field('mer_id,mer_name'); + } +// 'parameter' =>function($query){ +// $query->field('parameter_id,template_id,name,value,sort')->order('sort DESC'); +// } + ]) + ->order('sort DESC,create_time DESC'); + $count = $query->count(); + $list = $query->page($page, $limit)->select(); + + return compact('count', 'list'); + } + + +/** + * TODO 搜索 + * @param $where + */ + public static function getSearch(array $where) + { + foreach ($where as $key => $item) { + if ($item !== '') { + $keyArray[] = $key; + $whereArr[$key] = $item; + } + } + + if(empty($keyArray)){ + return new self; + }else{ + return self::withSearch($keyArray, $whereArr); + } + } + } \ No newline at end of file diff --git a/app/admin/model/user/UserMerchant.php b/app/admin/model/user/UserMerchant.php index c71b6ff..7f88115 100644 --- a/app/admin/model/user/UserMerchant.php +++ b/app/admin/model/user/UserMerchant.php @@ -1,157 +1,157 @@ -hasOne(User::class, 'uid', 'uid'); - } - - /** - * @param $value - * @return array - * @author xaboy - * @day 2020-05-09 - */ - public function getLabelIdAttr($value) - { - return $value ? explode(',', $value) : []; - } - - /** - * @param $value - * @return string - * @author xaboy - * @day 2020-05-09 - */ - public function setLabelIdAttr($value) - { - return implode(',', $value); - } - - public function getAuthLabelAttr() - { - return app()->make(UserLabel::class)->whereIn('label_id', $this->label_id)->where('mer_id', $this->mer_id)->where('type', 1)->column('label_id'); - } - - - - /** - * @return string - * @author xaboy - * @day 2020/10/20 - */ - protected function getModel(): string - { - return UserMerchant::class; - } - - /** - * @param $uid - * @param $mer_id - * @return bool - * @author xaboy - * @day 2020/10/20 - */ - public function isMerUser($uid, $mer_id) - { - return $this->existsWhere(compact('uid', 'mer_id')); - } - - /** - * @param $uid - * @param $mer_id - * @return int - * @throws \think\db\exception\DbException - * @author xaboy - * @day 2020/10/20 - */ - public function updateLastTime($uid, $mer_id) - { - return UserMerchant::getDB()->where(compact('uid', 'mer_id'))->update([ - 'last_time' => date('Y-m-d H:i:s') - ]); - } - - /** - * @param array $where - * @return mixed - * @author xaboy - * @day 2020/10/20 - */ - public function search(array $where) - { - return UserMerchant::getDB()->alias('A')->leftJoin('User B', 'A.uid = B.uid') - ->when(isset($where['mer_id']) && $where['mer_id'] !== '', function ($query) use ($where) { - $query->where('A.mer_id', $where['mer_id']); - })->when(isset($where['nickname']) && $where['nickname'], function (BaseQuery $query) use ($where) { - return $query->where('B.nickname', 'like', '%' . $where['nickname'] . '%'); - })->when(isset($where['sex']) && $where['sex'] !== '', function (BaseQuery $query) use ($where) { - return $query->where('B.sex', intval($where['sex'])); - })->when(isset($where['is_promoter']) && $where['is_promoter'] !== '', function (BaseQuery $query) use ($where) { - return $query->where('B.is_promoter', $where['is_promoter']); - })->when(isset($where['uids']), function (BaseQuery $query) use ($where) { - return $query->whereIn('A.uid', $where['uids']); - })->when(isset($where['user_time_type']) && $where['user_time_type'] !== '' && $where['user_time'] != '', function ($query) use ($where) { - if ($where['user_time_type'] == 'visit') { - getModelTime($query, $where['user_time'], 'A.last_time'); - } - if ($where['user_time_type'] == 'add_time') { - getModelTime($query, $where['user_time'], 'A.create_time'); - } - })->when(isset($where['pay_count']) && $where['pay_count'] !== '', function ($query) use ($where) { - if ($where['pay_count'] == -1) { - $query->where('A.pay_num', 0); - } else { - $query->where('A.pay_num', '>', $where['pay_count']); - } - })->when(isset($where['label_id']) && $where['label_id'] !== '', function (BaseQuery $query) use ($where) { - return $query->whereRaw('CONCAT(\',\',A.label_id,\',\') LIKE \'%,' . $where['label_id'] . ',%\''); - })->when(isset($where['user_type']) && $where['user_type'] !== '', function (BaseQuery $query) use ($where) { - return $query->where('B.user_type', $where['user_type']); - })->where('A.status', 1); - } - - public function numUserIds($mer_id, $min, $max = null) - { - return UserMerchant::getDB()->where('mer_id', $mer_id)->where('pay_num', '>=', $min)->when(!is_null($max), function ($query) use ($max) { - $query->where('pay_num', '<=', $max); - })->group('uid')->column('uid'); - } - - public function priceUserIds($mer_id, $min, $max = null) - { - return UserMerchant::getDB()->where('mer_id', $mer_id)->where('pay_price', '>=', $min)->when(!is_null($max), function ($query) use ($max, $min) { - $query->where('pay_price', $min == $max ? '<=' : '<', $max); - })->group('uid')->column('uid'); - } -} +hasOne(User::class, 'uid', 'uid'); + } + + /** + * @param $value + * @return array + * @author xaboy + * @day 2020-05-09 + */ + public function getLabelIdAttr($value) + { + return $value ? explode(',', $value) : []; + } + + /** + * @param $value + * @return string + * @author xaboy + * @day 2020-05-09 + */ + public function setLabelIdAttr($value) + { + return implode(',', $value); + } + + public function getAuthLabelAttr() + { + return app()->make(UserLabel::class)->whereIn('label_id', $this->label_id)->where('mer_id', $this->mer_id)->where('type', 1)->column('label_id'); + } + + + + /** + * @return string + * @author xaboy + * @day 2020/10/20 + */ + protected function getModel(): string + { + return UserMerchant::class; + } + + /** + * @param $uid + * @param $mer_id + * @return bool + * @author xaboy + * @day 2020/10/20 + */ + public function isMerUser($uid, $mer_id) + { + return $this->existsWhere(compact('uid', 'mer_id')); + } + + /** + * @param $uid + * @param $mer_id + * @return int + * @throws \think\db\exception\DbException + * @author xaboy + * @day 2020/10/20 + */ + public function updateLastTime($uid, $mer_id) + { + return UserMerchant::getDB()->where(compact('uid', 'mer_id'))->update([ + 'last_time' => date('Y-m-d H:i:s') + ]); + } + + /** + * @param array $where + * @return mixed + * @author xaboy + * @day 2020/10/20 + */ + public function search(array $where) + { + return UserMerchant::getDB()->alias('A')->leftJoin('User B', 'A.uid = B.uid') + ->when(isset($where['mer_id']) && $where['mer_id'] !== '', function ($query) use ($where) { + $query->where('A.mer_id', $where['mer_id']); + })->when(isset($where['nickname']) && $where['nickname'], function (BaseQuery $query) use ($where) { + return $query->where('B.nickname', 'like', '%' . $where['nickname'] . '%'); + })->when(isset($where['sex']) && $where['sex'] !== '', function (BaseQuery $query) use ($where) { + return $query->where('B.sex', intval($where['sex'])); + })->when(isset($where['is_promoter']) && $where['is_promoter'] !== '', function (BaseQuery $query) use ($where) { + return $query->where('B.is_promoter', $where['is_promoter']); + })->when(isset($where['uids']), function (BaseQuery $query) use ($where) { + return $query->whereIn('A.uid', $where['uids']); + })->when(isset($where['user_time_type']) && $where['user_time_type'] !== '' && $where['user_time'] != '', function ($query) use ($where) { + if ($where['user_time_type'] == 'visit') { + getModelTime($query, $where['user_time'], 'A.last_time'); + } + if ($where['user_time_type'] == 'add_time') { + getModelTime($query, $where['user_time'], 'A.create_time'); + } + })->when(isset($where['pay_count']) && $where['pay_count'] !== '', function ($query) use ($where) { + if ($where['pay_count'] == -1) { + $query->where('A.pay_num', 0); + } else { + $query->where('A.pay_num', '>', $where['pay_count']); + } + })->when(isset($where['label_id']) && $where['label_id'] !== '', function (BaseQuery $query) use ($where) { + return $query->whereRaw('CONCAT(\',\',A.label_id,\',\') LIKE \'%,' . $where['label_id'] . ',%\''); + })->when(isset($where['user_type']) && $where['user_type'] !== '', function (BaseQuery $query) use ($where) { + return $query->where('B.user_type', $where['user_type']); + })->where('A.status', 1); + } + + public function numUserIds($mer_id, $min, $max = null) + { + return UserMerchant::getDB()->where('mer_id', $mer_id)->where('pay_num', '>=', $min)->when(!is_null($max), function ($query) use ($max) { + $query->where('pay_num', '<=', $max); + })->group('uid')->column('uid'); + } + + public function priceUserIds($mer_id, $min, $max = null) + { + return UserMerchant::getDB()->where('mer_id', $mer_id)->where('pay_price', '>=', $min)->when(!is_null($max), function ($query) use ($max, $min) { + $query->where('pay_price', $min == $max ? '<=' : '<', $max); + })->group('uid')->column('uid'); + } +} diff --git a/app/admin/route/product.php b/app/admin/route/product.php index da56436..c138d1f 100644 --- a/app/admin/route/product.php +++ b/app/admin/route/product.php @@ -1,304 +1,304 @@ -name('merchantStoreParameterTemplateLst')->option([ - '_alias' => '列表', - ]); - Route::get('detail/:id', '/detail')->name('merchantStoreParameterTemplateDetail')->option([ - '_alias' => '详情', - ]); - Route::delete('delete/:id', '/delete')->name('merchantStoreParameterTemplateDelete')->option([ - '_alias' => '删除', - ]); - Route::get('add', '/add')->name('merchantStoreParameterTemplateCreate')->option([ - '_alias' => '添加', - ]); - Route::post('update/:id', '/update')->name('merchantStoreParameterTemplateUpdate')->option([ - '_alias' => '编辑', - ]); - Route::get('select', '/select')->option([ - '_alias' => '筛选列表', - '_auth' => false, - ]); - // Route::get('temp/show', '/show')->option([ - // '_alias' => '参数', - // '_auth' => false, - // ]); - })->prefix('product.Parameter')->option([ - '_path' => '/product/params', - '_auth' => true, - ]); - - //商品 - Route::group('store/product', function () { - Route::get('config', '/config')->option([ - '_alias' => '配置', - '_auth' => false, - ]); - Route::get('lst_filter', '/getStatusFilter')->name('merchantStoreProductLstFilter')->option([ - '_alias' => '头部统计', - ]); - Route::get('lst', '/lst')->name('merchantStoreProductLst')->option([ - '_alias' => '列表', - ]); - Route::get('list', '/lst')->option([ - '_alias' => '列表', - '_auth' => false, - ]); - Route::post('create', '/create')->name('merchantStoreProductCreate')->option([ - '_alias' => '添加', - ]); - Route::get('detail/:id', '/detail')->name('merchantStoreProductDetail')->option([ - '_alias' => '详情', - ]); - Route::get('temp_key', '/temp_key')->name('merchantStoreProductTempKey')->option([ - '_alias' => '上传视频配置', - ]); - Route::post('update/:id', '/update')->name('merchantStoreProductUpdate')->option([ - '_alias' => '编辑', - ]); - Route::post('free_trial/:id', '/freeTrial')->name('merchantStoreProductFreeTrial')->option([ - '_alias' => '免审编辑', - ]); - Route::delete('delete/:id', '/delete')->name('merchantStoreProductDelete')->option([ - '_alias' => '删除', - ]); - Route::delete('destory/:id', '/destory')->name('merchantStoreProductDestory')->option([ - '_alias' => '加入回收站', - ]); - Route::post('restore/:id', '/restore')->name('merchantStoreProductRestore')->option([ - '_alias' => '恢复', - ]); - Route::post('status/:id', '/switchStatus')->name('merchantStoreProductSwitchStatus')->option([ - '_alias' => '上下架', - ]); - Route::post('batch_status', '/batchShow')->name('merchantStoreProductSwitchBatchStatus')->option([ - '_alias' => '批量上下架', - ]); - Route::post('batch_temp', '/batchTemplate')->name('merchantStoreProductSwitchBatchTemplate')->option([ - '_alias' => '批量设置运费模板', - ]); - Route::post('batch_labels', '/batchLabels')->name('merchantStoreProductSwitchBatchLabels')->option([ - '_alias' => '批量设置标签', - ]); - Route::post('batch_hot', '/batchHot')->name('merchantStoreProductSwitchBatchHot')->option([ - '_alias' => '批量设置推荐', - ]); - Route::post('batch_ext', '/batchExtension')->name('merchantStoreProductSwitchBatchExtension')->option([ - '_alias' => '批量设置推荐', - ]); - Route::post('batch_svip', '/batchSvipType')->name('merchantStoreProductSwitchBatchSvipType')->option([ - '_alias' => '批量设置会员价', - ]); - Route::post('sort/:id', '/updateSort')->name('merchantStoreProductUpdateSort')->option([ - '_alias' => '排序', - ]); - Route::post('preview', '/preview')->name('merchantStoreProductPreview')->option([ - '_alias' => '预览', - ]); - Route::post('labels/:id', '/setLabels')->name('merchantStoreProductLabels')->option([ - '_alias' => '标签', - ]); - Route::get('attr_value/:id', '/getAttrValue')->name('merchantStoreProductAttrValue')->option([ - '_alias' => '获取规格', - ]); - })->prefix('merchant.store.product.Product')->option([ - '_path' => '/product/list', - '_auth' => true, - '_append'=> [ - [ - '_name' =>'merchantUploadImage', - '_path' =>'/product/list', - '_alias' => '上传图片', - '_auth' => true, - ], - [ - '_name' =>'merchantAttachmentLst', - '_path' =>'/product/list', - '_alias' => '图片列表', - '_auth' => true, - ], - - ] - ]); - - - //商品分类 - Route::group('store/category', function () { - Route::get('create/form', '/createForm')->name('merchantStoreCategoryCreateForm')->option([ - '_alias' => '添加表单', - '_auth' => false, - '_form' => 'merchantStoreCategoryCreate', - ]); - Route::get('update/form/:id', '/updateForm')->name('merchantStoreCategoryUpdateForm')->option([ - '_alias' => '编辑表单', - '_auth' => false, - '_form' => 'merchantStoreCategoryUpdate', - ]); - Route::post('update/:id', '/update')->name('merchantStoreCategoryUpdate')->option([ - '_alias' => '编辑', - ]); - Route::get('lst', '/lst')->name('merchantStoreCategoryLst')->option([ - '_alias' => '列表', - ]); - Route::get('detail/:id', '/detail')->name('merchantStoreCategoryDtailt')->option([ - '_alias' => '详情', - ]); - Route::post('create', '/create')->name('merchantStoreCategoryCreate')->option([ - '_alias' => '添加', - ]); - Route::delete('delete/:id', '/delete')->name('merchantStoreCategoryDelete')->option([ - '_alias' => '删除', - ]); - Route::post('status/:id', '/switchStatus')->name('merchantStoreCategorySwitchStatus')->option([ - '_alias' => '修改状态', - ]); - Route::get('list', '/getList')->option([ - '_alias' => '筛选', - '_auth' => false, - ])->append(['type' => 1]); - Route::get('select', '/getStoreCategoryList')->option([ - '_alias' => '', - '_auth' => false, - ]); - Route::get('brandlist', '/BrandList')->option([ - '_alias' => '品牌列表', - '_auth' => false, - ]); - })->prefix('product.StoreCategory')->option([ - '_path' => '/product/classify', - '_auth' => true, - '_append'=> [ - [ - '_name' =>'merchantUploadImage', - '_path' =>'/product/classify', - '_alias' => '上传图片', - '_auth' => true, - ], - [ - '_name' =>'merchantAttachmentLst', - '_path' =>'/product/classify', - '_alias' => '图片列表', - '_auth' => true, - ], - ] - ]); - - //品牌分类 - Route::group('store/brand/category', function () { - Route::get('create/form', '/createForm')->name('systemStoreBrandCategoryCreateForm')->option([ - '_alias' => '添加表单', - '_auth' => false, - '_form' => 'systemStoreBrandCategoryCreate', - ]); - Route::get('update/form/:id', '/updateForm')->name('systemStoreBrandCategoryUpdateForm')->option([ - '_alias' => '编辑表单', - '_auth' => false, - '_form' => 'systemStoreBrandCategoryUpdate', - ]); - Route::post('update/:id', '/update')->name('systemStoreBrandCategoryUpdate')->option([ - '_alias' => '编辑', - ]); - Route::get('lst', '/lst')->name('systemStoreBrandCategoryLst')->option([ - '_alias' => '列表', - ]); - Route::get('detail/:id', '/detail')->name('systemStoreBrandCategoryDtailt')->option([ - '_alias' => '详情', - ]); - Route::post('create', '/create')->name('systemStoreBrandCategoryCreate')->option([ - '_alias' => '添加', - ]); - Route::delete('delete/:id', '/delete')->name('systemStoreBrandCategoryDelete')->option([ - '_alias' => '删除', - ]); - Route::post('status/:id', '/switchStatus')->name('systemStoreBrandCategorySwitchStatus')->option([ - '_alias' => '修改状态', - ]); - })->prefix('admin.store.StoreBrandCategory')->option([ - '_path' => '/product/band/brandClassify', - '_auth' => true, - ]); - - //品牌 - Route::group('store/brand', function () { - Route::get('create/form', '/createForm')->name('systemStoreBrandCreateForm')->option([ - '_alias' => '添加表单', - '_auth' => false, - '_form' => 'systemStoreBrandCreate', - ]); - Route::get('update/form/:id', '/updateForm')->name('systemStoreBrandUpdateForm')->option([ - '_alias' => '编辑表单', - '_auth' => false, - '_form' => 'systemStoreBrandUpdate', - ]); - Route::get('lst', '/lst')->name('systemStoreBrandLst')->option([ - '_alias' => '列表', - ]); - Route::post('status/:id', '/switchStatus')->name('systemStoreBrandSwithStatus')->option([ - '_alias' => '修改状态', - ]); - Route::post('create', '/create')->name('systemStoreBrandCreate')->option([ - '_alias' => '添加', - ]); - Route::post('update/:id', '/update')->name('systemStoreBrandUpdate')->option([ - '_alias' => '编辑', - ]); - Route::delete('delete/:id', '/delete')->name('systemStoreBrandDelete')->option([ - '_alias' => '删除', - ]); - })->prefix('admin.store.StoreBrand')->option([ - '_path' => '/product/band/brandList', - '_auth' => true, - ]); - - //商品标签 - Route::group('product/label', function () { - Route::get('lst', '/lst')->name('merchantStoreProductLabelLst')->option([ - '_alias' => '列表', - ]); - Route::get('create/form', '/createForm')->name('merchantStoreProductLabelCreateForm')->option([ - '_alias' => '添加表单', - '_auth' => false, - '_form' => 'merchantStoreProductLabelCreate', - ]); - Route::post('create', '/create')->name('merchantStoreProductLabelCreate')->option([ - '_alias' => '添加', - ]); - Route::get('update/:id/form', '/updateForm')->name('merchantStoreProductLabelUpdateForm')->option([ - '_alias' => '编辑表单', - '_auth' => false, - '_form' => 'merchantStoreProductLabelUpdate', - ]); - Route::post('update/:id', '/update')->name('merchantStoreProductLabelUpdate')->option([ - '_alias' => '编辑', - ]); - Route::get('detail/:id', '/detail')->name('merchantStoreProductLabelDetail')->option([ - '_alias' => '详情', - ]); - Route::delete('delete/:id', '/delete')->name('merchantStoreProductLabelDelete')->option([ - '_alias' => '删除', - ]); - Route::post('status/:id', '/switchWithStatus')->name('merchantStoreProductLabelStatus')->option([ - '_alias' => '修改状态', - ]); - Route::get('option', '/getOptions')->option([ - '_alias' => '筛选', - '_auth' => false, - ]); - - })->prefix('merchant.store.product.ProductLabel')->option([ - '_path' => '/product/label', - '_auth' => true, - ]); +name('merchantStoreParameterTemplateLst')->option([ + '_alias' => '列表', + ]); + Route::get('detail/:id', '/detail')->name('merchantStoreParameterTemplateDetail')->option([ + '_alias' => '详情', + ]); + Route::delete('delete/:id', '/delete')->name('merchantStoreParameterTemplateDelete')->option([ + '_alias' => '删除', + ]); + Route::get('add', '/add')->name('merchantStoreParameterTemplateCreate')->option([ + '_alias' => '添加', + ]); + Route::post('update/:id', '/update')->name('merchantStoreParameterTemplateUpdate')->option([ + '_alias' => '编辑', + ]); + Route::get('select', '/select')->option([ + '_alias' => '筛选列表', + '_auth' => false, + ]); + // Route::get('temp/show', '/show')->option([ + // '_alias' => '参数', + // '_auth' => false, + // ]); + })->prefix('product.Parameter')->option([ + '_path' => '/product/params', + '_auth' => true, + ]); + + //商品 + Route::group('store/product', function () { + Route::get('config', '/config')->option([ + '_alias' => '配置', + '_auth' => false, + ]); + Route::get('lst_filter', '/getStatusFilter')->name('merchantStoreProductLstFilter')->option([ + '_alias' => '头部统计', + ]); + Route::get('lst', '/lst')->name('merchantStoreProductLst')->option([ + '_alias' => '列表', + ]); + Route::get('list', '/lst')->option([ + '_alias' => '列表', + '_auth' => false, + ]); + Route::post('create', '/create')->name('merchantStoreProductCreate')->option([ + '_alias' => '添加', + ]); + Route::get('detail/:id', '/detail')->name('merchantStoreProductDetail')->option([ + '_alias' => '详情', + ]); + Route::get('temp_key', '/temp_key')->name('merchantStoreProductTempKey')->option([ + '_alias' => '上传视频配置', + ]); + Route::post('update/:id', '/update')->name('merchantStoreProductUpdate')->option([ + '_alias' => '编辑', + ]); + Route::post('free_trial/:id', '/freeTrial')->name('merchantStoreProductFreeTrial')->option([ + '_alias' => '免审编辑', + ]); + Route::delete('delete/:id', '/delete')->name('merchantStoreProductDelete')->option([ + '_alias' => '删除', + ]); + Route::delete('destory/:id', '/destory')->name('merchantStoreProductDestory')->option([ + '_alias' => '加入回收站', + ]); + Route::post('restore/:id', '/restore')->name('merchantStoreProductRestore')->option([ + '_alias' => '恢复', + ]); + Route::post('status/:id', '/switchStatus')->name('merchantStoreProductSwitchStatus')->option([ + '_alias' => '上下架', + ]); + Route::post('batch_status', '/batchShow')->name('merchantStoreProductSwitchBatchStatus')->option([ + '_alias' => '批量上下架', + ]); + Route::post('batch_temp', '/batchTemplate')->name('merchantStoreProductSwitchBatchTemplate')->option([ + '_alias' => '批量设置运费模板', + ]); + Route::post('batch_labels', '/batchLabels')->name('merchantStoreProductSwitchBatchLabels')->option([ + '_alias' => '批量设置标签', + ]); + Route::post('batch_hot', '/batchHot')->name('merchantStoreProductSwitchBatchHot')->option([ + '_alias' => '批量设置推荐', + ]); + Route::post('batch_ext', '/batchExtension')->name('merchantStoreProductSwitchBatchExtension')->option([ + '_alias' => '批量设置推荐', + ]); + Route::post('batch_svip', '/batchSvipType')->name('merchantStoreProductSwitchBatchSvipType')->option([ + '_alias' => '批量设置会员价', + ]); + Route::post('sort/:id', '/updateSort')->name('merchantStoreProductUpdateSort')->option([ + '_alias' => '排序', + ]); + Route::post('preview', '/preview')->name('merchantStoreProductPreview')->option([ + '_alias' => '预览', + ]); + Route::post('labels/:id', '/setLabels')->name('merchantStoreProductLabels')->option([ + '_alias' => '标签', + ]); + Route::get('attr_value/:id', '/getAttrValue')->name('merchantStoreProductAttrValue')->option([ + '_alias' => '获取规格', + ]); + })->prefix('merchant.store.product.Product')->option([ + '_path' => '/product/list', + '_auth' => true, + '_append'=> [ + [ + '_name' =>'merchantUploadImage', + '_path' =>'/product/list', + '_alias' => '上传图片', + '_auth' => true, + ], + [ + '_name' =>'merchantAttachmentLst', + '_path' =>'/product/list', + '_alias' => '图片列表', + '_auth' => true, + ], + + ] + ]); + + + //商品分类 + Route::group('store/category', function () { + Route::get('create/form', '/createForm')->name('merchantStoreCategoryCreateForm')->option([ + '_alias' => '添加表单', + '_auth' => false, + '_form' => 'merchantStoreCategoryCreate', + ]); + Route::get('update/form/:id', '/updateForm')->name('merchantStoreCategoryUpdateForm')->option([ + '_alias' => '编辑表单', + '_auth' => false, + '_form' => 'merchantStoreCategoryUpdate', + ]); + Route::post('update/:id', '/update')->name('merchantStoreCategoryUpdate')->option([ + '_alias' => '编辑', + ]); + Route::get('lst', '/lst')->name('merchantStoreCategoryLst')->option([ + '_alias' => '列表', + ]); + Route::get('detail/:id', '/detail')->name('merchantStoreCategoryDtailt')->option([ + '_alias' => '详情', + ]); + Route::post('create', '/create')->name('merchantStoreCategoryCreate')->option([ + '_alias' => '添加', + ]); + Route::delete('delete/:id', '/delete')->name('merchantStoreCategoryDelete')->option([ + '_alias' => '删除', + ]); + Route::post('status/:id', '/switchStatus')->name('merchantStoreCategorySwitchStatus')->option([ + '_alias' => '修改状态', + ]); + Route::get('list', '/getList')->option([ + '_alias' => '筛选', + '_auth' => false, + ])->append(['type' => 1]); + Route::get('select', '/getStoreCategoryList')->option([ + '_alias' => '', + '_auth' => false, + ]); + Route::get('brandlist', '/BrandList')->option([ + '_alias' => '品牌列表', + '_auth' => false, + ]); + })->prefix('product.StoreCategory')->option([ + '_path' => '/product/classify', + '_auth' => true, + '_append'=> [ + [ + '_name' =>'merchantUploadImage', + '_path' =>'/product/classify', + '_alias' => '上传图片', + '_auth' => true, + ], + [ + '_name' =>'merchantAttachmentLst', + '_path' =>'/product/classify', + '_alias' => '图片列表', + '_auth' => true, + ], + ] + ]); + + //品牌分类 + Route::group('store/brand/category', function () { + Route::get('create/form', '/createForm')->name('systemStoreBrandCategoryCreateForm')->option([ + '_alias' => '添加表单', + '_auth' => false, + '_form' => 'systemStoreBrandCategoryCreate', + ]); + Route::get('update/form/:id', '/updateForm')->name('systemStoreBrandCategoryUpdateForm')->option([ + '_alias' => '编辑表单', + '_auth' => false, + '_form' => 'systemStoreBrandCategoryUpdate', + ]); + Route::post('update/:id', '/update')->name('systemStoreBrandCategoryUpdate')->option([ + '_alias' => '编辑', + ]); + Route::get('lst', '/lst')->name('systemStoreBrandCategoryLst')->option([ + '_alias' => '列表', + ]); + Route::get('detail/:id', '/detail')->name('systemStoreBrandCategoryDtailt')->option([ + '_alias' => '详情', + ]); + Route::post('create', '/create')->name('systemStoreBrandCategoryCreate')->option([ + '_alias' => '添加', + ]); + Route::delete('delete/:id', '/delete')->name('systemStoreBrandCategoryDelete')->option([ + '_alias' => '删除', + ]); + Route::post('status/:id', '/switchStatus')->name('systemStoreBrandCategorySwitchStatus')->option([ + '_alias' => '修改状态', + ]); + })->prefix('admin.store.StoreBrandCategory')->option([ + '_path' => '/product/band/brandClassify', + '_auth' => true, + ]); + + //品牌 + Route::group('store/brand', function () { + Route::get('create/form', '/createForm')->name('systemStoreBrandCreateForm')->option([ + '_alias' => '添加表单', + '_auth' => false, + '_form' => 'systemStoreBrandCreate', + ]); + Route::get('update/form/:id', '/updateForm')->name('systemStoreBrandUpdateForm')->option([ + '_alias' => '编辑表单', + '_auth' => false, + '_form' => 'systemStoreBrandUpdate', + ]); + Route::get('lst', '/lst')->name('systemStoreBrandLst')->option([ + '_alias' => '列表', + ]); + Route::post('status/:id', '/switchStatus')->name('systemStoreBrandSwithStatus')->option([ + '_alias' => '修改状态', + ]); + Route::post('create', '/create')->name('systemStoreBrandCreate')->option([ + '_alias' => '添加', + ]); + Route::post('update/:id', '/update')->name('systemStoreBrandUpdate')->option([ + '_alias' => '编辑', + ]); + Route::delete('delete/:id', '/delete')->name('systemStoreBrandDelete')->option([ + '_alias' => '删除', + ]); + })->prefix('admin.store.StoreBrand')->option([ + '_path' => '/product/band/brandList', + '_auth' => true, + ]); + + //商品标签 + Route::group('product/label', function () { + Route::get('lst', '/lst')->name('merchantStoreProductLabelLst')->option([ + '_alias' => '列表', + ]); + Route::get('create/form', '/createForm')->name('merchantStoreProductLabelCreateForm')->option([ + '_alias' => '添加表单', + '_auth' => false, + '_form' => 'merchantStoreProductLabelCreate', + ]); + Route::post('create', '/create')->name('merchantStoreProductLabelCreate')->option([ + '_alias' => '添加', + ]); + Route::get('update/:id/form', '/updateForm')->name('merchantStoreProductLabelUpdateForm')->option([ + '_alias' => '编辑表单', + '_auth' => false, + '_form' => 'merchantStoreProductLabelUpdate', + ]); + Route::post('update/:id', '/update')->name('merchantStoreProductLabelUpdate')->option([ + '_alias' => '编辑', + ]); + Route::get('detail/:id', '/detail')->name('merchantStoreProductLabelDetail')->option([ + '_alias' => '详情', + ]); + Route::delete('delete/:id', '/delete')->name('merchantStoreProductLabelDelete')->option([ + '_alias' => '删除', + ]); + Route::post('status/:id', '/switchWithStatus')->name('merchantStoreProductLabelStatus')->option([ + '_alias' => '修改状态', + ]); + Route::get('option', '/getOptions')->option([ + '_alias' => '筛选', + '_auth' => false, + ]); + + })->prefix('merchant.store.product.ProductLabel')->option([ + '_path' => '/product/label', + '_auth' => true, + ]); }); \ No newline at end of file diff --git a/app/admin/view/merchant/system/merchant/intention/lst.html b/app/admin/view/merchant/system/merchant/intention/lst.html index 5971baa..52bba0f 100644 --- a/app/admin/view/merchant/system/merchant/intention/lst.html +++ b/app/admin/view/merchant/system/merchant/intention/lst.html @@ -1,453 +1,454 @@ -{extend name="common/base"/} - -{block name="body"} - - -
- - - -
- -
-
- -
- -
- -
-
- - - - - - - - - -
-
-
- -
- -
-
- -
-
-
-
- -
-
-
- -
- -
-
-
- -
-
- - - - - -
-
-
-
- -
-
- -
- -
-
-
- - - -
- -
- -
-
- -
- -
-
-
- -
-
- -
- - -
-
-
- -
- - -
-
- - - -
- - - - - - -{/block} - - -{block name="script"} - -{/block} +{extend name="common/base"/} + +{block name="body"} + + +
+ + + +
+ +
+
+ +
+ +
+ +
+
+ + + + + + + + + +
+
+
+ +
+ +
+
+ +
+
-
+
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + + + + +
+
+
+
+ +
+
+ +
+ +
+
+
+ + + +
+ +
+ +
+
+ +
+ +
+
+
+ +
+
+ +
+ + +
+
+
+ +
+ + +
+
+ + + +
+ + + + + + +{/block} + + +{block name="script"} + +{/block} \ No newline at end of file diff --git a/app/admin/view/merchant/system/merchant/intention/mark.html b/app/admin/view/merchant/system/merchant/intention/mark.html index c40c987..62f2b0b 100644 --- a/app/admin/view/merchant/system/merchant/intention/mark.html +++ b/app/admin/view/merchant/system/merchant/intention/mark.html @@ -1,57 +1,56 @@ -{extend name="common/base"/} -{block name="style"} - -{/block} - -{block name="body"} -
-

备注

- - - - -
- - -
-
- - -
-
-{/block} - - - -{block name="script"} - - -{/block} +{extend name="common/base"/} +{block name="style"} + +{/block} + +{block name="body"} +
+

备注

+ + + + +
+ + +
+
+ + +
+
+{/block} + + + +{block name="script"} + + +{/block} \ No newline at end of file diff --git a/app/admin/view/merchant/system/merchant/intention/status.html b/app/admin/view/merchant/system/merchant/intention/status.html index e64cc93..0a8a71b 100644 --- a/app/admin/view/merchant/system/merchant/intention/status.html +++ b/app/admin/view/merchant/system/merchant/intention/status.html @@ -1,66 +1,66 @@ -{extend name="common/base" /} - -{block name="body"} -
-

审核状态

- - - - - - - - - - - - -
审核状态* - - -
创建商户* - - - -
- -
- - - -
-
-{/block} - - - -{block name="script"} - -{/block} +{extend name="common/base" /} + +{block name="body"} +
+

审核状态

+ + + + + + + + + + + + +
审核状态* + + +
创建商户* + + + +
+ +
+ + + +
+
+{/block} + + + +{block name="script"} + +{/block} \ No newline at end of file diff --git a/app/admin/view/merchant/system/merchant/margin/edit.html b/app/admin/view/merchant/system/merchant/margin/edit.html index 0220175..dc722a9 100644 --- a/app/admin/view/merchant/system/merchant/margin/edit.html +++ b/app/admin/view/merchant/system/merchant/margin/edit.html @@ -1,116 +1,116 @@ -{extend name="common/base"/} -{block name="style"} - -{/block} - -{block name="body"} -
-

保证金扣费

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
商户名称* - - -
商户ID - -
商户剩余保证金 - - - 单位：元
保证金扣除金额* - - 单位：元
保证金扣除原因* - -
- -
- - -
-
-{/block} - - - -{block name="script"} - - - -{/block} - +{extend name="common/base"/} +{block name="style"} + +{/block} + +{block name="body"} +
+

保证金扣费

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
商户名称* + + +
商户ID + +
商户剩余保证金 + + + 单位：元
保证金扣除金额* + + 单位：元
保证金扣除原因* + +
+ +
+ + +
+
+{/block} + + + +{block name="script"} + + + +{/block} + diff --git a/app/admin/view/merchant/system/merchant/margin/list.html b/app/admin/view/merchant/system/merchant/margin/list.html index 2e94988..16ddefb 100644 --- a/app/admin/view/merchant/system/merchant/margin/list.html +++ b/app/admin/view/merchant/system/merchant/margin/list.html @@ -15,29 +15,29 @@
-
- - - - - - - +
+ + + + + + + + +
-
+
- +
-
- +
@@ -46,14 +46,14 @@
-
+
-
- + - +
@@ -62,10 +62,10 @@
- - - + +
@@ -75,33 +75,29 @@
-
+
- - - - - - + {volist name="category" key="k" id="vo"} + + {/volist}
-
+
- - - - - - + {volist name="type" key="k" id="vo"} + + {/volist}
@@ -116,13 +112,10 @@
- - - - - - + +
@@ -134,19 +127,18 @@