Merge branch 'zhongqi-cancelPresell'

app-ghs/controllers/ProductController.php

@@ -8,12 +8,10 @@ namespace ghs\controllers;
 
 use biz\admin\classes\AdminRoleClass;
 use biz\item\classes\PtItemClass;
-use biz\wx\classes\WxMessageClass;
 use bizGhs\book\classes\BookItemClass;
 use bizGhs\cp\classes\CpClass;
 use bizGhs\cp\classes\CpItemClass;
 use bizGhs\custom\classes\CustomClass;
-use bizGhs\item\classes\ItemClass;
 use bizGhs\item\classes\ItemClassClass;
 use bizGhs\item\classes\UnitChangeClass;
 use bizGhs\merchant\classes\ShopClass;

biz-ghs/custom/classes/CustomClass.php

@@ -10,6 +10,7 @@ use bizGhs\book\classes\BookItemCustomClass;
 use bizGhs\custom\models\Custom;
 use bizGhs\ghs\classes\GhsBalanceChangeClass;
 use bizGhs\shop\classes\MainClass;
+use bizGhs\shop\classes\ShopMoneyClass;
 use bizGhs\shop\classes\TotalDebtChangeClass;
 use bizGhs\ghs\classes\GhsBalanceClass;
 use bizGhs\ghs\classes\GhsRechargeClass;
@@ -429,6 +430,28 @@ class CustomClass extends BaseClass
             'remark' => $remark,
         ];
         GhsBalanceChangeClass::add($gbData, true);
+
+        // 现金充值，同步更新表 xhMain 的 money 字段
+        if ($payWay == 4) {
+            $m = \bizGhs\shop\classes\MainClass::getById($mainId, true, 'id, money');
+            $balance = $m->money;
+            $m->money = bcadd($m->money, $amount);
+            $m->save();
+
+            $event = $staffName . '存入' . $amount . '元';
+            $data = [
+                'amount' => $amount,
+                'balance' => $balance,
+                'io' => 1,
+                'mainId' => $mainId,
+                'capitalType' => $capitalType,
+                'ptStyle' => dict::getDict('ptStyle', 'ghs'),
+                'event' => $event,
+                'remark' => $remark,
+            ];
+            ShopMoneyClass::addData($data);
+        }
+
         return ['custom' => $custom, 'ghs' => $ghsInfo, 'customRecharge' => $cRecharge, 'ghsRecharge' => $gRecharge];
     }
 

console/controllers/ProductController.php

@@ -290,4 +290,26 @@ class ProductController extends Controller
         }
     }
 
+    //预售到期自动取消
+    public function actionCancelPresell()
+    {
+        $now = time(); //注意脚本执行时间不能是凌晨0点，否则会出问题，这个比较时间要修改为当前时间+1小时
+        $list = ProductClass::getAllByCondition(['presell' => 1], 'addTime DESC', 'id, presell, presellDate', null, true);
+        if (!empty($list)) {
+            foreach ($list as $item) {
+                $presellDate = $item->presellDate;
+                $dateArr = explode(',', $presellDate);
+                if (empty($dateArr)) {
+                    continue;
+                }
+                $firstDate = $dateArr[0];
+                $firstDate = strtotime($firstDate);
+                if ($firstDate < $now) {
+                    $item->presell = 0;
+                    $item->presellDate = '';
+                    $item->save();
+                }
+            }
+        }
+    }
 }