'0008'

app/controller/admin/Combo.php

@@ -36,6 +36,7 @@ class Combo extends Base
     {
         try {
             $param = $request->get();
+            $param['type'] = 1;
             $list = $this->service->getList($param);
             return successTrans("success.data",pageFormat($list),200);
         } catch (\Throwable $throwable) {

app/controller/api/Cart.php

@@ -48,9 +48,11 @@ class Cart extends Base
 
     protected array $types = [
         '1_1_1' => ['name' => '彩色-单面', 'amount' => 0, 'quantity' => 0,'discount' => 0],
+        '1_1_2' => ['name' => '彩色-单面', 'amount' => 0, 'quantity' => 0,'discount' => 0],
         '1_2_1' => ['name' => '彩色-双面', 'amount' => 0, 'quantity' => 0,'discount' => 0],
         '2_1_1' => ['name' => '黑白-单面', 'amount' => 0, 'quantity' => 0,'discount' => 0],
         '2_2_1' => ['name' => '黑白-双面', 'amount' => 0, 'quantity' => 0,'discount' => 0],
+        '2_1_2' => ['name' => '黑白-双面', 'amount' => 0, 'quantity' => 0,'discount' => 0],
     ];
 
     /**
@@ -175,7 +177,7 @@ class Cart extends Base
             if (!is_array($param)) return error($param);
             $cart = (new SaasCart)->where("id",$param['id'])->findOrEmpty();
             if ($cart->isEmpty()) return error("操作失败");
-            if ($cart['uuid'] <> $request->user['id']) return error("操作失败");
+            if ($cart['openid'] <> $request->user['openid']) return error("操作失败");
             $state = $cart->delete();
             if (!$state) return error("操作失败");
             return success("操作成功");

app/controller/api/Order.php

@@ -191,7 +191,7 @@ class Order extends Base
                 'body'              => $shop['shop_name']."-打印",
                 'out_trade_no'      => $orderSn."-".$orderData['package_sn'],
                 "attach"            => $orderSn,
-                'total_fee'         => $orderData['money'] * 100,
+                'total_fee'         => $orderData['money'],
                 'openid'            => $request->user['openid'],
                 'trade_type'        => 'JSAPI',
                 'spbill_create_ip'  => $request->getRealIp(),

app/controller/exe/Prints.php

@@ -32,7 +32,10 @@ class Prints extends Base
             $printIn = [];
             foreach ($param as $key=>$val)
             {
+                $param[$key] = $val;
                 $printId = strToUniqueNumberV4(trim($val['name']));
+                $param[$key]['key'] = "{$printId}-{$shopId}";
+                $param[$key]['userKey'] = $printId;
                 $printData = $mode->where("code",$printId)->where("shop_id",$shopId)->findOrEmpty();
                 if ($printData->isEmpty()) {
                     $printIn[$key] = [
@@ -47,7 +50,7 @@ class Prints extends Base
             if (!empty($printIn)) {
                 $mode->insertAll(array_values($printIn));
             }
-            return success("ok");
+            return success("ok",$param);
         } catch (\Throwable $throwable) {
             return error($throwable->getMessage());
         }

app/extra/service/saas/ComboService.php

@@ -28,6 +28,7 @@ class ComboService extends Service
         $filter = [];
         !empty($param['status']) && $filter[] = ["status", '=', ($param['status']-1)];
         !empty($param['name']) && $filter[] = ["name", 'like', "%{$param['name']}%"];
+        !empty($param['type']) && $filter[] = ["type", '=', $param['type']];
         return $filter;
     }
 

app/wss/PrintWss.php

@@ -1,6 +1,7 @@
 <?php
 
 namespace app\wss;
+use app\model\saas\SaasOrderDetail;
 use Workerman\Connection\TcpConnection;
 
 class PrintWss
@@ -17,6 +18,43 @@ class PrintWss
 
     public function onMessage(TcpConnection $connection, $data)
     {
+        if (empty($data)) $connection->send(['type' => 'empty','data' => []]);
+        $param = json_decode($data,true);
+        if ($param['type'] == 'get_data') {
+            $printer = explode("-",$param['printer']);
+            $printJob = (new SaasOrderDetail)->where("shop_id",$printer[1])->where("print_id",$printer[0])->where("status",1)->findOrEmpty();
+            if (!$printJob->isEmpty()) {
+                $range = Null;
+                if ($printJob['end_page'] > $printJob['start_page']) {
+                    $range = $printJob['start_page']."-".$printJob['end_page'];
+                }
+                if ($printJob['end_page'] == $printJob['start_page']) {
+                    $range = (int) $printJob['end_page'];
+                }
+                $color_mode = ($printJob['color']==1?'color':'monochrome');
+                $duplex = "simplex";
+                if ($printJob['paper_size'] == 'A4' && $printJob['duplex'] == 2) {
+                    $duplex = 'duplexshort'; // duplexlong
+                }
+                if ($printJob['paper_size'] == 'A3' && $printJob['duplex'] == 2) {
+                    $duplex = 'duplexlong'; // duplexshort
+                }
+                $data = [
+                    "type"  => "print",
+                    "data"  => [
+                        "jobId"     => $printJob['id'],
+                        "action"    => 'create',
+                        "remoteUrl" => "https://".sConf("storage.cos_http_domain")."/".$printJob['path'],
+                        "customFileName" => $printJob['order_sn'],
+                        "exe"       => ['-print-to',$printJob['print_name'],'-print-settings',"{$range},{$printJob['number']}x,{$color_mode},$duplex,paper={$printJob['paper_size']}",'-silent'],
+                    ]
+                ];
+                $printJob->status = 2;
+                $printJob->save();
+            } else {
+                $data = [];
+            }
+        }
         $connection->send($data);
     }