Browse Source

懒族改为链街

dev
李可松 4 years ago
parent
commit
096e7edbfa
  1. 2
      app/Constants/v3/Tabs.php
  2. 4
      app/Controller/PaymentController.php
  3. 6
      app/Controller/v3/CouponController.php
  4. 6
      app/Controller/v3/HomeController.php
  5. 2
      app/JsonRpc/AlismsService.php
  6. 2
      app/JsonRpc/SmsServiceInterface.php
  7. 2
      app/Service/DeviceServiceImp.php
  8. 2
      app/Service/FeiePrintService.php
  9. 2
      app/Service/MqttSpeakerService.php
  10. 6
      app/Service/ServiceEvaluateService.php
  11. 2
      app/Service/SmsAliService.php
  12. 2
      app/Service/v3/Implementations/DeviceService.php
  13. 2
      app/Service/v3/Implementations/FeiePrintService.php
  14. 2
      app/Service/v3/Implementations/MqttService.php
  15. 2
      app/Service/v3/Implementations/PaymentService.php
  16. 6
      app/Service/v3/Implementations/ServiceEvaluateService.php
  17. 4
      app/Service/v3/Implementations/TabsService.php
  18. 2
      app/Service/v3/Implementations/UserCenterBlockService.php
  19. 3651
      composer.lock

2
app/Constants/v3/Tabs.php

@ -16,7 +16,7 @@ class Tabs extends AbstractConstants
const APPLET_INDEX_RECOMMEND = 'applet_index_recommend'; const APPLET_INDEX_RECOMMEND = 'applet_index_recommend';
/** /**
* @Message("小程序首页懒族上新")
* @Message("小程序首页链街上新")
*/ */
const APPLET_INDEX_NEW = 'applet_index_new'; const APPLET_INDEX_NEW = 'applet_index_new';

4
app/Controller/PaymentController.php

@ -62,7 +62,7 @@ class PaymentController extends BaseController
} }
$result = $app->order->unify([ $result = $app->order->unify([
'body' => '懒族生活 - 外卖下单',
'body' => '链街生活 - 外卖下单',
'out_trade_no' => $orderMain->global_order_id, 'out_trade_no' => $orderMain->global_order_id,
'total_fee' => $payMoney, 'total_fee' => $payMoney,
'notify_url' => config('site_host') . '/wechat/notify/wxminionline', 'notify_url' => config('site_host') . '/wechat/notify/wxminionline',
@ -102,7 +102,7 @@ class PaymentController extends BaseController
} }
$result = $app->order->unify([ $result = $app->order->unify([
'body' => '懒族生活 - 当面支付',
'body' => '链街生活 - 当面支付',
'out_trade_no' => $orderMain->global_order_id, 'out_trade_no' => $orderMain->global_order_id,
'total_fee' => bcmul(floatval($orderMain->money), 100, 0), 'total_fee' => bcmul(floatval($orderMain->money), 100, 0),
'notify_url' => config('site_host') . '/wechat/notify/wxminioffline', 'notify_url' => config('site_host') . '/wechat/notify/wxminioffline',

6
app/Controller/v3/CouponController.php

@ -93,7 +93,7 @@ class CouponController extends BaseController
[ [
'status' => 'error', 'status' => 'error',
'message' => '不是新用户无法领券', 'message' => '不是新用户无法领券',
'text'=>'关注懒族菜市微信公众号,更多精彩活动一手掌握!'
'text'=>'关注链街菜场微信公众号,更多精彩活动一手掌握!'
] ]
); );
} }
@ -103,7 +103,7 @@ class CouponController extends BaseController
[ [
'status' => 'error', 'status' => 'error',
'message' => '未满足领取条件', 'message' => '未满足领取条件',
'text'=>'关注懒族菜市微信公众号,更多精彩活动一手掌握!'
'text'=>'关注链街菜场微信公众号,更多精彩活动一手掌握!'
] ]
); );
} }
@ -128,4 +128,4 @@ class CouponController extends BaseController
throw new ErrorCodeException(ErrorCode::COUPON_RECEIVE_FAILURE); throw new ErrorCodeException(ErrorCode::COUPON_RECEIVE_FAILURE);
} }
} }
}
}

6
app/Controller/v3/HomeController.php

@ -320,7 +320,7 @@ class HomeController extends BaseController
} }
/** /**
* 关于懒族
* 关于链街
* about lanzu * about lanzu
*/ */
public function aboutLanzu() public function aboutLanzu()
@ -328,8 +328,8 @@ class HomeController extends BaseController
$data = [ $data = [
[ [
'id' => 1, 'id' => 1,
'title' => '关于懒族',
'sub_title' => '懒族生活678',
'title' => '关于链街',
'sub_title' => '链街生活678',
'path' => 'https://mp.weixin.qq.com/s/tGKIILpL2extoeKXgYNYIA', 'path' => 'https://mp.weixin.qq.com/s/tGKIILpL2extoeKXgYNYIA',
'path_type' => 'webview' 'path_type' => 'webview'
], ],

2
app/JsonRpc/AlismsService.php

@ -27,7 +27,7 @@ class AlismsService implements SmsServiceInterface
* @param string $signName * @param string $signName
* @return array|bool * @return array|bool
*/ */
public function sent($phone, $template, $templateParams, $signName = '懒族生活')
public function sent($phone, $template, $templateParams, $signName = '链街生活')
{ {
return $this->smsAliSendService->do($phone, $template, $templateParams,$signName); return $this->smsAliSendService->do($phone, $template, $templateParams,$signName);
} }

2
app/JsonRpc/SmsServiceInterface.php

@ -13,5 +13,5 @@ interface SmsServiceInterface
* @param string $signName * @param string $signName
* @return mixed * @return mixed
*/ */
public function sent($phone, $template, $templateParams, $signName='懒族生活');
public function sent($phone, $template, $templateParams, $signName='链街生活');
} }

2
app/Service/DeviceServiceImp.php

@ -112,7 +112,7 @@ class DeviceServiceImp implements DeviceServiceInterface
->where(['store_id' => $order['store_id'], 'is_bind' => SpeakerDevic::IS_BIND_YES]) ->where(['store_id' => $order['store_id'], 'is_bind' => SpeakerDevic::IS_BIND_YES])
->get() ->get()
->toArray(); ->toArray();
$msg = $order['type']==1 ? "{\"msg\":\"您有新的懒族外卖订单\"}" : "{\"msg\":\"微信到账".floatval($order['money'])."\"}";
$msg = $order['type']==1 ? "{\"msg\":\"您有新的链街外卖订单\"}" : "{\"msg\":\"微信到账".floatval($order['money'])."\"}";
foreach ($device_names as $key => $dev_name) { foreach ($device_names as $key => $dev_name) {
$this->IOTService->pub($dev_name['device_name'], $msg); $this->IOTService->pub($dev_name['device_name'], $msg);
} }

2
app/Service/FeiePrintService.php

@ -81,7 +81,7 @@ class FeiePrintService implements FeiePrintServiceInterface
protected function printFormat($arr, $A, $B, $C, $D) protected function printFormat($arr, $A, $B, $C, $D)
{ {
$orderInfo = '<CB>懒族生活</CB><BR>';
$orderInfo = '<CB>链街生活</CB><BR>';
$orderInfo .= '名称 单价 数量 金额<BR>'; $orderInfo .= '名称 单价 数量 金额<BR>';
$orderInfo .= '--------------------------------<BR>'; $orderInfo .= '--------------------------------<BR>';
$shopname = ""; $shopname = "";

2
app/Service/MqttSpeakerService.php

@ -30,7 +30,7 @@ class MqttSpeakerService implements MqttServiceInterface
// 循环发送 // 循环发送
foreach ($orders as $k => &$order) { foreach ($orders as $k => &$order) {
$order['template'] = $order['type']==1 ? "您有新的懒族外卖订单" : "微信到账".floatval($order['money'])."";
$order['template'] = $order['type']==1 ? "您有新的链街外卖订单" : "微信到账".floatval($order['money'])."";
// 获取终端ID // 获取终端ID
$order['to_client_id'] = Store::query()->where(['id' => $order['store_id']])->value('loudspeaker_imei'); $order['to_client_id'] = Store::query()->where(['id' => $order['store_id']])->value('loudspeaker_imei');
// 发布订阅消息 // 发布订阅消息

6
app/Service/ServiceEvaluateService.php

@ -88,9 +88,9 @@ class ServiceEvaluateService implements ServiceEvaluateServiceInterface
$data->quick_evaluate_title = $obj1; $data->quick_evaluate_title = $obj1;
//获取快速评论内容 //获取快速评论内容
$obj2 = (object)null; $obj2 = (object)null;
$obj2->content1 = '懒族生活的小伙伴服务态度热情,非常耐心的解决我提出的要求。';
$obj2->content2 = '清洗工作非常的细致入微,很干净!回家可以直接做菜了,很方便!非常感谢懒族小伙伴的服务。';
$obj2->content3 = '懒族生活服务站的小伙伴聊天时就像朋友一样,亲和力很强。以后买菜就找他们啦!';
$obj2->content1 = '链街生活的小伙伴服务态度热情,非常耐心的解决我提出的要求。';
$obj2->content2 = '清洗工作非常的细致入微,很干净!回家可以直接做菜了,很方便!非常感谢链街小伙伴的服务。';
$obj2->content3 = '链街生活服务站的小伙伴聊天时就像朋友一样,亲和力很强。以后买菜就找他们啦!';
$data->quick_evaluate_content = $obj2; $data->quick_evaluate_content = $obj2;
//获取评论长度限制参数 //获取评论长度限制参数
$obj3 = (object)null; $obj3 = (object)null;

2
app/Service/SmsAliService.php

@ -20,7 +20,7 @@ class SmsAliService implements SmsServiceInterface
*/ */
protected $log; protected $log;
public function send($phone, $template, $templateParams, $signName='懒族生活')
public function send($phone, $template, $templateParams, $signName='链街生活')
{ {
$alisms = config('alisms'); $alisms = config('alisms');

2
app/Service/v3/Implementations/DeviceService.php

@ -116,7 +116,7 @@ class DeviceService implements DeviceServiceInterface
->where(['store_id' => $order['store_id'], 'is_bind' => SpeakerDevic::IS_BIND_YES]) ->where(['store_id' => $order['store_id'], 'is_bind' => SpeakerDevic::IS_BIND_YES])
->get() ->get()
->toArray(); ->toArray();
$msg = $order['order_main']['type'] == 1 ? "{\"msg\":\"懒族生活提示您:您有新的懒族外卖订单\"}" : "{\"msg\":\"微信到账".floatval($order['money'])."\"}";
$msg = $order['order_main']['type'] == 1 ? "{\"msg\":\"链街生活提示您:您有新的链街外卖订单\"}" : "{\"msg\":\"微信到账".floatval($order['money'])."\"}";
foreach ($device_names as $key => $dev_name) { foreach ($device_names as $key => $dev_name) {
$this->IOTService->pub($dev_name['device_name'], $msg); $this->IOTService->pub($dev_name['device_name'], $msg);
} }

2
app/Service/v3/Implementations/FeiePrintService.php

@ -131,7 +131,7 @@ class FeiePrintService implements FeiePrintServiceInterface
protected function printFormat($arr, $A, $B, $C, $D) protected function printFormat($arr, $A, $B, $C, $D)
{ {
$orderInfo = '<CB>懒族菜市</CB><BR>';
$orderInfo = '<CB>链街菜场</CB><BR>';
$orderInfo .= '数量 名称 单价 金额<BR>'; $orderInfo .= '数量 名称 单价 金额<BR>';
$orderInfo .= '--------------------------------<BR>'; $orderInfo .= '--------------------------------<BR>';
//$shopnum 当前为第几个店铺 //$shopnum 当前为第几个店铺

2
app/Service/v3/Implementations/MqttService.php

@ -31,7 +31,7 @@ class MqttService implements MqttServiceInterface
// 循环发送 // 循环发送
foreach ($orders as $k => &$order) { foreach ($orders as $k => &$order) {
$template = $order->orderMain->type == OrderType::ONLINE ? "懒族生活提示您:您有新的懒族外卖订单" : "微信到账".floatval($order->money)."";
$template = $order->orderMain->type == OrderType::ONLINE ? "链街生活提示您:您有新的链街外卖订单" : "微信到账".floatval($order->money)."";
// 获取终端ID // 获取终端ID
$to_client_id = Store::query()->where(['id' => $order->store_id])->value('loudspeaker_imei'); $to_client_id = Store::query()->where(['id' => $order->store_id])->value('loudspeaker_imei');
// 发布订阅消息 // 发布订阅消息

2
app/Service/v3/Implementations/PaymentService.php

@ -66,7 +66,7 @@ class PaymentService implements PaymentServiceInterface
$user = User::select('openid')->find($userId); $user = User::select('openid')->find($userId);
$result = $app->order->unify([ $result = $app->order->unify([
'body' => '懒族生活',
'body' => '链街生活',
'out_trade_no' => $orderMain->global_order_id, 'out_trade_no' => $orderMain->global_order_id,
'total_fee' => $payMoney, 'total_fee' => $payMoney,
'notify_url' => $notifyUrl, 'notify_url' => $notifyUrl,

6
app/Service/v3/Implementations/ServiceEvaluateService.php

@ -87,9 +87,9 @@ class ServiceEvaluateService implements ServiceEvaluateServiceInterface
$data->quick_evaluate_title = $obj1; $data->quick_evaluate_title = $obj1;
//获取快速评论内容 //获取快速评论内容
$obj2 = (object)null; $obj2 = (object)null;
$obj2->content1 = '懒族生活的小伙伴服务态度热情,非常耐心的解决我提出的要求。';
$obj2->content2 = '清洗工作非常的细致入微,很干净!回家可以直接做菜了,很方便!非常感谢懒族小伙伴的服务。';
$obj2->content3 = '懒族生活服务站的小伙伴聊天时就像朋友一样,亲和力很强。以后买菜就找他们啦!';
$obj2->content1 = '链街生活的小伙伴服务态度热情,非常耐心的解决我提出的要求。';
$obj2->content2 = '清洗工作非常的细致入微,很干净!回家可以直接做菜了,很方便!非常感谢链街小伙伴的服务。';
$obj2->content3 = '链街生活服务站的小伙伴聊天时就像朋友一样,亲和力很强。以后买菜就找他们啦!';
$data->quick_evaluate_content = $obj2; $data->quick_evaluate_content = $obj2;
//获取评论长度限制参数 //获取评论长度限制参数
$obj3 = (object)null; $obj3 = (object)null;

4
app/Service/v3/Implementations/TabsService.php

@ -35,7 +35,7 @@ class TabsService implements TabsServiceInterface
['tab' => Tabs::APPLET_INDEX_STORE, 'title' => '推荐店铺', 'subtitle' => '物美价廉', 'badge' => '', 'bg_color' => '#FF0000', 'font_color' => '#FFFFFF'], ['tab' => Tabs::APPLET_INDEX_STORE, 'title' => '推荐店铺', 'subtitle' => '物美价廉', 'badge' => '', 'bg_color' => '#FF0000', 'font_color' => '#FFFFFF'],
['tab' => Tabs::APPLET_INDEX_RECOMMEND, 'title' => '猜你喜欢', 'subtitle' => '我是你的菜', 'badge' => '', 'bg_color' => '#FF0000', 'font_color' => '#FFFFFF'], ['tab' => Tabs::APPLET_INDEX_RECOMMEND, 'title' => '猜你喜欢', 'subtitle' => '我是你的菜', 'badge' => '', 'bg_color' => '#FF0000', 'font_color' => '#FFFFFF'],
['tab' => Tabs::APPLET_INDEX_NEW, 'title' => '每日上新', 'subtitle' => '新鲜当日达', 'badge' => '好新鲜', 'bg_color' => '#FF0000', 'font_color' => '#FFFFFF'], ['tab' => Tabs::APPLET_INDEX_NEW, 'title' => '每日上新', 'subtitle' => '新鲜当日达', 'badge' => '好新鲜', 'bg_color' => '#FF0000', 'font_color' => '#FFFFFF'],
['tab' => Tabs::APPLET_INDEX_FRESH, 'title' => '懒族优选', 'subtitle' => '发现不一样', 'badge' => '', 'bg_color' => '#FF0000', 'font_color' => '#FFFFFF'],
['tab' => Tabs::APPLET_INDEX_FRESH, 'title' => '链街优选', 'subtitle' => '发现不一样', 'badge' => '', 'bg_color' => '#FF0000', 'font_color' => '#FFFFFF'],
//['tab' => Tabs::APPLET_INDEX_OFFICE, 'title' => '白领餐食', 'subtitle' => '轻奢快手菜', 'badge' => '手到食来', 'bg_color' => '#FF0000', 'font_color' => '#FFFFFF'], //['tab' => Tabs::APPLET_INDEX_OFFICE, 'title' => '白领餐食', 'subtitle' => '轻奢快手菜', 'badge' => '手到食来', 'bg_color' => '#FF0000', 'font_color' => '#FFFFFF'],
]; ];
}else{ }else{
@ -43,7 +43,7 @@ class TabsService implements TabsServiceInterface
//['tab' => Tabs::APPLET_INDEX_STORE, 'title' => '推荐店铺', 'subtitle' => '物美价廉', 'badge' => '', 'bg_color' => '#FF0000', 'font_color' => '#FFFFFF'], //['tab' => Tabs::APPLET_INDEX_STORE, 'title' => '推荐店铺', 'subtitle' => '物美价廉', 'badge' => '', 'bg_color' => '#FF0000', 'font_color' => '#FFFFFF'],
['tab' => Tabs::APPLET_INDEX_RECOMMEND, 'title' => '猜你喜欢', 'subtitle' => '我是你的菜', 'badge' => '', 'bg_color' => '#FF0000', 'font_color' => '#FFFFFF'], ['tab' => Tabs::APPLET_INDEX_RECOMMEND, 'title' => '猜你喜欢', 'subtitle' => '我是你的菜', 'badge' => '', 'bg_color' => '#FF0000', 'font_color' => '#FFFFFF'],
['tab' => Tabs::APPLET_INDEX_NEW, 'title' => '每日上新', 'subtitle' => '新鲜当日达', 'badge' => '好新鲜', 'bg_color' => '#FF0000', 'font_color' => '#FFFFFF'], ['tab' => Tabs::APPLET_INDEX_NEW, 'title' => '每日上新', 'subtitle' => '新鲜当日达', 'badge' => '好新鲜', 'bg_color' => '#FF0000', 'font_color' => '#FFFFFF'],
['tab' => Tabs::APPLET_INDEX_FRESH, 'title' => '懒族优选', 'subtitle' => '发现不一样', 'badge' => '', 'bg_color' => '#FF0000', 'font_color' => '#FFFFFF'],
['tab' => Tabs::APPLET_INDEX_FRESH, 'title' => '链街优选', 'subtitle' => '发现不一样', 'badge' => '', 'bg_color' => '#FF0000', 'font_color' => '#FFFFFF'],
['tab' => Tabs::APPLET_INDEX_OFFICE, 'title' => '白领餐食', 'subtitle' => '轻奢快手菜', 'badge' => '手到食来', 'bg_color' => '#FF0000', 'font_color' => '#FFFFFF'], ['tab' => Tabs::APPLET_INDEX_OFFICE, 'title' => '白领餐食', 'subtitle' => '轻奢快手菜', 'badge' => '手到食来', 'bg_color' => '#FF0000', 'font_color' => '#FFFFFF'],
]; ];
} }

2
app/Service/v3/Implementations/UserCenterBlockService.php

@ -39,7 +39,7 @@ class UserCenterBlockService implements UserCenterBlockServiceInterface
['name' => '当面付订单查询', 'icon' => $img_host . 'user_icons/offline_orders2.png', 'type' => 'page', 'path' => '/pages/facepay/facepay','command'=>'offline_orders'], ['name' => '当面付订单查询', 'icon' => $img_host . 'user_icons/offline_orders2.png', 'type' => 'page', 'path' => '/pages/facepay/facepay','command'=>'offline_orders'],
['name' => '在线客服', 'icon' => $img_host . 'user_icons/online_kf2.png', 'type' => 'page', 'path' => '','command'=>'online_kf'], ['name' => '在线客服', 'icon' => $img_host . 'user_icons/online_kf2.png', 'type' => 'page', 'path' => '','command'=>'online_kf'],
['name' => '联系服务站', 'icon' => $img_host . 'user_icons/contact_fwz2.png', 'type' => 'page', 'path' => '/pages/contactMarket/contactMarket','command'=>'contact_fwz'], ['name' => '联系服务站', 'icon' => $img_host . 'user_icons/contact_fwz2.png', 'type' => 'page', 'path' => '/pages/contactMarket/contactMarket','command'=>'contact_fwz'],
['name' => '关于懒族', 'icon' => $img_host . 'user_icons/about_lz2.png', 'type' => 'page', 'path' => '/pages/aboutUs/aboutUs','command'=>'about'],
['name' => '关于链街', 'icon' => $img_host . 'user_icons/about_lz2.png', 'type' => 'page', 'path' => '/pages/aboutUs/aboutUs','command'=>'about'],
] ]
] ]
]; ];

3651
composer.lock
File diff suppressed because it is too large
View File

Loading…
Cancel
Save