mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
liu 2024-06-08 18:04:48 +08:00
commit 98c464048f
10 changed files with 270 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/api/controller/IndexController.php
View File

@ -15,6 +15,8 @@ use hg\apidoc\annotation as ApiDoc;
use support\Log;
use Yansongda\Pay\Exception\InvalidSignException;
use Monolog\Handler\RotatingFileHandler;
use Webman\RedisQueue\Redis;
#[ApiDoc\NotParse()]
class IndexController extends BaseApiController
@ -23,8 +25,8 @@ class IndexController extends BaseApiController
public function index()
{
Log::error(222);
d(2);
Redis::send('push-platform-print', ['order_id' => 119]);
d(2);
try {
$wechat = new PayService(1);

6
app/common/logic/PayNotifyLogic.php
View File

@ -115,11 +115,11 @@ class PayNotifyLogic extends BaseLogic
if ($order->pay_type == 9) {
$extra['create_time'] = $order['create_time'];
PushService::push('store_merchant_' . $order['id'], $order['id'], ['type' => 'cash_register', 'msg' => '您有一笔订单已支付', 'data' => $extra]);
PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'cash_register', 'msg' => '您有一笔订单已支付', 'data' => $extra]);
} else {
PushService::push('store_merchant_' . $order['id'], $order['id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']);
PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']);
Redis::send('push-platform-print', ['order_id' => $order['id']], 60);
// Db::name('order_middle')->insert(['c_order_id' => $order['id']]);
// Db::name('order_middle')->insert(['c_order_id' => $order['id']]);
}
if (!empty($extra['payer']['openid']) && $order->pay_type != 9) {
Redis::send('push-delivery', ['order_sn' => $order['order_id'], 'openid' => $extra['payer']['openid']], 5);

10
app/common/logic/PaymentLogic.php
View File

@ -84,16 +84,16 @@ class PaymentLogic extends BaseLogic
}
$order = [
'description' => '条码商品',
'out_trade_no' => $order['number'],
'out_trade_no' => (string)$order['order_id'],
'payer' => [
'auth_code' => (string)$auth_code
],
'amount' => [
'total' => intval($order['actual'] * 100),
'total' => intval($order['pay_price'] * 100),
],
'scene_info' => [
"store_info" => [
'id' => (string)$order['merchant']
'id' => (string)$order['store_id']??1
]
],
];
@ -124,9 +124,9 @@ class PaymentLogic extends BaseLogic
}
$order = [
'subject' => '条码商品',
'out_trade_no' => $order['number'],
'out_trade_no' => (string)$order['order_id'],
'auth_code' => (string)$auth_code,
'total_amount' => $order['actual'],
'total_amount' => $order['pay_price'],
'extend_params'=>['attach'=>'alipay_cashier']
];
$wechat = new PayService();

57
app/queue/redis/CodePaySend.php Normal file
View File

@ -0,0 +1,57 @@
<?php
namespace app\queue\redis;
use app\common\logic\PayNotifyLogic;
use app\common\model\retail\Cashierclass;
use app\common\model\store_order\StoreOrder;
use app\common\service\pay\PayService;
use app\common\service\PushService;
use Webman\RedisQueue\Consumer;
use support\exception\BusinessException;
/**
* 微信条码支付队列消费
*/
class CodePaySend implements Consumer
{
// 要消费的队列名
public $queue = 'send-code-pay';
// 连接名，对应 plugin/webman/redis-queue/redis.php 里的连接`
public $connection = 'default';
// 消费
public function consume($data)
{
$pay = new PayService();
$order = [
'out_trade_no' => $data['order_id'],
];
$res = $pay->wechat->query($order);
if ($res['trade_state'] == 'SUCCESS' && $res['trade_state_desc'] == '支付成功') {
PayNotifyLogic::handle('wechat_common', $res['out_trade_no'], $res);
}else{
throw new BusinessException('订单支付中', 200);
}
}
// 消费失败时
public function onConsumeFailure(\Throwable $exception, $package)
{
// 直接更改消息队列数据结构，将最大重试次数max_attempts字段设置为0，即不再重试。
if($package['attempts'] ==$exception['max_attempts']){
$data = [
'order_id' => $package['data']['order_id'],
'paid' => 0,
];
$find=StoreOrder::where($data)->find();
if($find){
$order = StoreOrder::update($data);
if($order){
PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type'=>'cash_register','msg'=>'支付超时,订单已被取消,请重新提交订单']);
}
}
}
return $package;
}
}

70
app/queue/redis/PushPlatformPrintSend.php Normal file
View File

@ -0,0 +1,70 @@
<?php
namespace app\queue\redis;
use app\admin\logic\operation\OpurchaseclassLogic;
use app\common\model\goods\Goods;
use app\common\model\goods\Unit;
use app\common\model\merchant\Merchant;
use app\common\model\opurchase\Opurchaseinfo;
use app\common\model\retail\Cashierclass;
use app\common\model\retail\Cashierinfo;
use app\common\model\store_branch_product\StoreBranchProduct;
use app\common\model\store_order\StoreOrder;
use app\common\model\store_order_cart_info\StoreOrderCartInfo;
use app\common\model\store_product_unit\StoreProductUnit;
use app\common\model\system_store\SystemStore;
use app\common\model\system_store\SystemStoreStaff;
use app\common\model\user\User;
use app\common\service\PushService;
use Webman\RedisQueue\Consumer;
use Webman\Push\Api;
use support\exception\BusinessException;
use support\Log;
use think\facade\Db;
/**
* 订单推送给收银台
*/
class PushPlatformPrintSend implements Consumer
{
// 要消费的队列名
public $queue = 'push-platform-print';
// 连接名，对应 plugin/webman/redis-queue/redis.php 里的连接`
public $connection = 'default';
// 消费
public function consume($data)
{
$id=$data['order_id']??0;
Log::info('打印推送开始'.$id);
if(!$id)return false;
$find = StoreOrder::where('id', $id)->find();
if ($find) {
$merchant = SystemStore::where('id', $find['store_id'])->field('name,phone')->find();
$mer_user_info = SystemStoreStaff::where('store_id', $find['store_id'])->where('is_admin',1)->field('staff_name,phone')->find();
$user = User::where('id', $find['uid'])->field('nickname,mobile')->find();
$find['system_store_name'] = $merchant['name'];
$find['system_store_phone'] = $merchant['phone'];
$find['staff_name'] = $mer_user_info['staff_name'];
$find['staff_phone'] = $mer_user_info['phone'];
$find['nickname'] = $user['nickname']??'';
$find['user_mobile'] = $user['mobile']??'';
$find['info'] = StoreOrderCartInfo::where('oid', $find['id'])->field('store_id,product_id,cart_num,price,total_price')->select()->each(function ($item) {
$goods = StoreBranchProduct::where(['store_id'=>$item['store_id'],'product_id'=>$item['product_id']])->field('store_name,unit')->find();
$item['unit_name'] = StoreProductUnit::where('id', $goods['unit'])->value('name');
$item['store_name'] = $goods['store_name'];
return $item;
});
PushService::push('store_merchant_'.$find['store_id'], 1, ['type'=>'platform_print','msg'=>'打印队列','data'=>$find]);
Log::info('打印推送结束'.$id);
}
}
public function onConsumeFailure(\Throwable $exception, $package)
{
Log::error('打印队列推送失败。order_id:'. $package['data']['order_id'].',msg:'.$exception->getMessage());
return $package;
}
}

64
app/store/controller/WorkbenchController.php
View File

@ -3,6 +3,7 @@
namespace app\store\controller;
use app\common\controller\Definitions;
use app\store\lists\store_order\StoreOrderLists;
use app\store\logic\WorkbenchLogic;
use hg\apidoc\annotation as ApiDoc;
@ -49,7 +50,7 @@ class WorkbenchController extends BaseAdminController
}
#[
ApiDoc\Title('配送统计（暂时不用）'),
ApiDoc\Title('配送统计'),
ApiDoc\url('/store/workbench/delivery'),
ApiDoc\Method('GET'),
ApiDoc\NotHeaders(),
@ -61,8 +62,29 @@ class WorkbenchController extends BaseAdminController
]
public function delivery()
{
$storeId = $this->request->adminInfo['store_id'];
$result = WorkbenchLogic::delivery($storeId);
$params = $this->request->get();
$params['store_id'] = $this->request->adminInfo['store_id'];
$result = WorkbenchLogic::delivery($params);
return $this->data($result);
}
#[
ApiDoc\Title('配送订单统计'),
ApiDoc\url('/store/workbench/deliveryOrder'),
ApiDoc\Method('GET'),
ApiDoc\NotHeaders(),
ApiDoc\Author('中国队长'),
ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'),
ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'),
ApiDoc\Header(ref: [Definitions::class, "token"]),
ApiDoc\Query(ref: [Definitions::class, "page"]),
ApiDoc\ResponseSuccess("data", type: "array"),
]
public function deliveryOrder()
{
$params = $this->request->get();
$params['store_id'] = $this->request->adminInfo['store_id'];
$result = WorkbenchLogic::deliveryOrder($params);
return $this->data($result);
}
@ -120,40 +142,4 @@ class WorkbenchController extends BaseAdminController
return $workbench->get_product_ranking();
}
#[
ApiDoc\Title('用户统计-概况'),
ApiDoc\url('/store/workbench/get_user_basic'),
ApiDoc\Method('GET'),
ApiDoc\NotHeaders(),
ApiDoc\Author('中国队长'),
ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'),
ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'),
ApiDoc\Header(ref: [Definitions::class, "token"]),
ApiDoc\ResponseSuccess("data", type: "array"),
]
public function get_user_basic(\app\admin\controller\WorkbenchController $workbench)
{
$params = $this->request->get();
$params['store_id'] = $this->request->adminInfo['store_id'];
return $workbench->get_user_basic();
}
#[
ApiDoc\Title('用户统计-图表'),
ApiDoc\url('/store/workbench/get_user_trend'),
ApiDoc\Method('GET'),
ApiDoc\NotHeaders(),
ApiDoc\Author('中国队长'),
ApiDoc\Query(name: 'start_time', type: 'string', require: true, desc: '开始时间'),
ApiDoc\Query(name: 'end_time', type: 'string', require: true, desc: '结束时间'),
ApiDoc\Header(ref: [Definitions::class, "token"]),
ApiDoc\ResponseSuccess("data", type: "array"),
]
public function get_user_trend(\app\admin\controller\WorkbenchController $workbench)
{
$params = $this->request->get();
$params['store_id'] = $this->request->adminInfo['store_id'];
return $workbench->get_user_trend();
}
}

5
app/store/controller/store_order/StoreOrderController.php
View File

@ -96,7 +96,8 @@ class StoreOrderController extends BaseAdminController
ApiDoc\NotHeaders(),
ApiDoc\Author('中国队长'),
ApiDoc\Header(ref: [Definitions::class, "token"]),
ApiDoc\Query(name: 'id', type: 'int', require: true, desc: '订单id'),
ApiDoc\Query(name: 'id', type: 'int', require: false, desc: '订单id'),
ApiDoc\Query(name: 'verify_code', type: 'string', require: false, desc: '核销码'),
ApiDoc\ResponseSuccess("data", type: "array"),
]
public function detail(StoreOrderLogic $orderLogic)
@ -151,7 +152,7 @@ class StoreOrderController extends BaseAdminController
return $this->fail(PaymentLogic::getError(), $params);
}
if (isset($result['trade_state_desc']) && $result['trade_state_desc'] == '支付成功') {
PayNotifyLogic::handle('StoreOrder', $result['out_trade_no'], $result);
PayNotifyLogic::handle('wechat_common', $result['out_trade_no'], $result);
} else {
Redis::send('send-code-pay', ['number' => $order['number']]);
return $this->success('用户支付中');

98
app/store/logic/WorkbenchLogic.php
View File

@ -431,4 +431,102 @@ class WorkbenchLogic extends BaseLogic
return $data;
}
public static function delivery($params)
{
$data = [];
$storeId = $params['store_id'];
$startTime = $params['start_time'];
$endTime = $params['end_time'];
$endTime = date('Y-m-d', strtotime($endTime) + 86400);
$dateDiff = (new \DateTime($endTime))->diff(new \DateTime($startTime));
$timeRange = [];
if ($dateDiff->days == 1) {
$group = 'HOUR(pay_time)';
$i = 0;
while ($i < 24) {
$timeRange[] = date('H', strtotime("+$i hours", strtotime($startTime)));
$i++;
}
$field = 'from_unixtime(pay_time,"%H") as pay_time,sum(pay_price) as pay_price,count(id) as order_num';
} elseif ($dateDiff->days <= 31) {
$group = 'DAY(pay_time)';
$i = 0;
while ($i < $dateDiff->days) {
$timeRange[] = date('m-d', strtotime("+$i days", strtotime($startTime)));
$i++;
}
$field = 'from_unixtime(pay_time,"%m-%d") as pay_time,sum(pay_price) as pay_price,count(id) as order_num';
} else {
$group = 'MONTH(pay_time)';
$i = 0;
$month = 0;
if ($dateDiff->y > 0) {
$month = $dateDiff->y * 12;
}
if ($dateDiff->m > 0) {
$month += $dateDiff->m;
}
if ($dateDiff->d > 0) {
$month += 1;
}
while ($i < $month) {
$timeRange[] = date('Y-m', strtotime("+$i months", strtotime($startTime)));
$i++;
}
$field = 'from_unixtime(pay_time,"%Y-%m") as pay_time,sum(pay_price) as pay_price,count(id) as order_num';
}
$amountList = StoreOrder::field($field)
->where('store_id', $storeId)
->where('paid', 1)
->where('shipping_type', 1)
->whereBetweenTime('pay_time', $startTime, $endTime)
->group($group)
->select()
->toArray();
$amountList = reset_index($amountList, 'pay_time');
$amountListTmp = [];
$countListTmp = [];
$range = [];
foreach ($timeRange as $item) {
$range[] = $item;
if (!isset($amountList[$item])) {
$amountListTmp[$item] = 0;
} else {
$amountListTmp[$item] = $amountList[$item]['pay_price'];
}
if (!isset($amountList[$item])) {
$countListTmp[$item] = 0;
} else {
$countListTmp[$item] = $amountList[$item]['order_num'];
}
}
$data['statistics'] = [
'range' => $range,
'data' => [
'order_amount' => array_values($amountListTmp),
'order_count' => array_values($countListTmp)
]
];
return $data;
}
public static function deliveryOrder($params)
{
$startTime = $params['start_time'];
$endTime = $params['end_time'];
$endTime = date('Y-m-d', strtotime($endTime) + 86400);
$query = StoreOrder::with('user')->where('store_id', $params['store_id'])
->where('paid', 1)
->where('shipping_type', 1)
->whereBetweenTime('create_time', $startTime, $endTime);
$data['count'] = $query->count();
$data['page_no'] = $params['page_no'];
$data['page_size'] = $params['page_size'];
$data['extend'] = [];
$data['lists'] = $query->order('create_time', 'desc')
->page($params['page_no'], $params['page_size'])
->select()->toArray();
return $data;
}
}

6
app/store/validate/store_order/StoreOrderValidate.php
View File

@ -19,7 +19,8 @@ class StoreOrderValidate extends BaseValidate
* @var string[]
*/
protected $rule = [
'id' => 'require',
'id' => 'requireWithout:verify_code',
'verify_code' => 'requireWithout:id',
];
@ -29,6 +30,7 @@ class StoreOrderValidate extends BaseValidate
*/
protected $field = [
'id' => 'id',
'verify_code' => '核销码',
];
@ -76,7 +78,7 @@ class StoreOrderValidate extends BaseValidate
*/
public function sceneDetail()
{
return $this->only(['id']);
return $this->only(['id','verify_code']);
}
}

2
config/plugin/webman/redis-queue/log.php
View File

@ -18,7 +18,7 @@ return [
[
'class' => \support\log\MonologExtendHandler::class,
'constructor' => [
'/logs/redis-queue/queue.log',
'redis-queue',
7, //$maxFiles
Monolog\Logger::DEBUG,
],