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

更新

Browse Source
This commit is contained in:
mkm 2023-11-04 10:35:25 +08:00
parent 4c366096bc
commit 93a45242f2
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/common/repositories/store/order/StoreOrderRepository.php
View File

@ -159,7 +159,6 @@ class StoreOrderRepository extends BaseRepository
Db::commit(); Db::commit();
}catch (Exception $e) { }catch (Exception $e) {
Db::rollback(); Db::rollback();
halt($e);
throw new ValidateException('余额支付失败'); throw new ValidateException('余额支付失败');
} }

1
app/common/repositories/store/product/ProductReplyRepository.php
View File

@ -230,7 +230,6 @@ class ProductReplyRepository extends BaseRepository
public function reply(array $data) public function reply(array $data)
{ {
halt(1);
$storeOrderProductRepository = app()->make(StoreOrderProductRepository::class); $storeOrderProductRepository = app()->make(StoreOrderProductRepository::class);
$orderProduct = $storeOrderProductRepository->userOrderProduct($data['order_product_id'], $data['uid']); $orderProduct = $storeOrderProductRepository->userOrderProduct($data['order_product_id'], $data['uid']);
if (!$orderProduct || !$orderProduct->orderInfo) if (!$orderProduct || !$orderProduct->orderInfo)

4
app/controller/api/Auth.php
View File

@ -188,6 +188,10 @@ class Auth extends BaseController
public function test() public function test()
{ {
$merchant = Db::name('merchant')->where('status', 1)->where('is_del', 0)->where('mer_id',56)->find();
$cityMerchant = Db::name('merchant')->where('status', 1)->where('mer_state', 1)->where('category_id', $merchant['category_id'])->where('type_id', Merchant::TypeSupplyChain)->find();
$product_id = Db::name('store_product')->where('mer_id', $cityMerchant['mer_id'])->where('bar_code', '6926265365132')->value('product_id');
$type = $this->request->param('type'); $type = $this->request->param('type');
$res = []; $res = [];
switch ($type) { switch ($type) {

2
app/listener/ProductCreate.php
View File

@ -7,12 +7,14 @@ namespace app\listener;
use app\common\model\system\merchant\Merchant; use app\common\model\system\merchant\Merchant;
use app\common\repositories\store\product\ProductRepository; use app\common\repositories\store\product\ProductRepository;
use think\facade\Db; use think\facade\Db;
use think\facade\Log;
class ProductCreate class ProductCreate
{ {
public function handle($event) public function handle($event)
{ {
Log::error(json_encode($event));
$product = $event['product']; $product = $event['product'];
// $data = $event['data']; // $data = $event['data'];
// $contentType = $event['conType']; // $contentType = $event['conType'];