修改bug

yzg-util-wxxcx/src/main/java/com/yanzuoguang/wxxcx/hardwareDevice/snTicket/service/WxHardwareDeviceSnTicketService.java

@@ -4,6 +4,7 @@ package com.yanzuoguang.wxxcx.hardwareDevice.snTicket.service;
 import com.yanzuoguang.wxxcx.base.WxXcxAccessToken;
 import com.yanzuoguang.wxxcx.hardwareDevice.snTicket.WxHardwareDeviceSnTicketDataReq;
 import com.yanzuoguang.wxxcx.hardwareDevice.send.WxHardwareDeviceDataRes;
+import com.yanzuoguang.wxxcx.hardwareDevice.snTicket.WxHardwareDeviceSnTicketDataRes;
 
 /**
  *
@@ -18,5 +19,5 @@ public interface WxHardwareDeviceSnTicketService {
      * @param req 请求数据
      * @return  返回结果集
      */
-    WxHardwareDeviceDataRes getSnTicket(WxXcxAccessToken accessToken, WxHardwareDeviceSnTicketDataReq req);
+    WxHardwareDeviceSnTicketDataRes getSnTicket(WxXcxAccessToken accessToken, WxHardwareDeviceSnTicketDataReq req);
 }

yzg-util-wxxcx/src/main/java/com/yanzuoguang/wxxcx/hardwareDevice/snTicket/service/impl/WxHardwareDeviceSnTicketServiceImpl.java

@@ -7,6 +7,7 @@ import com.yanzuoguang.wxxcx.base.WxXcxRequest;
 import com.yanzuoguang.wxxcx.hardwareDevice.snTicket.WxHardwareDeviceSnTicketDataReq;
 import com.yanzuoguang.wxxcx.hardwareDevice.snTicket.WxHardwareDeviceSnTicketDataRequest;
 import com.yanzuoguang.wxxcx.hardwareDevice.send.WxHardwareDeviceDataRes;
+import com.yanzuoguang.wxxcx.hardwareDevice.snTicket.WxHardwareDeviceSnTicketDataRes;
 import com.yanzuoguang.wxxcx.hardwareDevice.snTicket.service.WxHardwareDeviceSnTicketService;
 import org.springframework.stereotype.Component;
 
@@ -26,7 +27,7 @@ public class WxHardwareDeviceSnTicketServiceImpl implements WxHardwareDeviceSnTi
     }
 
     @Override
-    public WxHardwareDeviceDataRes getSnTicket(WxXcxAccessToken accessToken, WxHardwareDeviceSnTicketDataReq req) {
+    public WxHardwareDeviceSnTicketDataRes getSnTicket(WxXcxAccessToken accessToken, WxHardwareDeviceSnTicketDataReq req) {
         WxHardwareDeviceSnTicketDataRequest snticketRequest = new WxHardwareDeviceSnTicketDataRequest(wxXcxConfig, wxXcxRequest, accessToken, req);
         return snticketRequest.getResponse();
     }

yzg-util-wxxcx/src/main/java/com/yanzuoguang/wxxcx/img/aiCrop/service/WxXcxImgAiCropService.java

 package com.yanzuoguang.wxxcx.img.aiCrop.service;
 
 import com.yanzuoguang.wxxcx.base.WxXcxAccessToken;
-import com.yanzuoguang.wxxcx.img.req.WxImgDataReq;
-import com.yanzuoguang.wxxcx.img.superresolution.WxImgSuperresolutionDataRes;
+import com.yanzuoguang.wxxcx.img.aiCrop.WxImgAiCropDataReq;
+import com.yanzuoguang.wxxcx.img.aiCrop.WxImgAiCropDataRes;
 
 /**
  *
@@ -18,5 +18,5 @@ public interface WxXcxImgAiCropService {
      * @param req
      * @return
      */
-    WxImgSuperresolutionDataRes aiCrop(WxXcxAccessToken accessToken, WxImgDataReq req);
+    WxImgAiCropDataRes aiCrop(WxXcxAccessToken accessToken, WxImgAiCropDataReq req);
 }

yzg-util-wxxcx/src/main/java/com/yanzuoguang/wxxcx/img/aiCrop/service/impl/WxXcxImgAiCropServiceImpl.java

@@ -3,9 +3,9 @@ package com.yanzuoguang.wxxcx.img.aiCrop.service.impl;
 import com.yanzuoguang.wxxcx.base.WxXcxAccessToken;
 import com.yanzuoguang.wxxcx.base.WxXcxConfig;
 import com.yanzuoguang.wxxcx.base.WxXcxRequest;
-import com.yanzuoguang.wxxcx.img.req.WxImgDataReq;
+import com.yanzuoguang.wxxcx.img.aiCrop.WxImgAiCropDataReq;
+import com.yanzuoguang.wxxcx.img.aiCrop.WxImgAiCropDataRes;
 import com.yanzuoguang.wxxcx.img.aiCrop.WxImgAiCropDataRequest;
-import com.yanzuoguang.wxxcx.img.superresolution.WxImgSuperresolutionDataRes;
 import com.yanzuoguang.wxxcx.img.aiCrop.service.WxXcxImgAiCropService;
 
 /**
@@ -26,7 +26,7 @@ public class WxXcxImgAiCropServiceImpl implements WxXcxImgAiCropService {
 
 
     @Override
-    public WxImgSuperresolutionDataRes aiCrop(WxXcxAccessToken accessToken, WxImgDataReq req) {
+    public WxImgAiCropDataRes aiCrop(WxXcxAccessToken accessToken, WxImgAiCropDataReq req) {
         WxImgAiCropDataRequest aiCropRequest = new WxImgAiCropDataRequest(wxXcxConfig, wxXcxRequest, accessToken, req);
         return aiCropRequest.getResponse();
     }

yzg-util-wxxcx/src/main/java/com/yanzuoguang/wxxcx/img/scanOrcode/WxImgScanQrCodeDataRequest.java

@@ -3,8 +3,6 @@ package com.yanzuoguang.wxxcx.img.scanOrcode;
 import com.alibaba.fastjson.TypeReference;
 import com.yanzuoguang.util.helper.HttpHelper;
 import com.yanzuoguang.util.helper.JsonHelper;
-import com.yanzuoguang.wxxcx.img.superresolution.WxImgSuperresolutionDataRes;
-import com.yanzuoguang.wxxcx.img.req.WxImgDataReq;
 import com.yanzuoguang.wxxcx.base.*;
 
 

yzg-util-wxxcx/src/main/java/com/yanzuoguang/wxxcx/img/scanOrcode/service/WxXcxImgScanQrCodeService.java

 package com.yanzuoguang.wxxcx.img.scanOrcode.service;
 
 import com.yanzuoguang.wxxcx.base.WxXcxAccessToken;
-import com.yanzuoguang.wxxcx.img.req.WxImgDataReq;
-import com.yanzuoguang.wxxcx.img.superresolution.WxImgSuperresolutionDataRes;
+import com.yanzuoguang.wxxcx.img.scanOrcode.WxImgScanOrCodeDataReq;
+import com.yanzuoguang.wxxcx.img.scanOrcode.WxImgScanOrCodeDataRes;
 
 /**
  *
@@ -18,5 +18,5 @@ public interface WxXcxImgScanQrCodeService {
      * @param req
      * @return
      */
-    WxImgSuperresolutionDataRes scanQRCode(WxXcxAccessToken accessToken, WxImgDataReq req);
+    WxImgScanOrCodeDataRes scanQRCode(WxXcxAccessToken accessToken, WxImgScanOrCodeDataReq req);
 }

yzg-util-wxxcx/src/main/java/com/yanzuoguang/wxxcx/img/scanOrcode/service/impl/WxXcxImgScanQrCodeServiceImpl.java

@@ -3,9 +3,9 @@ package com.yanzuoguang.wxxcx.img.scanOrcode.service.impl;
 import com.yanzuoguang.wxxcx.base.WxXcxAccessToken;
 import com.yanzuoguang.wxxcx.base.WxXcxConfig;
 import com.yanzuoguang.wxxcx.base.WxXcxRequest;
-import com.yanzuoguang.wxxcx.img.req.WxImgDataReq;
+import com.yanzuoguang.wxxcx.img.scanOrcode.WxImgScanOrCodeDataReq;
+import com.yanzuoguang.wxxcx.img.scanOrcode.WxImgScanOrCodeDataRes;
 import com.yanzuoguang.wxxcx.img.scanOrcode.WxImgScanQrCodeDataRequest;
-import com.yanzuoguang.wxxcx.img.superresolution.WxImgSuperresolutionDataRes;
 import com.yanzuoguang.wxxcx.img.scanOrcode.service.WxXcxImgScanQrCodeService;
 
 /**
@@ -24,7 +24,7 @@ public class WxXcxImgScanQrCodeServiceImpl implements WxXcxImgScanQrCodeService
     }
 
     @Override
-    public WxImgSuperresolutionDataRes scanQRCode(WxXcxAccessToken accessToken, WxImgDataReq req) {
+    public WxImgScanOrCodeDataRes scanQRCode(WxXcxAccessToken accessToken, WxImgScanOrCodeDataReq req) {
         WxImgScanQrCodeDataRequest scanQRCodeRequest = new WxImgScanQrCodeDataRequest(wxXcxConfig, wxXcxRequest, accessToken, req);
         return scanQRCodeRequest.getResponse();
     }

yzg-util-wxxcx/src/main/java/com/yanzuoguang/wxxcx/img/superresolution/service/WxXcxImgSuperresolutionService.java

 package com.yanzuoguang.wxxcx.img.superresolution.service;
 
 import com.yanzuoguang.wxxcx.base.WxXcxAccessToken;
-import com.yanzuoguang.wxxcx.img.req.WxImgDataReq;
+import com.yanzuoguang.wxxcx.img.superresolution.WxImgSuperresolutionDataReq;
 import com.yanzuoguang.wxxcx.img.superresolution.WxImgSuperresolutionDataRes;
 
 /**
@@ -16,5 +16,5 @@ public interface WxXcxImgSuperresolutionService {
      * @param req
      * @return
      */
-    WxImgSuperresolutionDataRes superresolution(WxXcxAccessToken accessToken, WxImgDataReq req);
+    WxImgSuperresolutionDataRes superresolution(WxXcxAccessToken accessToken, WxImgSuperresolutionDataReq req);
 }

yzg-util-wxxcx/src/main/java/com/yanzuoguang/wxxcx/img/superresolution/service/impl/WxXcxImgSuperresolutionServiceImpl.java

@@ -3,7 +3,7 @@ package com.yanzuoguang.wxxcx.img.superresolution.service.impl;
 import com.yanzuoguang.wxxcx.base.WxXcxAccessToken;
 import com.yanzuoguang.wxxcx.base.WxXcxConfig;
 import com.yanzuoguang.wxxcx.base.WxXcxRequest;
-import com.yanzuoguang.wxxcx.img.req.WxImgDataReq;
+import com.yanzuoguang.wxxcx.img.superresolution.WxImgSuperresolutionDataReq;
 import com.yanzuoguang.wxxcx.img.superresolution.WxImgSuperresolutionDataRequest;
 import com.yanzuoguang.wxxcx.img.superresolution.WxImgSuperresolutionDataRes;
 import com.yanzuoguang.wxxcx.img.superresolution.service.WxXcxImgSuperresolutionService;
@@ -25,7 +25,7 @@ public class WxXcxImgSuperresolutionServiceImpl implements WxXcxImgSuperresoluti
     }
 
     @Override
-    public WxImgSuperresolutionDataRes superresolution(WxXcxAccessToken accessToken, WxImgDataReq req) {
+    public WxImgSuperresolutionDataRes superresolution(WxXcxAccessToken accessToken, WxImgSuperresolutionDataReq req) {
         WxImgSuperresolutionDataRequest superresolutionRequest = new WxImgSuperresolutionDataRequest(wxXcxConfig, wxXcxRequest, accessToken, req);
         return superresolutionRequest.getResponse();
     }

yzg-util-wxxcx/src/main/java/com/yanzuoguang/wxxcx/liveBroadcast/goods/service/impl/WxLiveBroadcastImportGoodsServiceImpl.java

 package com.yanzuoguang.wxxcx.liveBroadcast.goods.service.impl;
 
 
+import com.yanzuoguang.wxxcx.base.WxXcxAccessToken;
+import com.yanzuoguang.wxxcx.base.WxXcxConfig;
+import com.yanzuoguang.wxxcx.base.WxXcxRequest;
+import com.yanzuoguang.wxxcx.liveBroadcast.goods.req.WxLiveBroadcastImportGoodsDataReq;
+import com.yanzuoguang.wxxcx.liveBroadcast.goods.request.WxLiveBroadcastImportGoodsDataRequest;
+import com.yanzuoguang.wxxcx.liveBroadcast.goods.res.WxLiveBroadcastImportGoodsDataRes;
 import com.yanzuoguang.wxxcx.liveBroadcast.goods.service.WxLiveBroadcastImportGoodsService;
+import org.springframework.stereotype.Component;
 
 /***
  * 获取直播间列表和回放
  *调用额度：100000次/一天
  * @author：heyanou
  */
+@Component
 public class WxLiveBroadcastImportGoodsServiceImpl implements WxLiveBroadcastImportGoodsService {
 
+    private final WxXcxConfig wxXcxConfig;
+    private final WxXcxRequest wxXcxRequest;
 
+    public WxLiveBroadcastImportGoodsServiceImpl(WxXcxConfig wxXcxConfig, WxXcxRequest wxXcxRequest) {
+        this.wxXcxConfig = wxXcxConfig;
+        this.wxXcxRequest = wxXcxRequest;
+    }
+
+    /**
+     *<b>获取直播间列表和回放</b>
+     * @param accessToken 传输带的指令牌
+     * @param req 请求数据
+     * @return  返回结果集
+     */
+    @Override
+    public WxLiveBroadcastImportGoodsDataRes importGoods(WxXcxAccessToken accessToken, WxLiveBroadcastImportGoodsDataReq req){
+        WxLiveBroadcastImportGoodsDataRequest liveBroadcastPushGoodsDataRequest = new WxLiveBroadcastImportGoodsDataRequest(wxXcxConfig, wxXcxRequest, accessToken, req);
+        return liveBroadcastPushGoodsDataRequest.getResponse();
+    }
 }

yzg-util-wxxcx/src/main/java/com/yanzuoguang/wxxcx/logistics/delivery/WxLogisticsGetAllDeliveryDataRes.java

 package com.yanzuoguang.wxxcx.logistics.delivery;
 
-import com.yanzuoguang.wxxcx.logistics.vo.LogisticsAccount;
-import com.yanzuoguang.wxxcx.auth.logistics.vo.LogisticsDelivery;
 import com.yanzuoguang.wxxcx.base.WxXcxResponseBaseError;
+import com.yanzuoguang.wxxcx.logistics.vo.LogisticsDelivery;
 
 import java.util.List;
 

yzg-util-wxxcx/src/main/java/com/yanzuoguang/wxxcx/logistics/vo/LogisticsDelivery.java

-package com.yanzuoguang.wxxcx.auth.logistics.vo;
+package com.yanzuoguang.wxxcx.logistics.vo;
+
 
 import java.util.List;