打印

lb-feginclient/src/main/java/com/ydd/api/PrintApi.java

@@ -5,6 +5,7 @@ import com.ydd.third.common.vo.waimai.SyncRiderPositionStatusVo;
 import com.ydd.third.print.request.PrintDeviceDto;
 import com.ydd.third.print.request.PrintDto;
 import com.ydd.third.print.request.PrintOrderDto;
+import com.ydd.third.print.response.PrintStatusResp;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,7 +24,7 @@ public interface PrintApi {
     @PostMapping(value="/print/addPrintSn")
     String addPrintSn(@RequestParam("type") Integer type, @RequestParam("deviceSn") String deviceSn, @RequestParam("deviceSecret") String deviceSecret, @RequestParam("name") String name);
     @PostMapping(value="/print/printStatus")
-    <T> T printStatus(@RequestParam("type") Integer type, @RequestParam("deviceSn") String deviceSn, @RequestParam("deviceSecret") String deviceSecret);
+    PrintStatusResp printStatus(@RequestParam("type") Integer type, @RequestParam("deviceSn") String deviceSn, @RequestParam("deviceSecret") String deviceSecret);
     @GetMapping(value="/print/deleteSn")
     void deleteSn(@RequestParam("deviceSn") String deviceSn, @RequestParam("type") Integer type);
 }

lb-module/src/main/java/com/ydd/module/dto/StoreDeliveryDto.java

@@ -30,5 +30,6 @@ public class StoreDeliveryDto implements Serializable {
     private Integer bindStatus;
     private String failMsg;
     private Integer status;
-
+    private String logo;
+    private String pcLogo;
 }

lb-module/src/main/resources/mapper/module/ShopDeliveryDisableMapper.xml

@@ -13,7 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="shopDelivery" resultType="com.ydd.module.dto.StoreDeliveryDto">
         SELECT d.type deliveryId,d.`name` deliveryName,sd.bind_status,if(sd.bind_status!=1,sd.auth_msg,'') failMsg,
-        if(di.id is null,1,0) status
+        if(di.id is null,1,0) status,sd.logo,sd.pc_logo as pcLogo
         from lb_dsp_delivery d
         JOIN lb_shop_delivery sd on sd.delivery_id = d.id
         LEFT JOIN lb_shop_delivery_disable di ON sd.shop_id = di.shop_id and d.type = di.delivery_type and di.deleted=0

lb-third/lb-third-waimai/src/main/java/com/ydd/third/controller/PrintController.java

@@ -55,9 +55,9 @@ public class PrintController {
      * 获取打印机状态
      */
     @PostMapping(value="/printStatus")
-    public ResObject<PrintStatusResp> printStatus(@RequestParam("type") Integer type, @RequestParam("deviceSn") String deviceSn, @RequestParam("deviceSecret") String deviceSecret) {
+    public PrintStatusResp printStatus(@RequestParam("type") Integer type, @RequestParam("deviceSn") String deviceSn, @RequestParam("deviceSecret") String deviceSecret) {
         PrintStatusResp resp = printService.printStatus(type, deviceSn, deviceSecret);
-        return ResObject.success(resp);
+        return resp;
     }
 
     /**