zxhxx 3 anos atrás
pai
commit
4f9884e23b
100 arquivos alterados com 22 adições e 4 exclusões
  1. 17 0
      app/admin/controller/Index.php
  2. 4 4
      crmeb/services/YLYService.php
  3. 0 0
      public/.gitignore
  4. 0 0
      public/.htaccess
  5. 1 0
      public/.well-known/pki-validation/fileauth.txt
  6. 0 0
      public/favicon.ico
  7. 0 0
      public/h5/css/app.1524b7ac.css
  8. 0 0
      public/h5/css/app.2dee22da.css
  9. 0 0
      public/h5/css/app.34cd5968.css
  10. 0 0
      public/h5/css/app.4357cb8b.css
  11. 0 0
      public/h5/css/app.4a6c1e0f.css
  12. 0 0
      public/h5/css/app.694fa233.css
  13. 0 0
      public/h5/css/app.6a010eed.css
  14. 0 0
      public/h5/css/app.7953ae01.css
  15. 0 0
      public/h5/css/app.7cf65d81.css
  16. 0 0
      public/h5/css/app.84ccf79d.css
  17. 0 0
      public/h5/css/app.c7ab2730.css
  18. 0 0
      public/h5/css/app.d5668d0b.css
  19. 0 0
      public/h5/css/app.d5b1cd8d.css
  20. 0 0
      public/h5/css/app.f3efca16.css
  21. 0 0
      public/h5/css/chunk-03addcd9.c6045276.css
  22. 0 0
      public/h5/css/chunk-05ea8763.bf372789.css
  23. 0 0
      public/h5/css/chunk-0640a528.30674964.css
  24. 0 0
      public/h5/css/chunk-07f76812.d02dea3c.css
  25. 0 0
      public/h5/css/chunk-08e2dc79.ab18b94f.css
  26. 0 0
      public/h5/css/chunk-0d02a3ae.cd7c711b.css
  27. 0 0
      public/h5/css/chunk-0e2145c0.9ac2f031.css
  28. 0 0
      public/h5/css/chunk-0f55f6af.2d6af223.css
  29. 0 0
      public/h5/css/chunk-10b30062.a4d3933c.css
  30. 0 0
      public/h5/css/chunk-1132f28f.4e520cc2.css
  31. 0 0
      public/h5/css/chunk-1239267a.bf372789.css
  32. 0 0
      public/h5/css/chunk-13a181a7.d5c2c8b6.css
  33. 0 0
      public/h5/css/chunk-16eeeb11.12862fbb.css
  34. 0 0
      public/h5/css/chunk-18822c3c.fdd31483.css
  35. 0 0
      public/h5/css/chunk-18e0edde.41caac67.css
  36. 0 0
      public/h5/css/chunk-19c5e77f.12862fbb.css
  37. 0 0
      public/h5/css/chunk-1c70047f.82eb402d.css
  38. 0 0
      public/h5/css/chunk-1d9e4e87.2aaf19ad.css
  39. 0 0
      public/h5/css/chunk-210f6068.738dbc0c.css
  40. 0 0
      public/h5/css/chunk-2160199f.88fbd452.css
  41. 0 0
      public/h5/css/chunk-22637d46.ab18b94f.css
  42. 0 0
      public/h5/css/chunk-22ab6c2b.f67527fa.css
  43. 0 0
      public/h5/css/chunk-249cbda8.c95ea267.css
  44. 0 0
      public/h5/css/chunk-2539197c.bf372789.css
  45. 0 0
      public/h5/css/chunk-25849407.ef3500b3.css
  46. 0 0
      public/h5/css/chunk-2650e5ab.3ac9a06d.css
  47. 0 0
      public/h5/css/chunk-28249a0d.9fde3280.css
  48. 0 0
      public/h5/css/chunk-2841cf2d.fe00c0ac.css
  49. 0 0
      public/h5/css/chunk-284649fa.8bf040f1.css
  50. 0 0
      public/h5/css/chunk-29d5c12d.2939b295.css
  51. 0 0
      public/h5/css/chunk-2a8af466.439010b6.css
  52. 0 0
      public/h5/css/chunk-2ab95a0f.8dbb01de.css
  53. 0 0
      public/h5/css/chunk-2d37fea5.97299d7d.css
  54. 0 0
      public/h5/css/chunk-2dcf3890.2e545c12.css
  55. 0 0
      public/h5/css/chunk-2dcf3890.7c1d5760.css
  56. 0 0
      public/h5/css/chunk-2df2bc60.30674964.css
  57. 0 0
      public/h5/css/chunk-2e93d517.3c7542ae.css
  58. 0 0
      public/h5/css/chunk-2f9b00de.2e875719.css
  59. 0 0
      public/h5/css/chunk-2fc458aa.e195a427.css
  60. 0 0
      public/h5/css/chunk-3070bbcb.a6c9b94c.css
  61. 0 0
      public/h5/css/chunk-32993ac2.36b1e7a2.css
  62. 0 0
      public/h5/css/chunk-32edf40a.bf3f6c43.css
  63. 0 0
      public/h5/css/chunk-32f6fcb1.a07a7f7a.css
  64. 0 0
      public/h5/css/chunk-33ae6ca6.4765fa5a.css
  65. 0 0
      public/h5/css/chunk-35149cc8.0db61958.css
  66. 0 0
      public/h5/css/chunk-35250bef.368f9837.css
  67. 0 0
      public/h5/css/chunk-352a53ed.2939b295.css
  68. 0 0
      public/h5/css/chunk-3615a42e.5dae48a7.css
  69. 0 0
      public/h5/css/chunk-3620c606.99fcd094.css
  70. 0 0
      public/h5/css/chunk-3753a891.26c30a86.css
  71. 0 0
      public/h5/css/chunk-38b146c0.e76cd3f2.css
  72. 0 0
      public/h5/css/chunk-38b7b883.527fb7b5.css
  73. 0 0
      public/h5/css/chunk-3a463a5f.b6cbdce5.css
  74. 0 0
      public/h5/css/chunk-3b2541e2.724444f4.css
  75. 0 0
      public/h5/css/chunk-3d8cbca5.5e5ffa5f.css
  76. 0 0
      public/h5/css/chunk-3de37280.75fb2164.css
  77. 0 0
      public/h5/css/chunk-3e36020a.c5289654.css
  78. 0 0
      public/h5/css/chunk-3f4bd4f0.a32aeab7.css
  79. 0 0
      public/h5/css/chunk-3f6145c4.4a041a85.css
  80. 0 0
      public/h5/css/chunk-40ea473b.d02dea3c.css
  81. 0 0
      public/h5/css/chunk-454f76eb.f58dbaf2.css
  82. 0 0
      public/h5/css/chunk-4631331c.9dd9ed11.css
  83. 0 0
      public/h5/css/chunk-469231d7.3e6885df.css
  84. 0 0
      public/h5/css/chunk-47d0e48c.5dae48a7.css
  85. 0 0
      public/h5/css/chunk-4abea3da.20e47d23.css
  86. 0 0
      public/h5/css/chunk-4b64bbbc.85ec1c7c.css
  87. 0 0
      public/h5/css/chunk-4b64bbbc.c6045276.css
  88. 0 0
      public/h5/css/chunk-4dcfe16c.e46e52b7.css
  89. 0 0
      public/h5/css/chunk-4dfb9d0c.87c4b621.css
  90. 0 0
      public/h5/css/chunk-4f90706c.461d1dfa.css
  91. 0 0
      public/h5/css/chunk-4fb5ced2.d8363744.css
  92. 0 0
      public/h5/css/chunk-506b4491.929f3837.css
  93. 0 0
      public/h5/css/chunk-574614c8.5b1a42e6.css
  94. 0 0
      public/h5/css/chunk-5944b76d.6b4b9d02.css
  95. 0 0
      public/h5/css/chunk-59ee995c.592ae421.css
  96. 0 0
      public/h5/css/chunk-59ee995c.8aa72244.css
  97. 0 0
      public/h5/css/chunk-5ae7049e.df9fde36.css
  98. 0 0
      public/h5/css/chunk-5bd6adbe.ed634cd9.css
  99. 0 0
      public/h5/css/chunk-5cb9ca48.70f53659.css
  100. 0 0
      public/h5/css/chunk-5cb9ca48.e54be239.css

+ 17 - 0
app/admin/controller/Index.php

@@ -8,6 +8,8 @@ use app\admin\model\order\StoreOrder as StoreOrderModel;//订单
 use app\admin\model\system\{SystemConfig, SystemMenus, SystemRole};
 use app\admin\model\user\{User, UserExtract as UserExtractModel, User as UserModel};
 use app\admin\model\store\{StoreProduct, StoreProductReply as StoreProductReplyModel, StoreProduct as ProductModel};
+use crmeb\services\YLYService;
+use app\models\store\StoreOrderCartInfo;
 
 /**
  * 首页控制器
@@ -582,6 +584,21 @@ class Index extends AuthController
         if (count($data['newOrderId'])) StoreOrderModel::where('order_id', 'in', $data['newOrderId'])->update(['is_remind' => 1]);
         return app('json')->success('ok', $data);
     }
+    public function test()
+    {
+        $order = StoreOrderModel::find(input('id'));
+        $order['cart_id'] = is_string($order['cart_id']) ? json_decode($order['cart_id'], true) : $order['cart_id'];
+                $cartInfo = StoreOrderCartInfo::whereIn('cart_id', $order['cart_id'])->field('cart_info')->select();
+                $cartInfo = count($cartInfo) ? $cartInfo->toArray() : [];
+                $product = [];
+                foreach ($cartInfo as $item) {
+                    $value = is_string($item['cart_info']) ? json_decode($item['cart_info'], true) : $item['cart_info'];
+                    $value['productInfo']['store_name'] = $value['productInfo']['store_name'] ?? "";
+                    $value['productInfo']['store_name'] = StoreOrderCartInfo::getSubstrUTf8($value['productInfo']['store_name'], 10, 'UTF-8', '');
+                    $product[] = $value;
+                }
+                YLYService::instance()->selectStore($order['store_id'])->setContent(sys_config('site_name'), is_object($order) ? $order->toArray() : $order, $product)->orderPrinting('', 0, $order['store_id']);
+    }
 }
 
 

+ 4 - 4
crmeb/services/YLYService.php

@@ -87,16 +87,16 @@ class YLYService extends HttpService implements ProviderInterface
     {
         $terminal_number = SystemStore::where('id', $store_id)->value('terminal_number');
         $this->terminal = $terminal_number;
-        $this->getAccessToken($store_id);
+        $this->getAccessToken();
         return $this;
     }
 
     /**
      * 获取AccessToken
      * */
-    protected function getAccessToken($store_id = 0)
+    protected function getAccessToken()
     {
-        $this->access_token = CacheModel::getDbCache('YLY_access_token' . $store_id, function () {
+        $this->access_token = CacheModel::getDbCache('YLY_access_token', function () {
             $request = self::postRequest($this->apiUrl . 'oauth/oauth', [
                 'client_id' => $this->client_id,
                 'grant_type' => 'client_credentials',
@@ -150,7 +150,7 @@ class YLYService extends HttpService implements ProviderInterface
 //        var_dump($request);
         if (isset($request['error']) && in_array($request['error'], [18, 14]) && $errorCount == 0) {
             CacheModel::delectDbCache('YLY_access_token');
-            $this->getAccessToken($store_id);
+            $this->getAccessToken();
             return $this->orderPrinting($order_id, 1, $store_id);
         }
         return $request;

+ 0 - 0
public/.gitignore


+ 0 - 0
public/.htaccess


+ 1 - 0
public/.well-known/pki-validation/fileauth.txt

@@ -0,0 +1 @@
+202108010925471wq4s2ofjxbjcjr8t2txwf3050iq7w4bnbbb9numaabydy4ud3

+ 0 - 0
public/favicon.ico


+ 0 - 0
public/h5/css/app.1524b7ac.css


+ 0 - 0
public/h5/css/app.2dee22da.css


+ 0 - 0
public/h5/css/app.34cd5968.css


+ 0 - 0
public/h5/css/app.4357cb8b.css


+ 0 - 0
public/h5/css/app.4a6c1e0f.css


+ 0 - 0
public/h5/css/app.694fa233.css


+ 0 - 0
public/h5/css/app.6a010eed.css


+ 0 - 0
public/h5/css/app.7953ae01.css


+ 0 - 0
public/h5/css/app.7cf65d81.css


+ 0 - 0
public/h5/css/app.84ccf79d.css


+ 0 - 0
public/h5/css/app.c7ab2730.css


+ 0 - 0
public/h5/css/app.d5668d0b.css


+ 0 - 0
public/h5/css/app.d5b1cd8d.css


+ 0 - 0
public/h5/css/app.f3efca16.css


+ 0 - 0
public/h5/css/chunk-03addcd9.c6045276.css


+ 0 - 0
public/h5/css/chunk-05ea8763.bf372789.css


+ 0 - 0
public/h5/css/chunk-0640a528.30674964.css


+ 0 - 0
public/h5/css/chunk-07f76812.d02dea3c.css


+ 0 - 0
public/h5/css/chunk-08e2dc79.ab18b94f.css


+ 0 - 0
public/h5/css/chunk-0d02a3ae.cd7c711b.css


+ 0 - 0
public/h5/css/chunk-0e2145c0.9ac2f031.css


+ 0 - 0
public/h5/css/chunk-0f55f6af.2d6af223.css


+ 0 - 0
public/h5/css/chunk-10b30062.a4d3933c.css


+ 0 - 0
public/h5/css/chunk-1132f28f.4e520cc2.css


+ 0 - 0
public/h5/css/chunk-1239267a.bf372789.css


+ 0 - 0
public/h5/css/chunk-13a181a7.d5c2c8b6.css


+ 0 - 0
public/h5/css/chunk-16eeeb11.12862fbb.css


+ 0 - 0
public/h5/css/chunk-18822c3c.fdd31483.css


+ 0 - 0
public/h5/css/chunk-18e0edde.41caac67.css


+ 0 - 0
public/h5/css/chunk-19c5e77f.12862fbb.css


+ 0 - 0
public/h5/css/chunk-1c70047f.82eb402d.css


+ 0 - 0
public/h5/css/chunk-1d9e4e87.2aaf19ad.css


+ 0 - 0
public/h5/css/chunk-210f6068.738dbc0c.css


+ 0 - 0
public/h5/css/chunk-2160199f.88fbd452.css


+ 0 - 0
public/h5/css/chunk-22637d46.ab18b94f.css


+ 0 - 0
public/h5/css/chunk-22ab6c2b.f67527fa.css


+ 0 - 0
public/h5/css/chunk-249cbda8.c95ea267.css


+ 0 - 0
public/h5/css/chunk-2539197c.bf372789.css


+ 0 - 0
public/h5/css/chunk-25849407.ef3500b3.css


+ 0 - 0
public/h5/css/chunk-2650e5ab.3ac9a06d.css


+ 0 - 0
public/h5/css/chunk-28249a0d.9fde3280.css


+ 0 - 0
public/h5/css/chunk-2841cf2d.fe00c0ac.css


+ 0 - 0
public/h5/css/chunk-284649fa.8bf040f1.css


+ 0 - 0
public/h5/css/chunk-29d5c12d.2939b295.css


+ 0 - 0
public/h5/css/chunk-2a8af466.439010b6.css


+ 0 - 0
public/h5/css/chunk-2ab95a0f.8dbb01de.css


+ 0 - 0
public/h5/css/chunk-2d37fea5.97299d7d.css


+ 0 - 0
public/h5/css/chunk-2dcf3890.2e545c12.css


+ 0 - 0
public/h5/css/chunk-2dcf3890.7c1d5760.css


+ 0 - 0
public/h5/css/chunk-2df2bc60.30674964.css


+ 0 - 0
public/h5/css/chunk-2e93d517.3c7542ae.css


+ 0 - 0
public/h5/css/chunk-2f9b00de.2e875719.css


+ 0 - 0
public/h5/css/chunk-2fc458aa.e195a427.css


+ 0 - 0
public/h5/css/chunk-3070bbcb.a6c9b94c.css


+ 0 - 0
public/h5/css/chunk-32993ac2.36b1e7a2.css


+ 0 - 0
public/h5/css/chunk-32edf40a.bf3f6c43.css


+ 0 - 0
public/h5/css/chunk-32f6fcb1.a07a7f7a.css


+ 0 - 0
public/h5/css/chunk-33ae6ca6.4765fa5a.css


+ 0 - 0
public/h5/css/chunk-35149cc8.0db61958.css


+ 0 - 0
public/h5/css/chunk-35250bef.368f9837.css


+ 0 - 0
public/h5/css/chunk-352a53ed.2939b295.css


+ 0 - 0
public/h5/css/chunk-3615a42e.5dae48a7.css


+ 0 - 0
public/h5/css/chunk-3620c606.99fcd094.css


+ 0 - 0
public/h5/css/chunk-3753a891.26c30a86.css


+ 0 - 0
public/h5/css/chunk-38b146c0.e76cd3f2.css


+ 0 - 0
public/h5/css/chunk-38b7b883.527fb7b5.css


+ 0 - 0
public/h5/css/chunk-3a463a5f.b6cbdce5.css


+ 0 - 0
public/h5/css/chunk-3b2541e2.724444f4.css


+ 0 - 0
public/h5/css/chunk-3d8cbca5.5e5ffa5f.css


+ 0 - 0
public/h5/css/chunk-3de37280.75fb2164.css


+ 0 - 0
public/h5/css/chunk-3e36020a.c5289654.css


+ 0 - 0
public/h5/css/chunk-3f4bd4f0.a32aeab7.css


+ 0 - 0
public/h5/css/chunk-3f6145c4.4a041a85.css


+ 0 - 0
public/h5/css/chunk-40ea473b.d02dea3c.css


+ 0 - 0
public/h5/css/chunk-454f76eb.f58dbaf2.css


+ 0 - 0
public/h5/css/chunk-4631331c.9dd9ed11.css


+ 0 - 0
public/h5/css/chunk-469231d7.3e6885df.css


+ 0 - 0
public/h5/css/chunk-47d0e48c.5dae48a7.css


+ 0 - 0
public/h5/css/chunk-4abea3da.20e47d23.css


+ 0 - 0
public/h5/css/chunk-4b64bbbc.85ec1c7c.css


+ 0 - 0
public/h5/css/chunk-4b64bbbc.c6045276.css


+ 0 - 0
public/h5/css/chunk-4dcfe16c.e46e52b7.css


+ 0 - 0
public/h5/css/chunk-4dfb9d0c.87c4b621.css


+ 0 - 0
public/h5/css/chunk-4f90706c.461d1dfa.css


+ 0 - 0
public/h5/css/chunk-4fb5ced2.d8363744.css


+ 0 - 0
public/h5/css/chunk-506b4491.929f3837.css


+ 0 - 0
public/h5/css/chunk-574614c8.5b1a42e6.css


+ 0 - 0
public/h5/css/chunk-5944b76d.6b4b9d02.css


+ 0 - 0
public/h5/css/chunk-59ee995c.592ae421.css


+ 0 - 0
public/h5/css/chunk-59ee995c.8aa72244.css


+ 0 - 0
public/h5/css/chunk-5ae7049e.df9fde36.css


+ 0 - 0
public/h5/css/chunk-5bd6adbe.ed634cd9.css


+ 0 - 0
public/h5/css/chunk-5cb9ca48.70f53659.css


+ 0 - 0
public/h5/css/chunk-5cb9ca48.e54be239.css


Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff