shish 5 лет назад
Родитель
Сommit
f5ebcec949
2 измененных файлов с 7 добавлено и 3 удалено
  1. 2 2
      biz-hd/cg/classes/CgRefundClass.php
  2. 5 1
      biz-hd/cg/services/CgRefundService.php

+ 2 - 2
biz-hd/cg/classes/CgRefundClass.php

@@ -58,7 +58,7 @@ class CgRefundClass extends BaseClass
 
 
     // 组装 orderItem  linqh 2021.1.25
-    public static function groupOrderItem($ghsItemInfo, $orderSn)
+    public static function groupOrderItem($ghsItemInfo, $orderSn, $cgItemList)
     {
         $productData = self::getProductMapData($ghsItemInfo);
         //写入详情表
@@ -77,7 +77,7 @@ class CgRefundClass extends BaseClass
             $tmp['itemNum'] = ProductClass::mergeItemNum($v['bigNum'], $v['smallNum'], $unitNum);// 数量
             $tmp['name'] = $productData[$productId]['name'] ?? '';
             $tmp['cover'] = $productData[$productId]['cover'] ?? '';
-            $tmp['itemPrice'] = $productData[$productId]['price'] ?? 0; //当时售卖的价格
+            $tmp['itemPrice'] = $cgItemList[$productId]['price'] ?? 0; //当时售卖的价格
             $tmp['totalPrice'] = bcmul($tmp['itemPrice'], $tmp['itemNum'], 2);
             $tmp['itemCost'] = $productData[$productId]['cost'] ?? 0; //当时成本价
             $stockFormat = ProductClass::formatStock($tmp['itemStock'], $unitNum); // 库存总单位数量转大小单位的数量

+ 5 - 1
biz-hd/cg/services/CgRefundService.php

@@ -12,6 +12,7 @@ use bizHd\base\services\BaseService;
 use bizHd\cg\classes\CgRefundClass;
 use bizHd\cg\classes\CgRefundItemClass;
 use bizHd\purchase\classes\PurchaseClass;
+use bizHd\purchase\classes\PurchaseItemClass;
 use bizHd\stat\classes\StatIncomeClass;
 use bizHd\wx\classes\WxOpenClass;
 use common\components\dict;
@@ -93,7 +94,10 @@ class CgRefundService extends BaseService
                 $ghsItemInfo[$k]['newStock'] = $stockInfo['newStock'];
             }
 
-            $batchData = CgRefundClass::groupOrderItem($ghsItemInfo, $refundOrderSn);
+            $cgOrderSn = $cg->orderSn ?? '';
+            $cgItemList = PurchaseItemClass::getAllByCondition(['orderSn' => $cgOrderSn], null, '*', 'productId');
+
+            $batchData = CgRefundClass::groupOrderItem($ghsItemInfo, $refundOrderSn, $cgItemList);
             CgRefundItemClass::batchAddOrderItem($batchData);
 
             $orderData = CgRefundClass::getOrderDetail($refundOrderSn, $cg->shopId);