Merge branch 'master' into dev

app-hd/controllers/OrderController.php

@@ -601,6 +601,12 @@ class OrderController extends BaseController
             if ($hasPay != 1) {
                 util::fail('售后付款单只能走线下转账');
             }
+            $historyDate = $post['historyDate'] ?? '';
+            if (!empty($historyDate)) {
+                if ($historyDate != date("Y-m-d")) {
+                    util::fail('售后付款单不能修改账单日期，只能今天');
+                }
+            }
         } else {
             //如果不是售后付款单，并且选的不是余额支付，余额又够付当前订单，则自动切到余额支付
             $balance = $custom->balance ?? 0;

app-hd/controllers/RechargeController.php

@@ -9,6 +9,7 @@ use biz\shop\classes\ShopClass;
 use biz\sj\classes\SjClass;
 use bizGhs\custom\classes\CustomClass;
 use bizHd\custom\classes\HdClass;
+use bizHd\member\classes\MemberWealClass;
 use bizHd\order\classes\OrderClass;
 use bizHd\order\classes\SettleClass;
 use bizHd\wx\classes\WxOpenClass;
@@ -55,6 +56,11 @@ class RechargeController extends BaseController
     //获取扫码充值的小程序码 ssh 20250307
     public function actionGetRechargeCode()
     {
+
+        $shopId = $this->shopId;
+        $recharge = MemberWealClass::getAllByCondition(['shopId' => $shopId], 'recharge asc', '*', null, true);
+        //这里取前面三个放在海报里，对应表名是 xhMemberRecharge 不是 MemberWeal
+
         $merchant = WxOpenClass::getMallWxInfo();
         $page = 'pages/member/recharge';
         $ptStyle = dict::getDict('ptStyle', 'mall');

biz-hd/order/classes/OrderClass.php

@@ -255,9 +255,13 @@ class OrderClass extends BaseClass
 
         $sendType = $data['sendType'] ?? 0;
         if ($sendType == 1) {
-            //到店自取，默认当天23点前，没有用，为了方便查询排序
-            $data['reachDate'] = date("Y-m-d");
-            $data['reachPeriod'] = '22:00';
+            //到店自取，客户自己下单，不会有到店自取时间，但是如果是花店后台接单，会填到店自取时间，重要！！！！！！！！阿东那边已经出问题了！！！
+            if (empty($data['reachDate'])) {
+                $data['reachDate'] = date("Y-m-d");
+            }
+            if (empty($data['reachPeriod'])) {
+                $data['reachPeriod'] = '22:00';
+            }
         } else {
             //如果不是到店自取的，则必须要有配送时间，默认当天
             $data['reachDate'] = !empty($data['reachDate']) ? $data['reachDate'] : date("Y-m-d");
@@ -396,7 +400,7 @@ class OrderClass extends BaseClass
     }
 
     //订单完成 ssh 2021.4.20
-    public static function payAfter($order, $payWay)
+    public static function payAfter($order, $payWay, $params)
     {
         if (empty($order)) {
             util::fail('没有找到订单');
@@ -436,7 +440,11 @@ class OrderClass extends BaseClass
         $order->status = self::ORDER_STATUS_UN_SEND; // 付款后，订单状态设置为：已付款(待配送)
         $order->payWay = $payWay;
         $order->payStatus = 1;
-        $order->payTime = date("Y-m-d H:i:s");
+        if (!empty($params['historyDate'])) {
+            $order->payTime = $params['historyDate'] . ' ' . date("H:i:s");
+        } else {
+            $order->payTime = date("Y-m-d H:i:s");
+        }
         $order->stockChange = 1;
         $order->save();
 

biz-hd/order/services/OrderService.php

@@ -279,9 +279,13 @@ class OrderService extends BaseService
 
         //欠款、已付款、余额支付的直接完成，另外客服下的单要走配送流程，所以是待配送状态
         if (in_array($hasPay, [dict::getDict('hasPay', 'payed'), dict::getDict('hasPay', 'debt'), dict::getDict('hasPay', 'balance')])) {
-            OrderClass::payAfter($returnOrder, $payWay);
+            $params = [];
+            if (!empty($data['historyDate'])) {
+                //后台开单传账单日期
+                $params['historyDate'] = $data['historyDate'];
+            }
+            OrderClass::payAfter($returnOrder, $payWay, $params);
         }
-
         return $returnOrder;
     }
 

biz/wx/classes/WxMessageClass.php

@@ -789,7 +789,7 @@ class WxMessageClass extends BaseClass
                 "data" => [
                     "first" => ["value" => "您有新的收入。", "color" => "#173177"],
                     "keyword1" => ["value" => $actPrice, "color" => "#173177"],
-                    "keyword2" => ["value" => '门店收入', "color" => "#173177"],
+                    "keyword2" => ["value" => '二维码收款', "color" => "#173177"],
                     "keyword3" => ["value" => date("Y-m-d H:i"), "color" => "#173177"],
                     "remark" => ["value" => "点击查看详情", "color" => "#173177"]
                 ]