Bladeren bron

no message

DESKTOP-70VPDLK\Administrator 7 maanden geleden
bovenliggende
commit
ad2fc21563

+ 3 - 0
.idea/phpspec.xml

@@ -17,6 +17,9 @@
       <PhpSpecSuiteConfiguration>
         <option name="myPath" value="$PROJECT_DIR$" />
       </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
     </suites>
   </component>
 </project>

+ 1 - 0
.idea/zh_food.iml

@@ -8,6 +8,7 @@
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="Tests\" />
       <sourceFolder url="file://$MODULE_DIR$/tests/Feature" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/tests/Unit" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/storage/app" />
       <excludeFolder url="file://$MODULE_DIR$/storage/framework" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/asm89/stack-cors" />

+ 62 - 0
app/Models/Main/MainMember.php

@@ -6,6 +6,68 @@ use DateTimeInterface;
 use Illuminate\Database\Eloquent\Model;
 
 
+/**
+ * App\Models\Main\MainMember
+ *
+ * @property int $id
+ * @property string $phone 手机号码
+ * @property string $nickname 昵称
+ * @property string $password 登录密码
+ * @property string $pay_pass 支付密码
+ * @property string $encrypt 加密字符串
+ * @property int $status 状态,0:关闭,1:开启
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property int $recom_id 推荐人ID
+ * @property string|null $head_img 头像
+ * @property string $invite_code 推荐码
+ * @property int $level_id 等级ID
+ * @property string|null $token_str token
+ * @property string|null $consume_money 消费金
+ * @property string|null $money 余额
+ * @property string|null $benefit_money 公益豆
+ * @property string|null $share_img 分享海报图片
+ * @property int|null $sex 性别
+ * @property string|null $code_img 推荐码
+ * @property string|null $describe 描述
+ * @property string|null $sid 长链接登陆编号
+ * @property int|null $on_line 长链接在线
+ * @property int|null $source 来源 1微信 2支付宝 3浏览器
+ * @property int|null $is_del 是否删除 0否 1是
+ * @property string|null $merge_source 账户合并了那些来源账户
+ * @property string|null $bean_money 振合豆
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember query()
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember whereBeanMoney($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember whereBenefitMoney($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember whereCodeImg($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember whereConsumeMoney($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember whereDescribe($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember whereEncrypt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember whereHeadImg($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember whereInviteCode($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember whereIsDel($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember whereLevelId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember whereMergeSource($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember whereMoney($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember whereNickname($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember whereOnLine($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember wherePassword($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember wherePayPass($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember wherePhone($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember whereRecomId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember whereSex($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember whereShareImg($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember whereSid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember whereSource($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember whereStatus($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember whereTokenStr($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMember whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
 class MainMember extends Model
 {
     protected $connection = 'mysqlTwo';

+ 22 - 0
app/Models/Main/MainMemberOpenId.php

@@ -6,6 +6,28 @@ use DateTimeInterface;
 use Illuminate\Database\Eloquent\Model;
 
 
+/**
+ * App\Models\Main\MainMemberOpenId
+ *
+ * @property int $id
+ * @property int $m_id 会员ID
+ * @property string $openid 公众号id
+ * @property string $unopenid 公众号唯一ID
+ * @property int $type 平台类型:1:微信,2:小程序,3:支付宝
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMemberOpenId newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMemberOpenId newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMemberOpenId query()
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMemberOpenId whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMemberOpenId whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMemberOpenId whereMId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMemberOpenId whereOpenid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMemberOpenId whereType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMemberOpenId whereUnopenid($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainMemberOpenId whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
 class MainMemberOpenId extends Model
 {
     protected $connection = 'mysqlTwo';

+ 143 - 0
app/Models/Main/MainShop.php

@@ -0,0 +1,143 @@
+<?php
+
+namespace App\Models\Main;
+
+use DateTimeInterface;
+use Illuminate\Database\Eloquent\Model;
+
+
+/**
+ * App\Models\Main\MainShop
+ *
+ * @property int $id
+ * @property string $shop_name 店铺名称
+ * @property string $shop_sn 店铺编号
+ * @property string $shop_phone 店铺电话
+ * @property string $shopkeeper 店主姓名
+ * @property string $shop_logo 店铺logo
+ * @property int $class_id 一级分类ID
+ * @property int $class_two_id 二级分类ID
+ * @property int $province_id 省份ID
+ * @property int $city_id 市ID
+ * @property int $area_id 区ID
+ * @property int $street_id 街道ID
+ * @property string $city_name 城市名称
+ * @property string $address 详细地址
+ * @property int $status 状态,0:待审核,1:已通过,2:已关闭
+ * @property int $type 类型:1:省代,2:市代,3:区代,4:分销商,5:店铺,6:自营店铺,7:厂家
+ * @property int $is_del 是否删除
+ * @property string $lon 经度
+ * @property string $lat 纬度
+ * @property \Illuminate\Support\Carbon|null $created_at
+ * @property \Illuminate\Support\Carbon|null $updated_at
+ * @property int $sort 排序
+ * @property string $class_name 分类名称
+ * @property float|null $shop_score 评分
+ * @property int|null $collect_num 收藏人数
+ * @property string|null $shop_code 推荐码
+ * @property string|null $shop_share_img 店铺推荐图
+ * @property int|null $m_id 绑定账户ID
+ * @property int|null $sex 性别
+ * @property int|null $recom_shop_id 推广店铺ID
+ * @property float|null $shop_money 店铺余额
+ * @property float|null $purchase_money 店铺进货金
+ * @property string $license_sn 营业执照编号
+ * @property string|null $pay_img 收款码
+ * @property int|null $goods_audit 商品是否审核1需要审核 0不用审核
+ * @property int|null $discount 店铺折扣
+ * @property string|null $accredit_ids 授权地址ids
+ * @property string|null $code_img 店铺code图片地址
+ * @property int|null $pay_voice 是否开启线下支付语音提醒 0否 1是
+ * @property int|null $order_notice 是否开启新订单通知 0否 1是
+ * @property string|null $bank_money 银联到账金额
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop query()
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereAccreditIds($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereAddress($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereAreaId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereBankMoney($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereCityId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereCityName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereClassId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereClassName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereClassTwoId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereCodeImg($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereCollectNum($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereDiscount($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereGoodsAudit($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereIsDel($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereLat($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereLicenseSn($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereLon($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereMId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereOrderNotice($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop wherePayImg($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop wherePayVoice($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereProvinceId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop wherePurchaseMoney($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereRecomShopId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereSex($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereShopCode($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereShopLogo($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereShopMoney($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereShopName($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereShopPhone($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereShopScore($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereShopShareImg($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereShopSn($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereShopkeeper($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereSort($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereStatus($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereStreetId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder|MainShop whereUpdatedAt($value)
+ * @mixin \Eloquent
+ */
+class MainShop extends Model
+{
+    protected $connection = 'mysqlTwo';
+
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'shops';
+
+    /**
+     * The primary key associated with the table.
+     *
+     * @var string
+     */
+    protected $primaryKey = 'id';
+
+    /**
+     * Indicates if the model should be timestamped.
+     *
+     * @var bool
+     */
+    public $timestamps = true;
+
+
+    /**
+     * 不能被批量赋值的属性
+     *
+     * @var array
+     */
+    protected $guarded = [ 'id', 'updated_at', 'created_at'];
+
+    /**
+     * 为数组 / JSON 序列化准备日期。
+     *
+     * @param DateTimeInterface $date
+     * @return string
+     */
+    protected function serializeDate(DateTimeInterface $date)
+    {
+        return $date->format($this->dateFormat ?: 'Y-m-d H:i:s');
+    }
+
+}

+ 2 - 0
app/Models/Member.php

@@ -35,6 +35,8 @@ use Illuminate\Database\Eloquent\Model;
  * @method static \Illuminate\Database\Eloquent\Builder|Member whereSex($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Member whereTokenStr($value)
  * @method static \Illuminate\Database\Eloquent\Builder|Member whereUpdatedAt($value)
+ * @property int|null $main_id 主系统ID
+ * @method static \Illuminate\Database\Eloquent\Builder|Member whereMainId($value)
  * @mixin \Eloquent
  */
 class Member extends Model

+ 3 - 3
app/Servers/ShopServer.php

@@ -5,6 +5,7 @@ namespace App\Servers;
 
 
 
+use App\Models\Main\MainShop;
 use Illuminate\Support\Facades\DB;
 
 /**
@@ -35,12 +36,11 @@ class ShopServer
     /**
      * 获取店铺详情
      * @param $shop_id
-     * @return string[]
+     * @return MainShop|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Eloquent\Model|\Illuminate\Database\Query\Builder|object|null
      */
     function getShopInfo($shop_id){
          //$status 1正常 2闭店
-        $info = ['shop_name' => '','shop_logo'=>'','shop_phone'=>'','status'=>1];
-        return $info;
+        return MainShop::where('id',$shop_id)->select(['id','shop_name','status','shop_logo','shop_phone','address'])->first();
     }
 
 

+ 1 - 1
config/app.php

@@ -175,7 +175,7 @@ return [
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
 // ide助手
-//        Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class,
+        Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class,
 
     ],