chenxiqiang пре 6 година
родитељ
комит
6d9ff1446f

+ 4
- 3
manage-server/app/Http/Controllers/HouseApplianceCleanOrderController.php Прегледај датотеку

@@ -16,8 +16,9 @@ class HouseApplianceCleanOrderController extends Controller
16 16
     public function store(Request $request)
17 17
     {
18 18
         $id = $request->input('id');
19
-        $user = session('wechat.oauth_user.default');
20
-        $wechat_id = $user->getId();
19
+        //$user = session('wechat.oauth_user.default');
20
+        //$wechat_id = $user->getId();
21
+        $wechat_id = $request->input("openid");
21 22
         $appliances = $request->input('appliances');
22 23
         $address = $request->input('address');
23 24
         $contact = $request->input('contact');
@@ -32,7 +33,7 @@ class HouseApplianceCleanOrderController extends Controller
32 33
             $houseApplianceCleanOrder = new HouseApplianceCleanOrder;
33 34
             $houseApplianceCleanOrder->status = 0;
34 35
         }
35
-        if ($user && $appliances && $address && $contact && $phone) {
36
+        if ($wechat_id && $appliances && $address && $contact && $phone) {
36 37
             $houseApplianceCleanOrder->appliances = join(", ", $appliances);
37 38
             $houseApplianceCleanOrder->address = $address;
38 39
             $houseApplianceCleanOrder->contact = $contact;

+ 4
- 3
manage-server/app/Http/Controllers/HouseCleanOrderController.php Прегледај датотеку

@@ -16,8 +16,9 @@ class HouseCleanOrderController extends Controller
16 16
     public function store(Request $request)
17 17
     {
18 18
         $id = $request->input('id');
19
-        $user = session('wechat.oauth_user.default');
20
-        $wechat_id = $user->getId();
19
+        //$user = session('wechat.oauth_user.default');
20
+        //$wechat_id = $user->getId();
21
+        $wechat_id = $request->input("openid");
21 22
         $type = $request->input('type');
22 23
         $area = $request->input('area');
23 24
         $picture1 = $request->input('picture1');
@@ -38,7 +39,7 @@ class HouseCleanOrderController extends Controller
38 39
             $houseCleanOrder = new HouseCleanOrder;
39 40
             $houseCleanOrder->status = 0;
40 41
         }
41
-        if ($user && $type && $area && $address && $contact && $phone) {
42
+        if ($wechat_id && $type && $area && $address && $contact && $phone) {
42 43
             $houseCleanOrder->type = $type;
43 44
             $houseCleanOrder->area = $area;
44 45
             $houseCleanOrder->address = $address;

+ 4
- 3
manage-server/app/Http/Controllers/HousekeeperOrderController.php Прегледај датотеку

@@ -16,8 +16,9 @@ class HousekeeperOrderController extends Controller
16 16
     public function store(Request $request)
17 17
     {
18 18
         $id = $request->input('id');
19
-        $user = session('wechat.oauth_user.default');
20
-        $wechat_id = $user->getId();
19
+        //$user = session('wechat.oauth_user.default');
20
+        //$wechat_id = $user->getId();
21
+        $wechat_id = $request->input("openid");
21 22
         $contents = $request->input('contents');
22 23
         $people_num = $request->input('people_num');
23 24
         $server_time = $request->input('server_time');
@@ -37,7 +38,7 @@ class HousekeeperOrderController extends Controller
37 38
             $housekeeperOrder = new HousekeeperOrder;
38 39
             $housekeeperOrder->status = 0;
39 40
         }
40
-        if ($user && $contents && $people_num && $server_time && $rest && $area && $address && $contact && $phone) {
41
+        if ($wechat_id && $contents && $people_num && $server_time && $rest && $area && $address && $contact && $phone) {
41 42
             $housekeeperOrder->contents = $contents;
42 43
             $housekeeperOrder->people_num = $people_num;
43 44
             $housekeeperOrder->server_time = $server_time;

+ 4
- 3
manage-server/app/Http/Controllers/MaternityMatronOrderController.php Прегледај датотеку

@@ -16,8 +16,9 @@ class MaternityMatronOrderController extends Controller
16 16
     public function store(Request $request)
17 17
     {
18 18
         $id = $request->input('id');
19
-        $user = session('wechat.oauth_user.default');
20
-        $wechat_id = $user->getId();
19
+        //$user = session('wechat.oauth_user.default');
20
+        //$wechat_id = $user->getId();
21
+        $wechat_id = $request->input("openid");
21 22
         $level = $request->input('level');
22 23
         $expected_date = $request->input('expected_date');
23 24
         $special_demand = $request->input('special_demand');
@@ -36,7 +37,7 @@ class MaternityMatronOrderController extends Controller
36 37
             $maternityMatronOrder = new MaternityMatronOrder;
37 38
             $maternityMatronOrder->status = 0;
38 39
         }
39
-        if ($user && $level && $expected_date && $server_time && $special_demand && $address && $contact && $phone) {
40
+        if ($wechat_id && $level && $expected_date && $server_time && $special_demand && $address && $contact && $phone) {
40 41
             $maternityMatronOrder->level = $level;
41 42
             $maternityMatronOrder->expected_date = $expected_date;
42 43
             $maternityMatronOrder->special_demand = $special_demand;

+ 7
- 10
manage-server/app/Http/Controllers/ProductCollectionController.php Прегледај датотеку

@@ -17,11 +17,10 @@ class ProductCollectionController extends Controller
17 17
     public function store(Request $request)
18 18
     {
19 19
         $id = $request->input('id');
20
-        $code = $request->input('code');
21
-        $miniProgram = EasyWeChat::miniProgram();
22
-        $auth = $miniProgram->auth->session($code);
23
-        $wechat_id = $auth->getId();
24
-        if ($id) {
20
+        //$user = session('wechat.oauth_user.default');
21
+        //$wechat_id = $user->getId();
22
+        $wechat_id = $request->input("openid");
23
+        if ($id && $wechat_id) {
25 24
             $product = Product::find($id);
26 25
             if ($product->collect_num == null) {
27 26
                 $product->collect_num = 1;
@@ -56,11 +55,9 @@ class ProductCollectionController extends Controller
56 55
     public function delete(Request $request)
57 56
     {
58 57
         $product_id = $request->input('product_id');
59
-        $code = $request->input('code');
60
-        $miniProgram = EasyWeChat::miniProgram();
61
-        $auth = $miniProgram->auth->session($code);
62
-        // TODO
63
-        $wechat_id = "";
58
+        //$user = session('wechat.oauth_user.default');
59
+        //$wechat_id = $user->getId();
60
+        $wechat_id = $request->input("openid");
64 61
         if ($product_id) {
65 62
             $product = Product::find($product_id);
66 63
             $product->collect_num = $product->collect_num - 1;

+ 5
- 3
manage-server/app/Http/Controllers/ProductOrderController.php Прегледај датотеку

@@ -18,8 +18,10 @@ class ProductOrderController extends Controller
18 18
     {
19 19
         $id = $request->input('id');
20 20
         $product_id = $request->input('product_id');
21
-        $user = session('wechat.oauth_user.default');
22
-        $wechat_id = $user->getId();
21
+
22
+        //$user = session('wechat.oauth_user.default');
23
+        //$wechat_id = $user->getId();
24
+        $wechat_id = $request->input("openid");
23 25
         $amount = $request->input('amount');
24 26
         $remark = $request->input('remark');
25 27
         $info = $request->input('info');
@@ -35,7 +37,7 @@ class ProductOrderController extends Controller
35 37
             $productOrder = new ProductOrder;
36 38
             $productOrder->status = 0;
37 39
         }
38
-        if ($user && $product_id && $wechat_id && $amount
40
+        if ($wechat_id && $product_id && $wechat_id && $amount
39 41
             && $address && $contact && $phone) {
40 42
 
41 43
             $product = Product::find($product_id);

Loading…
Откажи
Сачувај