fix conflicts

.gitignore

@@ -17,4 +17,4 @@ app-hd/web/assets/
 app-pt/web/assets/
 app-ghs/web/assets/
 app-mall/web/assets/
-.aider*
+.aider*

app-ghs/controllers/OrderItemController.php

@@ -293,25 +293,6 @@ class OrderItemController extends BaseController
         }
     }
 
-    //重选花材 ssh 2021.3.2
-    public function actionReset()
-    {
-        $post = Yii::$app->request->post();
-        $id = $post['id'] ?? 0;
-        $product = $post['product'] ?? '[]';
-        $product = json_decode($product, true);
-        //检查花材是否都是同家门店的
-        ProductClass::valid($product, $this->mainId);
-
-        $info = OrderService::getOrderInfo($id);
-        OrderClass::valid($info, $this->shopId);
-
-        //添加修改花材
-        $orderSn = $info['orderSn'] ?? '';
-        OrderItemClass::replaceItem($orderSn, $product);
-        util::complete();
-    }
-
     //修改花材时获取订单花材和花材基本信息的组合 ssh 20210809
     public function actionGetOrderProduct()
     {

biz-ghs/order/classes/OrderItemClass.php

@@ -317,11 +317,22 @@ class OrderItemClass extends BaseClass
      * 5. 返回本次批量插入及处理后的汇总结果（带总重量）。
      *
      * 用于订单商品整体替换的核心业务方法。
+     * @param $orderSn
+     * @param $products
+     * @param null $post
+     * @param bool $stockMayChange
+     * @param array $moreParams
+     * @return array|void
+     * @throws \Exception
      */
     public static function replaceItem($orderSn, $products, $post = null, $stockMayChange = false, $moreParams = [])
     {
-        $customId = $post['customId'] ?? 0;
+        $customId = intval($post['customId']);
         $custom = CustomClass::getById($customId, true);
+        if (empty($custom)) {
+            return util::fail('没有找到客户');
+        }
+
         $level = $custom->level ?? 0;
         $live = isset($custom->live) ? $custom->live : 1;
         $respond = ProductClass::formatProductInfo($products, $level, $live, $moreParams);

biz-ghs/order/services/OrderService.php

@@ -22,15 +22,12 @@ use bizGhs\order\classes\OrderSendClass;
 use bizGhs\product\classes\ProductClass;
 use bizGhs\shop\classes\MainClass;
 use bizGhs\shop\classes\ShopMoneyChangeClass;
-use bizGhs\shop\classes\ShopMoneyClass;
 use bizGhs\stat\classes\StatYjClass;
-use bizGhs\ws\services\WsService;
 use bizHd\cg\services\CgRefundService;
 use bizHd\purchase\services\PurchaseService;
 use bizHd\stat\classes\StatIncomeClass;
 use bizHd\stat\classes\StatOrderClass;
 use common\components\dict;
-use common\components\noticeUtil;
 use common\components\util;
 use bizHd\purchase\classes\PurchaseClass;
 use common\components\stringUtil;
@@ -401,7 +398,6 @@ class OrderService extends BaseService
             }
         }
         return $returnOrder;
-
     }
 
     //自取免配送流程处理 ssh 2021.1.24

biz-ghs/product/classes/ProductClass.php

@@ -2812,7 +2812,12 @@ class ProductClass extends BaseClass
         return true;
     }
 
-    // 限购处理
+    /**
+     * 限购处理
+     * @param $product
+     * @param $customId
+     * @param $num
+     */
     public static function handleLimitBuy($product, $customId, $num)
     {
         $limitBuy = $product['limitBuy'];
@@ -2913,7 +2918,7 @@ class ProductClass extends BaseClass
     public static function getHasLimitBuyList($product)
     {
         $productId = $product->id;
-        $limitBuy = $product->limitBuy ?? 0;
+        $limitBuy = $product->limitBuy;
         $limitKey = self::LIMIT_BUY_KEY . $productId;
         $arr = Yii::$app->redis->executeCommand('HKEYS', [$limitKey]);
         $customList = [];
@@ -2925,15 +2930,18 @@ class ProductClass extends BaseClass
                 $numMap[$customId] = $num;
                 $ids[] = $customId;
             }
+
+            $specialPrice = ($product['hjDiscountPrice'] > 0 && $product['discountPrice'] > 0 && $product['skDiscountPrice'] > 0); // 销售花材是否开启特价
             $customList = CustomClass::getAllByCondition(['id' => ['in', $ids]], null, '*');
             foreach ($customList as $key => $val) {
                 $customId = $val['id'];
                 $num = $numMap[$customId] ?? 0;
                 $customList[$key]['hasLimitBuyNum'] = $num;
-                $customList[$key]['hasReachLimitBuyNum'] = $num >= $limitBuy ? 1 : 0;
+                $customList[$key]['reachLimitBuyNum'] = $num >= $limitBuy ? 1 : 0;
                 $avatar = $val['avatar'] ?? '';
                 $smallAvatar = imgUtil::groupImg($avatar);
                 $customList[$key]['smallAvatar'] = $smallAvatar . "?x-oss-process=image/resize,m_fill,h_80,w_80";
+                $customList[$key]['specialPrice'] = $specialPrice;
             }
         }
         return $customList;

biz-hd/product/classes/ProductClass.php

@@ -501,15 +501,18 @@ class ProductClass extends BaseClass
                 $numMap[$customId] = $num;
                 $ids[] = $customId;
             }
+
+            $specialPrice = ($product['hjDiscountPrice'] > 0 && $product['discountPrice'] > 0 && $product['skDiscountPrice'] > 0); // 销售花材是否开启特价
             $customList = CustomClass::getAllByCondition(['id' => ['in', $ids]], null, '*');
             foreach ($customList as $key => $val) {
                 $customId = $val['id'];
                 $num = $numMap[$customId] ?? 0;
                 $customList[$key]['hasLimitBuyNum'] = $num;
-                $customList[$key]['hasReachLimitBuyNum'] = $num >= $limitBuy ? 1 : 0;
+                $customList[$key]['reachLimitBuyNum'] = $num >= $limitBuy ? 1 : 0;
                 $avatar = $val['avatar'] ?? '';
                 $smallAvatar = imgUtil::groupImg($avatar);
                 $customList[$key]['smallAvatar'] = $smallAvatar . "?x-oss-process=image/resize,m_fill,h_80,w_80";
+                $customList[$key]['specialPrice'] = $specialPrice;
             }
         }
         return $customList;

biz-hd/purchase/services/PurchaseService.php

@@ -11,9 +11,7 @@ use biz\stat\classes\StatCgGhsClass;
 use biz\stat\classes\StatOutClass;
 use bizGhs\custom\classes\CustomClass;
 use bizGhs\order\classes\OrderClass;
-use bizGhs\order\classes\OrderItemClass;
 use bizGhs\order\services\OrderService;
-use bizGhs\product\classes\ProductClass;
 use bizHd\base\services\BaseService;
 use bizHd\cg\classes\CgRefundClass;
 use bizHd\purchase\classes\PurchaseClass;

biz/product/classes/ProductClass.php

@@ -3,7 +3,6 @@
 namespace biz\product\classes;
 
 use biz\base\classes\BaseClass;
-use bizGhs\item\classes\ItemClassClass;
 
 class ProductClass extends BaseClass
 {