shish hace 5 años
padre
commit
463a9f5353

+ 54 - 0
app-hd/controllers/MainController.php

@@ -103,4 +103,58 @@ class MainController extends BaseController
         util::success($data);
     }
 
+    //经营概况 ssh 2021.1.27
+    public function actionProfile()
+    {
+        $base = [
+            'balance' => 5020.00,
+            'mayGathering' => 10,
+            'mayPay' => 20,
+            'stockCost' => 2000,
+            'stockNum' => 100,
+            'stockWarning' => 5,
+            'today' => 90,
+            'todayCompareYesterday' => -5,
+            'latestSeven' => 9000,
+            'latestSevenSameTerm' => 10,
+            'latestThirty' => 8000,
+            'latestThirtySameTerm' => -9,
+        ];
+        $more = [
+            'today' => [
+                'income' => 10,
+                'expend' => 2,
+                'saleNum' => 1,
+                'saleAmount' => 100,
+                'purchaseNum' => 2,
+                'purchaseAmount' => 3,
+            ],
+            'yesterday' => [
+                'income' => 10,
+                'expend' => 2,
+                'saleNum' => 1,
+                'saleAmount' => 100,
+                'purchaseNum' => 2,
+                'purchaseAmount' => 3,
+            ],
+            'latestSeven' => [
+                'income' => 10,
+                'expend' => 2,
+                'saleNum' => 1,
+                'saleAmount' => 100,
+                'purchaseNum' => 2,
+                'purchaseAmount' => 3,
+            ],
+            'latestThirty' => [
+                'income' => 10,
+                'expend' => 2,
+                'saleNum' => 1,
+                'saleAmount' => 100,
+                'purchaseNum' => 2,
+                'purchaseAmount' => 3,
+            ],
+        ];
+        util::success(['base' => $base, 'more' => $more]);
+    }
+
 }

+ 5 - 0
biz-ghs/shop/services/ShopAdminService.php

@@ -69,6 +69,9 @@ class ShopAdminService extends BaseService
         if (empty($admin)) {
             util::fail('员工信息无效');
         }
+        if (isset($admin['subscribe']) == false || $admin['subscribe'] != 1) {
+            util::fail("请关注公众号");
+        }
         $roleId = $source['roleId'];
         $remind = isset($source['remind']) ? $source['remind'] : 0;
         $status = isset($source['status']) ? $source['status'] : 0;
@@ -83,6 +86,8 @@ class ShopAdminService extends BaseService
             'remind' => $remind,
             'status' => $status,
             'merchantId' => $merchantId,
+            'adminName' => $adminName,
+            'mobile'=>$mobile,
         ];
         ShopAdminClass::delBindAdminData($shopId, $recommendAdminId);
         return ShopAdminClass::add($addData);

+ 5 - 0
biz-hd/admin/services/ShopAdminService.php

@@ -64,6 +64,9 @@ class ShopAdminService extends BaseService
         if (empty($admin)) {
             util::fail('没有找到管理员信息');
         }
+        if (isset($admin['subscribe']) == false || $admin['subscribe'] != 1) {
+            util::fail("请关注公众号({$admin['id']})");
+        }
         $roleId = $bindData['roleId'];
         $remind = isset($bindData['remind']) ? $bindData['remind'] : 0;
         $status = isset($bindData['status']) ? $bindData['status'] : 0;
@@ -78,6 +81,8 @@ class ShopAdminService extends BaseService
             'remind' => $remind,
             'status' => $status,
             'merchantId' => $merchantId,
+            'adminName' => $adminName,
+            'mobile' => $mobile,
         ];
         ShopAdminClass::delBindAdminData($shopId, $recommendAdminId);
         return ShopAdminClass::add($addData);