Browse Source

花掌柜订单控制器解决冲突

ouyang 2 days ago
parent
commit
10ad9ffd7f
1 changed files with 0 additions and 69 deletions
  1. 0 69
      app-hd/controllers/OrderController.php

+ 0 - 69
app-hd/controllers/OrderController.php

@@ -36,9 +36,6 @@ use common\components\payUtil;
 use common\services\xhPayToolService;
 use common\components\util;
 use common\components\stringUtil;
-use common\components\deliverySlipPrintUtil;
-use common\components\greetingCardPrintUtil;
-use common\components\cloudPrintUtil;
 use common\components\cloudPrintPaperSpec;
 use bizHd\promote\services\CouponService;
 use common\components\httpUtil;
@@ -1686,72 +1683,6 @@ class OrderController extends BaseController
         util::success($data);
     }
 
-    /**
-     * 链科云打印纸张类型列表
-     */
-    public function actionCloudPrintPaperTypes()
-    {
-        util::success(['list' => cloudPrintPaperSpec::listTypes()]);
-    }
-
-    /**
-     * 解析打印请求中的纸张参数
-     */
-    protected function parseCloudPrintPaperOptions()
-    {
-        $get = Yii::$app->request->get();
-        $options = [];
-        if (!empty($get['paperType'])) {
-            $options['paperType'] = $get['paperType'];
-        }
-        if (!empty($get['paperSize'])) {
-            $options['paperSize'] = intval($get['paperSize']);
-        }
-        return $options;
-    }
-
-    /**
-     * 链科云打印鲜花配送单
-     */
-    public function actionCloudPrintDeliverySlip()
-    {
-        if (!cloudPrintUtil::isEnabled()) {
-            util::fail('链科云打印未启用,请配置 .env 中 LIANKENET_*');
-        }
-        $id = intval(Yii::$app->request->get('id', 0));
-        if ($id <= 0) {
-            util::fail('订单id不对');
-        }
-        try {
-            deliverySlipPrintUtil::printByOrderId($id, $this->mainId, $this->parseCloudPrintPaperOptions());
-        } catch (\Throwable $e) {
-            Yii::error('配送单云打印失败: ' . $e->getMessage(), __METHOD__);
-            util::fail($e->getMessage());
-        }
-        util::complete('已提交打印');
-    }
-
-    /**
-     * 链科云打印节日贺卡(文案暂写死)
-     */
-    public function actionCloudPrintGreetingCard()
-    {
-        if (!cloudPrintUtil::isEnabled()) {
-            util::fail('链科云打印未启用,请配置 .env 中 LIANKENET_*');
-        }
-        $id = intval(Yii::$app->request->get('id', 0));
-        if ($id <= 0) {
-            util::fail('订单id不对');
-        }
-        try {
-            greetingCardPrintUtil::printByOrderId($id, $this->mainId, $this->parseCloudPrintPaperOptions());
-        } catch (\Throwable $e) {
-            Yii::error('节日贺卡云打印失败: ' . $e->getMessage(), __METHOD__);
-            util::fail($e->getMessage());
-        }
-        util::complete('已提交打印');
-    }
-
     //运费计算  lqh 2021.4.12  暂反回固定
     public function actionFreight()
     {