1、自動接單暫時沒有orderType，打印時無法區分自取外送

component-delivery-pick/src/main/java/com/gingersoft/gsa/delivery_pick_mode/model/viewModel/PageViewModel.kt

@@ -184,7 +184,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
                 }
             }, {
                 it.printStackTrace()
-                LoganManager.w_delivery(LoganManager.EVENT_QUERY, "getToBeConfirmedOrderIds：${it.message}");
+                LoganManager.w_delivery(LoganManager.EVENT_QUERY, "getToBeConfirmedOrderIds：${it.message}")
             })
         }
     }
@@ -211,11 +211,11 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
                             //驗證訂單金額是否正確
                             if (verificationAmount(orderDetail)) {
                                 receiveNextOrder()
-                                LoganManager.w_delivery(LoganManager.EVENT_ERROR, "金額驗證不通過：${GsonUtils.GsonString(orderInfo)}");
+                                LoganManager.w_delivery(LoganManager.EVENT_ERROR, "金額驗證不通過：${GsonUtils.GsonString(orderInfo)}")
                                 return@launch
                             }
                             //即時單
-                            orderDetail.order_type = dataList[0].order_type
+//                            orderDetail.order_type = dataList[0].order_type
                             if (orderDetail.order_type == 7) {
                                 //如果是自取單，將物流類型改為本店
                                 orderDetail.companyType = 0
@@ -761,8 +761,8 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
         //訂單信息和廚房單，打印前需要修改dataBean的order_type和orderPayType
         TakeawayOrder.getInstance().shoppingCart.deliveryAndPickupData = dataBean
 
-        var contentAdapter = PrintContentAdapter()
-        var printContent = contentAdapter.adaptationPrintTakeawayFormContent(dataBean)
+        val contentAdapter = PrintContentAdapter()
+        val printContent = contentAdapter.adaptationPrintTakeawayFormContent(dataBean)
 
         CC.obtainBuilder(ComponentName.COMPONENT_PRINT)
                 .addParam(PrintConstans.PRINT_TYPE, PrintConstans.PRINT_OTHER_ORDER)