|
|
@@ -10,6 +10,8 @@ use bizHd\goods\classes\GoodsCategoryClass;
|
|
|
use bizHd\goods\classes\GoodsClass;
|
|
|
use bizHd\meituan\classes\MtOrderClass;
|
|
|
use bizHd\order\classes\OrderClass;
|
|
|
+use bizHd\order\classes\OrderGoodsClass;
|
|
|
+use bizHd\order\classes\OrderItemClass;
|
|
|
use bizHd\order\services\OrderService;
|
|
|
use bizHd\refund\classes\HdRefundClass;
|
|
|
use bizHd\refund\services\HdRefundService;
|
|
|
@@ -536,50 +538,29 @@ class MtController extends PublicController
|
|
|
$mainId = $shop->mainId ?? 0;
|
|
|
$post = [];
|
|
|
$post['price'] = $order->actPrice ?? 0;
|
|
|
- $post['refundType'] = HdRefundClass::REFUND_TYPE_MONEY;
|
|
|
+ $post['refundType'] = HdRefundClass::REFUND_TYPE_MONEY_GOOD;
|
|
|
$post['id'] = $order->id ?? 0;
|
|
|
$post['shopId'] = $shopId;
|
|
|
$post['sjId'] = $sjId;
|
|
|
$post['shopAdminId'] = 0;
|
|
|
$post['mainId'] = $mainId;
|
|
|
$post['shopAdminName'] = '美团APP';
|
|
|
- $refund = HdRefundService::addRefund($post, $order);
|
|
|
- $refundOrderSn = $refund->orderSn ?? '';
|
|
|
-
|
|
|
- //没有完成的制作单取消
|
|
|
- $orderId = $order->id ?? 0;
|
|
|
- $workList = WorkClass::getAllByCondition(['orderId' => $orderId], null, '*', null, true);
|
|
|
- if (!empty($workList)) {
|
|
|
- foreach ($workList as $work) {
|
|
|
- if ($work->status == 0) {
|
|
|
- $work->status = 2;
|
|
|
- $work->save();
|
|
|
-
|
|
|
-
|
|
|
- $num = $work->num ?? 0;
|
|
|
- $goodsId = $work->goodsId ?? 0;
|
|
|
- $mainId = $work->mainId ?? 0;
|
|
|
- $respond = GoodsClass::addStock($goodsId, $mainId, $num);
|
|
|
- $oldStock = $respond['oldStock'] ?? 0;
|
|
|
- $newStock = $respond['newStock'] ?? 0;
|
|
|
-
|
|
|
- $data = [];
|
|
|
- $data['sjId'] = $sjId;
|
|
|
- $data['shopId'] = $shopId;
|
|
|
- $data['mainId'] = $mainId;
|
|
|
- $data['orderSn'] = $refundOrderSn;
|
|
|
- $data['goodsId'] = $goodsId;
|
|
|
- $data['goodsNum'] = $num;
|
|
|
- $data['oldStock'] = $oldStock;
|
|
|
- $data['newStock'] = $newStock;
|
|
|
- $data['relateName'] = '美团APP';
|
|
|
-
|
|
|
-
|
|
|
- GoodsStockRecordClass::cancelOrderGoods($data);
|
|
|
-
|
|
|
- }
|
|
|
+ $orderSn = $order->orderSn ?? '';
|
|
|
+ $orderGoods = OrderGoodsClass::getAllByCondition(['orderSn' => $orderSn], null, '*', null, true);
|
|
|
+ $productData = [];
|
|
|
+ if (!empty($orderGoods)) {
|
|
|
+ foreach ($orderGoods as $goodsItem) {
|
|
|
+ $productData[] = ['productId' => $goodsItem->id, 'num' => $goodsItem->num, 'unitPrice' => $goodsItem->unitPrice, 'property' => 0,];
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $orderItem = OrderItemClass::getAllByCondition(['orderSn' => $orderSn], null, '*', null, true);
|
|
|
+ if (!empty($orderItem)) {
|
|
|
+ foreach ($orderItem as $singe) {
|
|
|
+ $productData[] = ['productId' => $singe->id, 'num' => $singe->num, 'unitPrice' => $singe->unitPrice, 'property' => 1,];
|
|
|
}
|
|
|
}
|
|
|
+ $post['product'] = $productData;
|
|
|
+ HdRefundService::addRefund($post, $order);
|
|
|
|
|
|
//制作单取消通知
|
|
|
$shopExt = ShopExtClass::getByCondition(['shopId' => $shopId], true);
|