Merge branch 'xj'

app-ghs/controllers/XjController.php

@@ -11,21 +11,6 @@ use Yii;
 class XjController extends BaseController
 {
 
-    //删除选项 ssh 20230728
-    public function actionDelItem()
-    {
-        $get = Yii::$app->request->get();
-        $id = $get['id'] ?? 0;
-        $xj = XjClass::getById($id, true);
-        if (empty($xj) || $xj->mainId != $this->mainId) {
-            util::fail('删除失败');
-        }
-        $xj->delStatus = 1;
-        $xj->status = 2;
-        $xj->save();
-        util::complete();
-    }
-
     //修改多颜色名称 ssh 20220107
     public function actionChangeXjName()
     {
@@ -133,19 +118,6 @@ class XjController extends BaseController
         util::complete('保存成功');
     }
 
-    //清除全部小菊  lqh 2021.12.8
-    public function actionClearAll()
-    {
-        $get = Yii::$app->request->get();
-        $itemId = $get['itemId'] ?? 0;
-        $product = ItemClass::getById($itemId, true);
-        if ($product->mainId != $this->mainId) {
-            util::fail('不是您的花材');
-        }
-        XjClass::clearAll($itemId);
-        util::complete('已删除');
-    }
-
     //新增小菊 lqh 2021.12.8
     public function actionBatchAdd()
     {
@@ -167,4 +139,61 @@ class XjController extends BaseController
         util::complete('添加成功');
     }
 
-}
+    //删除选项 ssh 20230728
+    public function actionDelItem()
+    {
+        $get = Yii::$app->request->get();
+        $id = $get['id'] ?? 0;
+        $xj = XjClass::getById($id, true);
+        if (empty($xj) || $xj->mainId != $this->mainId) {
+            util::fail('删除失败');
+        }
+        $xj->delStatus = 1;
+        $xj->status = 2;
+        $xj->save();
+
+        $itemId = $xj->itemId ?? 0;
+        $delList = XjClass::getAllByCondition(['itemId' => $itemId, 'delStatus' => 1], null, '*', null, true);
+        //超过2个月，多颜色订单就不能售后，超过3个月多颜色的花材就要删除掉，多处要同步修改，关键词 xj_global_change ssh 20251230
+        if(!empty($delList)){
+            $threeMonthsAgo = time() - (90 * 24 * 60 * 60); // 3个月前的时间戳
+            foreach ($delList as $item) {
+                $updateTime = strtotime($item->updateTime); // 将时间转换为时间戳
+                // 判断 updateTime 是否超过 3 个月
+                if ($updateTime < $threeMonthsAgo) {
+                    $item->delete();
+                }
+            }
+        }
+
+        util::complete();
+    }
+
+    //清除全部小菊  lqh 2021.12.8
+    public function actionClearAll()
+    {
+        $get = Yii::$app->request->get();
+        $itemId = $get['itemId'] ?? 0;
+        $product = ItemClass::getById($itemId, true);
+        if ($product->mainId != $this->mainId) {
+            util::fail('不是您的花材');
+        }
+        XjClass::updateByCondition(['itemId' => $itemId], ['status' => 2, 'delStatus' => 1]);
+
+        $delList = XjClass::getAllByCondition(['itemId' => $itemId, 'delStatus' => 1], null, '*', null, true);
+        //超过2个月，多颜色订单就不能售后，超过3个月多颜色的花材就要删除掉，多处要同步修改，关键词 xj_global_change ssh 20251230
+        if(!empty($delList)){
+            $threeMonthsAgo = time() - (90 * 24 * 60 * 60); // 3个月前的时间戳
+            foreach ($delList as $item) {
+                $updateTime = strtotime($item->updateTime); // 将时间转换为时间戳
+                // 判断 updateTime 是否超过 3 个月
+                if ($updateTime < $threeMonthsAgo) {
+                    $item->delete();
+                }
+            }
+        }
+
+        util::complete('已删除');
+    }
+
+}

biz-ghs/order/classes/OrderClass.php

@@ -1303,7 +1303,7 @@ class OrderClass extends BaseClass
                     $currentItemId = $val['id'] ?? 0;
                     $xjList = OrderXjClass::getAllByCondition(['itemId' => $currentItemId], null, '*');
                     if (!empty($xjList)) {
-                        //选了有颜色的小菊才把原小菊删除不显示出来
+                        //选了有颜色的小菊才把原小菊删除不显示出来！！！
                         unset($list[$key]);
                         foreach ($xjList as $xjKey => $xj) {
                             $xjBase = $val;
@@ -1379,6 +1379,9 @@ class OrderClass extends BaseClass
         $adminIds = array_unique(array_filter(array_column($list, 'adminId')));
         $adminInfo = AdminClass::getAdminByIds($adminIds, null, 'id');
 
+        //退款需要显示原有的花材结构，不显示小菊的多颜色
+        $getOriginalItem = Yii::$app->request->get('getOriginalItem', 0);
+        $getOriginalItem2 = Yii::$app->request->post('getOriginalItem', 0);
 
         $customIds = array_column($list, 'customId');
         $customIds = array_unique(array_filter($customIds));
@@ -1395,9 +1398,6 @@ class OrderClass extends BaseClass
             //为了列表页的打印按钮能用，列表也强制显示花材
             $showItem = true;
 
-            //退款需要显示原有的花材结构，不显示小菊的多颜色
-            $getOriginalItem = Yii::$app->request->get('getOriginalItem', 0);
-            $getOriginalItem2 = Yii::$app->request->post('getOriginalItem', 0);
             if ($getOriginalItem == 1 || $getOriginalItem2 == 1) {
                 $showItemData = self::getOriginalShowItem($showItem, $val);
             } else {
@@ -1426,7 +1426,7 @@ class OrderClass extends BaseClass
             $list[$key]['sendTypeName'] = self::$sendTypeMap[$val['sendType']] ?? '未知';
             $list[$key]['expressProgress'] = $expressProgress;
             $list[$key]['customAvatarUrl'] = imgUtil::groupImg($val['customAvatar']);
-            $list[$key]['customName'] = isset($val['customId']) && !empty($val['customId']) ? $val['customName'] : '散客';
+            $list[$key]['customName'] = !empty($val['customId']) ? $val['customName'] : '散客';
 
             $customId = $val['customId'] ?? '';
             $debtAmount = $customInfoList[$customId]['debtAmount'] ?? 0.00;

biz/product/classes/XjClass.php

@@ -44,14 +44,6 @@ class XjClass extends BaseClass
         return $list;
     }
 
-    //清除花材所有颜色
-    public static function clearAll($itemId)
-    {
-        $where = ['itemId' => $itemId];
-        $data = ['status' => 2, 'delStatus' => 1];
-        return self::updateByCondition($where, $data);
-    }
-
     // 获取当前门店小菊的总数
     public static function getXjCount($shopId)
     {