需求按钮状态优化

backend/application/common/command/DemandDeal.php

@@ -96,7 +96,7 @@ class DemandDeal extends Command
                     Db::transaction(function () use ($item) {
                         //根据订单列表查找冻结金额日志，根据冻结日志解冻冻结金额到余额
                         $userId = $item->winBidding->user_id;
-                        $settleTotalAmount = 0;
+                        $settleTotalAmount = '0';
                         foreach ($item->orders as $order) {
                             $logWhere = [
                                 'user_id' => $userId,
@@ -109,7 +109,7 @@ class DemandDeal extends Command
                             $log = AccountLogService::where($logWhere)->find();
                             if ($log) {
                                 $amount = $log->amount;
-                                $settleTotalAmount += $amount;
+                                $settleTotalAmount = bcadd($settleTotalAmount, (string)$amount, 2);
                                 //写入余额日志
                                 $title = OrderService::ORDER_TYPE_MAP[$order->order_type] ?? '需求收益';
                                 $log_res = AccountLogService::addLog(AccountLogService::ACCOUNT_TYPE_FREEZE, $userId, $amount, $title . '解冻-冻结金额扣除', AccountLogService::TYPE_UNFREEZE, 0, AccountLogService::INC_EXP_EXPEND, $order->id, $order->total_amount);
@@ -134,7 +134,7 @@ class DemandDeal extends Command
                         $msgData = [
                             'values' => [
                                 $item->parent_order_no,
-                                round($settleTotalAmount, 2),
+                                $settleTotalAmount,
                                 SubscribeMessageService::MSG_MAP[SubscribeMessageService::MSG_TEMP_DEMAND_SETTLE]['remark'],
                             ]
                         ];

backend/application/common/service/DemandService.php

@@ -71,6 +71,7 @@ class DemandService
     const BUTTON_ACCEPT_PASSED = 'acceptPassed'; //验收通过
     const BUTTON_CONFIRM_RECEIPT = 'confirmReceipt'; //确认收货
     const BUTTON_DELIVER_GOODS = 'deliverGoods'; //开发者发货
+    const BUTTON_FINISHED = 'finished'; //交易完成，仅发布者和接单开发者可进入详情
 
     /**
      * 获取平台服务费比例（0~1），后台填写大于 1 时按百分比处理，如 10 表示 10%

backend/application/common/service/MessageService.php

@@ -69,11 +69,17 @@ class MessageService
         //按模板字段名组装可读内容：工单号：xxx；服务项目：xxx；...；备注：xxx
         $values = $msgData['values'] ?? [];
         $valueNames = $template['valueNames'] ?? [];
+        $fields = $template['fields'] ?? [];
         $lines = [];
         foreach ($valueNames as $key => $name) {
-            if (isset($values[$key]) && $values[$key] !== '') {
-                $lines[] = $name . '：' . $values[$key];
+            if (!isset($values[$key]) || $values[$key] === '') {
+                continue;
             }
+            $value = $values[$key];
+            if (strpos($fields[$key] ?? '', 'amount') === 0) {
+                $value = SubscribeMessageService::formatAmount($value);
+            }
+            $lines[] = $name . '：' . $value;
         }
         // 备注处理：避免正文出现两行「备注」或语义冲突
         // 1) 模板字段里已含「备注」时，发送方自定义了备注文案，不再追加模板默认 remark

backend/application/common/service/SubscribeMessageService.php

@@ -58,7 +58,7 @@ class SubscribeMessageService
             'remark' => '该工单已结算完成',
             /*
             订单编号：200912162851392635fdbf4149
-            结算金额：99.9元
+            结算金额：￥99.9
             结算说明：订单已收货结算完成
             */
             'fields' => ['character_string4', 'amount1', 'thing2'],
@@ -231,11 +231,46 @@ class SubscribeMessageService
     public static function packData($template_id, $values): array
     {
         $fields = self::MSG_MAP[$template_id]['fields'] ?? [];
+        $param_data = [];
         foreach ($fields as $key => $field) {
-            $param_data[$field] = ['value' => $values[$key] ?? ''];
+            $value = $values[$key] ?? '';
+            //微信 amount 类型不带币种符号时会固定展示 5 位小数，如 2.37 显示成 2.37000
+            if (strpos($field, 'amount') === 0) {
+                $value = self::formatAmount($value);
+            }
+            $param_data[$field] = ['value' => $value];
         }
 
-        return $param_data ?? [];
+        return $param_data;
+    }
+
+    /**
+     * 订阅消息金额：最多两位小数，去掉末尾多余的 0，并加上币种符号。
+     * 微信 amount 类型不带币种符号时会把 2.37 展示成 2.37000。
+     * @param mixed $amount
+     * @return string 如 ￥2.37、￥2.3、￥2
+     */
+    public static function formatAmount($amount): string
+    {
+        if ($amount === '' || $amount === null || !is_numeric($amount)) {
+            return (string)$amount;
+        }
+        $number = (string)$amount;
+        if (stripos($number, 'e') !== false) {
+            $number = sprintf('%.8F', (float)$amount);
+        }
+        $negative = strncmp($number, '-', 1) === 0;
+        if ($negative) {
+            $number = substr($number, 1);
+        }
+        //先加 0.005 再截到 2 位，等价于四舍五入，避免 bcmath 直接截断
+        $rounded = bcadd($number, '0.005', 2);
+        $rounded = rtrim(rtrim($rounded, '0'), '.');
+        if ($rounded === '') {
+            $rounded = '0';
+        }
+
+        return '￥' . ($negative ? '-' : '') . $rounded;
     }
 
 }