From 39914fee455da7656baafe43007c7b653687b2e3 Mon Sep 17 00:00:00 2001 From: weigang Date: Thu, 10 Sep 2020 16:10:26 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=95=86=E5=93=81tags?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/JsonRpc/OrderService.php | 18 ++++++++++++++++-- app/Model/v3/Goods.php | 10 ---------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/app/JsonRpc/OrderService.php b/app/JsonRpc/OrderService.php index c2d8f43..f13b9cb 100644 --- a/app/JsonRpc/OrderService.php +++ b/app/JsonRpc/OrderService.php @@ -68,12 +68,13 @@ class OrderService implements OrderServiceInterface } /** - * 线上订单退款，整个订单退 + * 线上订单退款，整个订单退，这个是专门用于处理用户的申请退款的同意退款操作 * @param $global_order_id * @param $user_id * @return array */ - public function onlineRefund($global_order_id, $user_id){ + public function onlineRefund($global_order_id, $user_id) + { Db::beginTransaction(); try { @@ -95,4 +96,17 @@ class OrderService implements OrderServiceInterface } } + + /** + * 线上订单单笔退款 + * 支持单商品、单店、整单 + * @param $global_order_id 全局总订单ID + * @param $child_order_id 主订单ID， + * @param $order_goods_id 订单商品ID + * @param $note + */ + public function onlineSingleRefund($global_order_id, $child_order_id, $order_goods_id, $note) + { + + } } \ No newline at end of file diff --git a/app/Model/v3/Goods.php b/app/Model/v3/Goods.php index 2c110c2..c0718cb 100644 --- a/app/Model/v3/Goods.php +++ b/app/Model/v3/Goods.php @@ -92,16 +92,6 @@ class Goods extends Model return $this->attachmentService->switchImgToAliOss($value); } - public function getTagsAttribute($value) - { - if($value){ - $value = str_replace('"','',$value); - $value = explode(',',$value); - return $value; - } - return $value; - } - public function getMonthSalesAttribute() { $ssdb = ApplicationContext::getContainer()->get(SSDBTask::class); From 48c6b4b34a3033dc76e8e5f6089d6870f8e87599 Mon Sep 17 00:00:00 2001 From: weigang Date: Thu, 10 Sep 2020 16:30:53 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=80=BB=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E9=97=AE=E9=A2=98=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Service/v3/Implementations/OrderOnlineService.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/Service/v3/Implementations/OrderOnlineService.php b/app/Service/v3/Implementations/OrderOnlineService.php index bbce864..b4f0e42 100644 --- a/app/Service/v3/Implementations/OrderOnlineService.php +++ b/app/Service/v3/Implementations/OrderOnlineService.php @@ -244,7 +244,13 @@ class OrderOnlineService implements OrderOnlineServiceInterface // 校验订单总金额 if ($totalAmount != $totalMoney) { - throw new ErrorCodeException(ErrorCode::ORDER_TOTAL_AMOUNT_ERROR); + throw new ErrorCodeException(ErrorCode::ORDER_TOTAL_AMOUNT_ERROR, json_encode([ + '计算的总订单金额：' => $totalAmount, + '前端的订单总金额：' => $totalMoney, + 'Delivery：' => $deliveryAmount, + 'Service：' => $serviceMoney, + 'Coupon：' => $couponMoney, + ])); } $dataMain = [ From 66e587d6301302d37e00ee0ff682ad43c626d9d4 Mon Sep 17 00:00:00 2001 From: Lemon <15040771@qq.com> Date: Thu, 10 Sep 2020 16:47:19 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controller/v3/OrderOnlineController.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Controller/v3/OrderOnlineController.php b/app/Controller/v3/OrderOnlineController.php index 1d6397a..7f90422 100644 --- a/app/Controller/v3/OrderOnlineController.php +++ b/app/Controller/v3/OrderOnlineController.php @@ -91,9 +91,11 @@ class OrderOnlineController extends BaseController ['user_id','=',$userId], ['is_default','=',1], ]) - ->select('id') ->first(); - $res['location'] = $this->userAddressService->getAddressAndDistributionPrice($address->id,$marketId); + $res['location'] = [ + 'address' => $address, + 'distribution_price' => 0 + ]; //返回预约送达时间 数组 $res['appointment_time'] = $this->appointmentTimeService->do(); // From b05a3ea9116726673db338c781cd92f79cddff01 Mon Sep 17 00:00:00 2001 From: weigang Date: Thu, 10 Sep 2020 17:40:17 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=AE=A2=E5=8D=95ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/JsonRpc/OrderService.php | 9 +++++---- app/Model/v3/OrderMain.php | 4 ++++ app/Model/v3/ShoppingCart.php | 3 ++- app/Service/v3/Implementations/OrderOnlineService.php | 8 +------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/JsonRpc/OrderService.php b/app/JsonRpc/OrderService.php index f13b9cb..989833f 100644 --- a/app/JsonRpc/OrderService.php +++ b/app/JsonRpc/OrderService.php @@ -100,12 +100,13 @@ class OrderService implements OrderServiceInterface /** * 线上订单单笔退款 * 支持单商品、单店、整单 - * @param $global_order_id 全局总订单ID - * @param $child_order_id 主订单ID， - * @param $order_goods_id 订单商品ID + * @param $user_id *用户ID + * @param $global_order_id *全局总订单ID + * @param $child_order_id *主订单ID， + * @param $order_goods_id *订单商品ID * @param $note */ - public function onlineSingleRefund($global_order_id, $child_order_id, $order_goods_id, $note) + public function onlineSingleRefund($user_id, $global_order_id, $child_order_id, $order_goods_id, $note) { } diff --git a/app/Model/v3/OrderMain.php b/app/Model/v3/OrderMain.php index 9d4f06b..854043a 100644 --- a/app/Model/v3/OrderMain.php +++ b/app/Model/v3/OrderMain.php @@ -56,6 +56,10 @@ class OrderMain extends Model 'shipping_type_text', ]; + protected $casts = [ + 'global_order_id' => 'string' + ]; + public function getCreatedAtTextAttribute() { return date('Y-m-d H:i:s', $this->attributes['created_at']); diff --git a/app/Model/v3/ShoppingCart.php b/app/Model/v3/ShoppingCart.php index b07b814..e1d246c 100644 --- a/app/Model/v3/ShoppingCart.php +++ b/app/Model/v3/ShoppingCart.php @@ -3,10 +3,11 @@ namespace App\Model\v3; use App\Model\Model; +use Hyperf\Database\Model\SoftDeletes; class ShoppingCart extends Model { - + use SoftDeletes; protected $table = 'lanzu_shopping_cart'; protected $fillable = [ diff --git a/app/Service/v3/Implementations/OrderOnlineService.php b/app/Service/v3/Implementations/OrderOnlineService.php index b4f0e42..bbce864 100644 --- a/app/Service/v3/Implementations/OrderOnlineService.php +++ b/app/Service/v3/Implementations/OrderOnlineService.php @@ -244,13 +244,7 @@ class OrderOnlineService implements OrderOnlineServiceInterface // 校验订单总金额 if ($totalAmount != $totalMoney) { - throw new ErrorCodeException(ErrorCode::ORDER_TOTAL_AMOUNT_ERROR, json_encode([ - '计算的总订单金额：' => $totalAmount, - '前端的订单总金额：' => $totalMoney, - 'Delivery：' => $deliveryAmount, - 'Service：' => $serviceMoney, - 'Coupon：' => $couponMoney, - ])); + throw new ErrorCodeException(ErrorCode::ORDER_TOTAL_AMOUNT_ERROR); } $dataMain = [ From 3bd4068a48bac0f9ca270f884a1524e0d95513af Mon Sep 17 00:00:00 2001 From: weigang Date: Thu, 10 Sep 2020 20:36:30 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/JsonRpc/OrderService.php | 39 ++++++++++++++++++- app/Model/v3/Category.php | 18 ++++----- app/Model/v3/OrderMain.php | 2 +- app/Request/v3/SearchGoodsRequest.php | 2 +- .../v3/Implementations/CategoryService.php | 15 ++++++- 5 files changed, 61 insertions(+), 15 deletions(-) diff --git a/app/JsonRpc/OrderService.php b/app/JsonRpc/OrderService.php index 989833f..60de8b1 100644 --- a/app/JsonRpc/OrderService.php +++ b/app/JsonRpc/OrderService.php @@ -6,6 +6,8 @@ use App\Commons\Log; use App\Constants\v3\ErrorCode; use App\Constants\v3\LogLabel; use App\Exception\ErrorCodeException; +use App\Model\v3\Order; +use App\Model\v3\OrderMain; use App\Service\v3\Interfaces\OrderOnlineServiceInterface; use App\Service\v3\Interfaces\SeparateAccountsServiceInterface; use Hyperf\DbConnection\Db; @@ -98,16 +100,49 @@ class OrderService implements OrderServiceInterface } /** - * 线上订单单笔退款 + * 线上订单单笔退款，主要用于后台强行操作退单退款 * 支持单商品、单店、整单 + * 按比例计算红包进行退款 + * 比如：两个子订单和子订单商品，分别是2元，98元，使用了10元优惠券 + * 退2元商品时，退款金额为 + * 红包 ：(2/（98+2）)*10 = 0.2 + * 退款：2-0.2=1.8元 * @param $user_id *用户ID * @param $global_order_id *全局总订单ID * @param $child_order_id *主订单ID， * @param $order_goods_id *订单商品ID * @param $note */ - public function onlineSingleRefund($user_id, $global_order_id, $child_order_id, $order_goods_id, $note) + public function onlineSingleRefund($user_id, $note, $global_order_id, $child_order_id=null, $order_goods_id=null) { + if (!$user_id || !$global_order_id || !$note) { + $this->log->event(LogLabel::ORDER_REFUND_LOG, [ + 'jsonrpc_order_service_exception_onlineSingleRefund' => '参数不对', + 'params' => json([$global_order_id, $user_id, $note]) + ]); + throw new ErrorCodeException(ErrorCode::ORDER_REFUND_FAIL); + } + + // 主订单 + $orderMain = OrderMain::query()->where(['global_order_id' => $global_order_id])->first(); + + // 子订单 + if ($child_order_id) { + $orderChild = Order::query()->where(['order_main_id' => $orderMain->global_order_id])->first(); + } + + // 单商品退 + if ($order_goods_id) { + if (!$child_order_id) { + $this->log->event(LogLabel::ORDER_REFUND_LOG, [ + 'jsonrpc_order_service_exception_onlineSingleRefund' => '参数不对[单品]', + 'params' => json([$global_order_id, $user_id, $note, $child_order_id]) + ]); + throw new ErrorCodeException(ErrorCode::ORDER_REFUND_FAIL); + } + + + } } } \ No newline at end of file diff --git a/app/Model/v3/Category.php b/app/Model/v3/Category.php index 7c3eaa6..1dda811 100644 --- a/app/Model/v3/Category.php +++ b/app/Model/v3/Category.php @@ -21,9 +21,7 @@ class Category extends Model protected $table = 'lanzu_category'; protected $appends = [ - 'goods_types', - 'cover_url', - 'goods_category_ids', + 'cover_url' ]; protected function boot(): void @@ -34,18 +32,18 @@ class Category extends Model }); } - public function getGoodsTypesAttribute() + public function getCoverUrlAttribute() { - return self::query()->where(['parent_id' => $this->attributes['id']])->orderBy('sort', 'desc')->get()->toArray(); + return $this->attachmentService->switchImgToAliOss($this->attributes['cover_img']); } - public function getGoodsCategoryIdsAttribute() + public function goodsTypes() { - return GoodsCategory::query()->where(['category_id' => $this->attributes['id']])->orderBy('sort', 'desc')->pluck('id'); + return $this->hasMany(self::class, 'parent_id', 'id')->with('goodsCategory'); } - - public function getCoverUrlAttribute() + + public function goodsCategory() { - return $this->attachmentService->switchImgToAliOss($this->attributes['cover_img']); + return $this->hasMany(GoodsCategory::class, 'category_id', 'id'); } } \ No newline at end of file diff --git a/app/Model/v3/OrderMain.php b/app/Model/v3/OrderMain.php index 854043a..01134a4 100644 --- a/app/Model/v3/OrderMain.php +++ b/app/Model/v3/OrderMain.php @@ -103,7 +103,7 @@ class OrderMain extends Model Order::class, 'order_main_id', 'order_id', - 'id', + 'global_order_id', 'id' ); } diff --git a/app/Request/v3/SearchGoodsRequest.php b/app/Request/v3/SearchGoodsRequest.php index 7b85add..31ec5bd 100644 --- a/app/Request/v3/SearchGoodsRequest.php +++ b/app/Request/v3/SearchGoodsRequest.php @@ -16,7 +16,7 @@ class SearchGoodsRequest extends BaseFormRequest { return [ 'market_id' => 'required|nonempty|integer', - 'type_id' => 'nonempty|integer', + 'type_id' => 'nonempty', 'store_id' => 'nonempty|integer', 'keyword' => 'nonempty', 'order_by' => 'nonempty|in:default,sales,price', diff --git a/app/Service/v3/Implementations/CategoryService.php b/app/Service/v3/Implementations/CategoryService.php index 6be32bd..039e532 100644 --- a/app/Service/v3/Implementations/CategoryService.php +++ b/app/Service/v3/Implementations/CategoryService.php @@ -32,7 +32,20 @@ class CategoryService implements CategoryServiceInterface public function all() { - return Category::query()->where(['parent_id' => 0])->get()->toArray(); + $categories = Category::query() + ->with(['goodsTypes']) + ->where(['parent_id' => 0])->get()->toArray(); + + foreach ($categories as $key => &$category) { + foreach ($category['goods_types'] as $key2 => &$item) { + $item['goods_category_ids'] = ''; + if (isset($item['goods_category']) && $item['goods_category']) { + $item['goods_category_ids'] = implode(',', array_values(array_column($item['goods_category'], 'id'))); + } + } + } + + return $categories; } public function allForStore($storeId) From 6e1bd1d3504c25f50d36d304608d5395cc14925e Mon Sep 17 00:00:00 2001 From: weigang Date: Thu, 10 Sep 2020 21:05:35 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E4=B8=89=E7=BA=A7?= =?UTF-8?q?=E5=90=8C=E6=97=B6=E6=90=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Constants/v3/OrderState.php | 8 ++++++++ app/JsonRpc/OrderService.php | 14 +++++++++++++- app/Request/v3/SearchGoodsRequest.php | 1 + app/Service/v3/Implementations/SearchService.php | 5 +++++ 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/app/Constants/v3/OrderState.php b/app/Constants/v3/OrderState.php index 718dffc..af1ff7c 100644 --- a/app/Constants/v3/OrderState.php +++ b/app/Constants/v3/OrderState.php @@ -75,6 +75,14 @@ class OrderState extends AbstractConstants */ const REFUND = [self::REFUNDING, self::REFUNDED, self::REFUND_REFUSE]; + /** + * @Message("可删除") + */ const CAN_DEL = [self::COMPLETED, self::EVALUATED, self::CANCELED, self::REFUNDED, self::REFUND_REFUSE]; + /** + * @Message("可强行退款") + */ + const CAN_REFUND_DIRECT = [self::COMPLETED, self::EVALUATED, self::REFUND_REFUSE]; + } \ No newline at end of file diff --git a/app/JsonRpc/OrderService.php b/app/JsonRpc/OrderService.php index 60de8b1..4ea5298 100644 --- a/app/JsonRpc/OrderService.php +++ b/app/JsonRpc/OrderService.php @@ -5,6 +5,7 @@ namespace App\JsonRpc; use App\Commons\Log; use App\Constants\v3\ErrorCode; use App\Constants\v3\LogLabel; +use App\Constants\v3\OrderState; use App\Exception\ErrorCodeException; use App\Model\v3\Order; use App\Model\v3\OrderMain; @@ -124,7 +125,18 @@ class OrderService implements OrderServiceInterface } // 主订单 - $orderMain = OrderMain::query()->where(['global_order_id' => $global_order_id])->first(); + $orderMain = OrderMain::query() + ->where(['global_order_id' => $global_order_id]) + ->whereIn('state', OrderState::CAN_REFUND_DIRECT) + ->first(); + + if (empty($orderMain)) { + $this->log->event(LogLabel::ORDER_REFUND_LOG, [ + 'jsonrpc_order_service_exception_onlineSingleRefund' => '订单不存在', + 'params' => json([$global_order_id, $user_id, $note]) + ]); + throw new ErrorCodeException(ErrorCode::ORDER_REFUND_FAIL); + } // 子订单 if ($child_order_id) { diff --git a/app/Request/v3/SearchGoodsRequest.php b/app/Request/v3/SearchGoodsRequest.php index 31ec5bd..46ec354 100644 --- a/app/Request/v3/SearchGoodsRequest.php +++ b/app/Request/v3/SearchGoodsRequest.php @@ -17,6 +17,7 @@ class SearchGoodsRequest extends BaseFormRequest return [ 'market_id' => 'required|nonempty|integer', 'type_id' => 'nonempty', + 'goods_category_ids' => 'nonempty', 'store_id' => 'nonempty|integer', 'keyword' => 'nonempty', 'order_by' => 'nonempty|in:default,sales,price', diff --git a/app/Service/v3/Implementations/SearchService.php b/app/Service/v3/Implementations/SearchService.php index e1f5c84..6b6a0b1 100644 --- a/app/Service/v3/Implementations/SearchService.php +++ b/app/Service/v3/Implementations/SearchService.php @@ -23,6 +23,11 @@ class SearchService implements \App\Service\v3\Interfaces\SearchServiceInterface if (isset($params['type_id']) && $params['type_id']) { $typeIds = explode(',', $params['type_id']); + $builder->whereIn('category_id', $typeIds); + } + + if (isset($params['goods_category_ids']) && $params['goods_category_ids']) { + $typeIds = explode(',', $params['goods_category_ids']); $builder->whereIn('goods_category_id', $typeIds); }