报销刷新

app-ghs/controllers/CpController.php

@@ -79,7 +79,7 @@ class CpController extends BaseController
         $post['staffName'] = $staffName;
         $shop = $this->shop;
         unset($post['id']);
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             CpClass::addCp($post, $shop);
@@ -102,7 +102,7 @@ class CpController extends BaseController
         if ($cp->mainId != $this->mainId) {
             util::fail('不是你的产品');
         }
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             unset($post['id']);
@@ -128,7 +128,7 @@ class CpController extends BaseController
         if (isset($cp->mainId) == false || $cp->mainId != $this->mainId) {
             util::fail('无法查看');
         }
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             CpClass::recoverCp($cp, $this->shop);
@@ -154,7 +154,7 @@ class CpController extends BaseController
         if (isset($cp->mainId) == false || $cp->mainId != $this->mainId) {
             util::fail('无法查看');
         }
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             CpClass::delCp($cp, $this->shop);

app-ghs/controllers/ExpendController.php

@@ -74,7 +74,7 @@ class ExpendController extends BaseController
         if ($postAmount <= 0) {
             util::fail('没有需要报销的金额');
         }
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             $list = ExpendClass::getAllByCondition(['mainId' => $this->mainId, 'bx' => 0, 'staffId' => $staffId], null, '*', null, true);
@@ -97,7 +97,7 @@ class ExpendController extends BaseController
             $bx->amount = $total;
             $bx->save();
             if (floatval($postAmount) != floatval($total)) {
-                util::fail('金额有问题，返回上页再进来');
+                util::fail('金额错误，请刷新页面');
             }
             $transaction->commit();
             util::complete();
@@ -193,7 +193,7 @@ class ExpendController extends BaseController
         if ($type == -1) {
             util::fail('请选择类型');
         }
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             $payWay = $post['payWay'] ?? 0;

app-ghs/controllers/LabelController.php

@@ -40,7 +40,7 @@ class LabelController extends BaseController
                 util::fail('标签已经添加过了：' . $currentLabel);
             }
         }
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             foreach ($arr as $epc) {

app-ghs/controllers/OrderController.php

@@ -1137,7 +1137,7 @@ class OrderController extends BaseController
             }
         }
 
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             $post['product'] = $productList;
@@ -1277,7 +1277,7 @@ class OrderController extends BaseController
         if (empty($productList)) {
             util::fail('请选择花材');
         }
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             //判断花材有效性
@@ -1338,7 +1338,7 @@ class OrderController extends BaseController
         if (empty($purchase)) {
             util::fail('没有找到采购单');
         }
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             $order->status = 5;
@@ -1381,7 +1381,7 @@ class OrderController extends BaseController
         if ($diff <= 60) {
             util::fail('1分钟后订单将自动取消');
         }
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         $orderSn = $purchase['orderSn'];
         try {

app-ghs/controllers/OrderItemController.php

@@ -60,7 +60,7 @@ class OrderItemController extends BaseController
         if ($order->status != 2) {
             util::fail('待发货订单才能修改');
         }
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             $addData = [];
@@ -149,7 +149,7 @@ class OrderItemController extends BaseController
         if ($delInfo->orderSn != $orderSn) {
             util::fail('这个花材你不能删除');
         }
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             OrderItemClass::delBookItem($order, $delId);
@@ -187,7 +187,7 @@ class OrderItemController extends BaseController
         if (floatval($order->actPrice) != 0) {
             util::fail('订单金额不是0');
         }
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             $staff = $this->shopAdmin;
@@ -238,7 +238,7 @@ class OrderItemController extends BaseController
             }
             $new[$id] = ['num' => $num, 'productId' => $id, 'price' => $price];
         }
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             $staff = $this->shopAdmin;
@@ -275,7 +275,7 @@ class OrderItemController extends BaseController
             util::fail('开发中');
         }
 
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
 

app-ghs/controllers/RechargeHbController.php

@@ -22,7 +22,7 @@ class RechargeHbController extends BaseController
     //保存红包内容 ssh 20210930
     public function actionSaveHb()
     {
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
 
         util::fail('已停用');

app-ghs/controllers/RefundController.php

@@ -139,7 +139,7 @@ class RefundController extends BaseController
             }
         }
 
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             RefundOrderService::passRefund($refund);
@@ -198,7 +198,7 @@ class RefundController extends BaseController
         $refund = RefundOrderClass::getById($id, true);
         RefundOrderClass::valid($refund, $this->mainId);
 
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
 
@@ -278,7 +278,7 @@ class RefundController extends BaseController
         $adminName = $shopAdmin['name'] ?? '';
         $post['shopAdminName'] = $adminName;
 
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
 

app-ghs/controllers/ShopMoneyController.php

@@ -22,7 +22,7 @@ class ShopMoneyController extends BaseController
             util::fail('请填写金额');
         }
 
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
 
@@ -57,7 +57,7 @@ class ShopMoneyController extends BaseController
         if (isset($staff->super) == false || $staff->super != 1) {
             util::fail('没有权限');
         }
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             $get = Yii::$app->request->get();

app-ghs/controllers/UserController.php

@@ -158,7 +158,7 @@ class UserController extends BaseController
         $now = time();
         $date = date("Y-m-d H:i", $now);
 
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
 

app-ghs/controllers/WastageController.php

@@ -66,7 +66,7 @@ class WastageController extends BaseController
                 util::fail('小单位不能报损');
             }
         }
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             //判断花材有效性

app-hd/controllers/CustomController.php

@@ -74,7 +74,7 @@ class CustomController extends BaseController
     public function actionBatchAddCustom()
     {
         $post = Yii::$app->request->post();
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             for ($i = 1; $i <= 5; $i++) {
@@ -246,7 +246,7 @@ class CustomController extends BaseController
         $now = time();
         $date = date("Y-m-d H:i", $now);
 
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
 

app-hd/controllers/MtController.php

@@ -57,7 +57,7 @@ class MtController extends PublicController
         }
         Yii::info('confirmOrderData: ' . json_encode($post));
 
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             $shopId = $post['app_poi_code'] ?? '';
@@ -112,7 +112,7 @@ class MtController extends PublicController
         return Json::encode(['data' => 'ok']);
 
         $post = Yii::$app->request->post();
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             if (isset($post['retail_data']) == false) {
@@ -293,7 +293,7 @@ class MtController extends PublicController
         return Json::encode(['data' => 'ok']);
 
         $post = Yii::$app->request->post();
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             if (isset($post['retail_data']) == false) {
@@ -432,7 +432,7 @@ class MtController extends PublicController
         }
         Yii::info('confirmOrderData: ' . json_encode($post));
 
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             $shopId = $post['app_poi_code'] ?? '';
@@ -609,7 +609,7 @@ class MtController extends PublicController
 
         Yii::info('cancelOrderData: ' . json_encode($post));
 
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
 

app-hd/controllers/ProductController.php

@@ -372,7 +372,7 @@ class ProductController extends BaseController
         if ($black == 2) {
             util::fail('暂无花材');
         }
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             //获取所有当前供货商的分类 （全部、常用）
@@ -434,7 +434,7 @@ class ProductController extends BaseController
         if ($black == 2) {
             util::fail('暂无花材');
         }
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             //获取所有当前供货商的分类 （全部、常用）

app-hd/controllers/PurchaseController.php

@@ -225,7 +225,7 @@ class PurchaseController extends BaseController
             util::fail('不能跟自己的店买花');
         }
 
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             $post['book'] = $post['book'] ?? 0;
@@ -553,7 +553,7 @@ class PurchaseController extends BaseController
         if (isset($custom['debt']) == false || $custom['debt'] == CustomClass::IS_DEBT_NO) {
             util::fail('请先申请赊账权限');
         }
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             //延期支付
@@ -687,7 +687,7 @@ class PurchaseController extends BaseController
         }
 
         PurchaseService::valid($info, $this->shopId);
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             //余额支付

app-hd/controllers/RefundController.php

@@ -145,7 +145,7 @@ class RefundController extends BaseController
     {
         $get = Yii::$app->request->get();
 
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             $id = $get['id'] ?? 0;

app-hd/controllers/ShopMoneyController.php

@@ -23,7 +23,7 @@ class ShopMoneyController extends BaseController
             util::fail('请填写金额');
         }
 
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             $mainId = $this->mainId;
@@ -59,7 +59,7 @@ class ShopMoneyController extends BaseController
             util::fail('请填写金额');
         }
 
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             $mainId = $this->mainId;

app-hd/controllers/UserController.php

@@ -187,7 +187,7 @@ class UserController extends BaseController
         $now = time();
         $date = date("Y-m-d H:i", $now);
 
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
 

app-hd/controllers/WorkController.php

@@ -241,7 +241,7 @@ class WorkController extends BaseController
     {
         $post = Yii::$app->request->post();
         $workId = $post['id'] ?? 0;
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             $work = WorkClass::getById($workId, true);

app-hd/controllers/WorkItemController.php

@@ -67,7 +67,7 @@ class WorkItemController extends BaseController
             util::fail('制作单已取消');
         }
 
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
 

biz-ghs/order/services/OrderService.php

@@ -601,7 +601,7 @@ class OrderService extends BaseService
     //订单归类
     public static function classify($id, $categoryId, $usageId)
     {
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             $order = OrderClass::getById($id, true);

biz-hd/goods/services/GoodsService.php

@@ -74,7 +74,7 @@ class GoodsService extends BaseService
     //保存花材组合
     public static function saveItemGroup($order, $items, $classId, $name, $adminId)
     {
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         $now = date('Y-m-d H:i:s');
         try {

biz-hd/order/services/OrderService.php

@@ -449,7 +449,7 @@ class OrderService extends BaseService
     //订单归类
     public static function classify($id, $categoryId, $usageId)
     {
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             $order = OrderClass::getById($id, true);

biz-hd/user/classes/UserClass.php

@@ -222,7 +222,7 @@ class UserClass extends BaseClass
     //合并用户
     public static function mergeUser($delUser, $retainUser)
     {
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
 

biz-mall/admin/classes/AdminClass.php

@@ -238,7 +238,7 @@ class AdminClass extends BaseClass
     //合并管理员
     public static function mergeAdmin($delAdmin, $retainAdmin)
     {
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
 

biz-mall/order/services/OrderService.php

@@ -314,7 +314,7 @@ class OrderService extends BaseService
     //订单归类
     public static function classify($id, $categoryId, $usageId)
     {
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             $order = OrderClass::getById($id, true);

biz-mall/user/classes/UserClass.php

@@ -198,7 +198,7 @@ class UserClass extends BaseClass
     //合并用户
     public static function mergeUser($delUser, $retainUser)
     {
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
 

common/services/xhMerchantAssetService.php

@@ -121,7 +121,7 @@ class xhMerchantAssetService
             return false;
         }
         foreach ($all as $merchant) {
-            $connection = Yii::$app->db;//事务处理
+            $connection = Yii::$app->db;
             $transaction = $connection->beginTransaction();
             try {
                 $sjId = $merchant['id'];

common/services/xhPayToolService.php

@@ -131,7 +131,7 @@ class xhPayToolService
      */
     public static function basePay($callbackParams, $orderSn, $totalFee, $capitalType, $couponId, $payWay, $alipayParams = [])
     {
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             $capitalTypeList = dict::getDict('capitalType');//流水类型列表

common/services/xhRechargeService.php

@@ -51,7 +51,7 @@ class xhRechargeService
         //充值暂时算到默认门店
         $shopId = ShopClass::getDefaultShopId($merchant);
 
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             $payWay = 5;//小程序支付
@@ -136,7 +136,7 @@ class xhRechargeService
 
     public static function recharge($rechargeAmount, $user, $adminId, $merchant, $merchantExtend, $merchantAsset)
     {
-        $connection = Yii::$app->db;//事务处理
+        $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             $sjId = $merchant['id'];

console/controllers/PdController.php

@@ -24,7 +24,7 @@ class PdController extends Controller
                 $shopId = $item->shopId ?? 0;
                 $addTime = $item->addTime ?? '';
 
-                $connection = Yii::$app->db;//事务处理
+                $connection = Yii::$app->db;
                 $transaction = $connection->beginTransaction();
 
                 try {

console/controllers/PurchaseController.php

@@ -36,7 +36,7 @@ class PurchaseController extends Controller
         foreach ($query->batch() as $purchases) {
 
             foreach ($purchases as $purchase) {
-                $connection = Yii::$app->db;//事务处理
+                $connection = Yii::$app->db;
                 $transaction = $connection->beginTransaction();
                 $id = $purchase['id'] ?? 0;
                 $orderSn = $purchase['orderSn'] ?? '';
@@ -88,7 +88,7 @@ class PurchaseController extends Controller
         $arr = [];
         foreach ($query->batch() as $purchases) {
             foreach ($purchases as $purchase) {
-                $connection = Yii::$app->db;//事务处理
+                $connection = Yii::$app->db;
                 $transaction = $connection->beginTransaction();
                 $id = $purchase['id'] ?? 0;
                 $orderSn = $purchase['orderSn'] ?? '';