bug修复

application/common/command/DemandDeal.php

@@ -123,7 +123,7 @@ class DemandDeal extends Command
                         $msgData = [
                             'values' => [
                                 $item->parent_order_no,
-                                $settleTotalAmount,
+                                round($settleTotalAmount, 2),
                                 SubscribeMessageService::MSG_MAP[SubscribeMessageService::MSG_TEMP_DEMAND_SETTLE]['remark'],
                             ]
                         ];

application/common/service/DemandGroupChatService.php

@@ -2,7 +2,7 @@
 
 namespace app\common\service;
 
-use app\common\model\Demand\group\Chat;
+use app\common\model\demand\group\Chat;
 use app\common\traits\ServiceTrait;
 use Exception;
 use GuzzleHttp\Exception\GuzzleException;

application/common/service/DemandService.php

@@ -546,7 +546,7 @@ class DemandService
                     '整体功能验收',
                     '验收通过',
                     SubscribeMessageService::MSG_MAP[SubscribeMessageService::MSG_TEMP_WORK_ACCEPT_RESULT]['remark'],
-                    '所有功能验收完成'
+                    '功能验收完成'
                 ]
             ];
             (new EasyWeChatService)->sendMsg($demand->winBidding->user_id, SubscribeMessageService::MSG_TEMP_WORK_ACCEPT_RESULT, $msgData);

application/common/service/OrderService.php

@@ -528,7 +528,7 @@ class OrderService
             ['orderNum' => 0, 'tabType' => OrderService::ORDER_STATUS_FINISHED],
             ['orderNum' => 0, 'tabType' => OrderService::ORDER_STATUS_REFUNDED],
         ];
-        $countList = self::where('user_id', $userId)->field('order_status, COUNT(*) as total')
+        $countList = self::where(['user_id' => $userId, 'order_type' => self::ORDER_TYPE_SOFTWARE])->field('order_status, COUNT(*) as total')
             ->group('order_status')
             ->select();
 

public/assets/js/backend/demand/biddings.js

@@ -49,6 +49,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     url: 'demand/biddings/win',
                                     success: function (data, ret) {
                                         Layer.alert(ret.msg + ",返回数据：" + JSON.stringify(data));
+                                        table.bootstrapTable('refresh');
                                         //如果需要阻止成功提示，则必须使用return false;
                                         //return false;
                                     },

public/assets/js/backend/demands.js

@@ -174,6 +174,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     success: function (data, ret) {
                                         console.log(data, ret);
                                         Layer.alert(ret.msg);
+                                        table.bootstrapTable('refresh');
                                         //如果需要阻止成功提示，则必须使用return false;
                                         //return false;
                                     },
@@ -191,7 +192,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     confirm: '确认取消需求？取消需求会结束需求流程并退回协商后的指定冻结金额，客户预付款和尾款会一起退回',
                                     url: 'demands/cancel',
                                     success: function (data, ret) {
-                                        Layer.alert(ret.msg + ",返回数据：" + JSON.stringify(data));
+                                        Layer.alert(ret.msg);
+                                        table.bootstrapTable('refresh');
                                         //如果需要阻止成功提示，则必须使用return false;
                                         //return false;
                                     },

public/assets/js/backend/orders.js

@@ -69,6 +69,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     url: 'orders/ship',
                                     success: function (data, ret) {
                                         Layer.alert(ret.msg);
+                                        table.bootstrapTable('refresh');
                                         //如果需要阻止成功提示，则必须使用return false;
                                         //return false;
                                     },