店铺二维码解析，增加店铺内容

kangtian
1 parent fd91d5cf
Showing 2 changed files with 3 additions and 3 deletions
etrade-shop/src/main/java/com/diligrp/etrade/shop/api/ShopApi.java
etrade-shop/src/main/java/com/diligrp/etrade/shop/service/ShopCommonService.java
@@ -80,7 +80,7 @@ public class ShopApi {
      * 店铺二维码解析-小程序
      */
     @RequestMapping(value = "/qrCode")
-    public Message<ShopQrCodeVo> qrCode(@RequestBody ShopApproveCo shopApproveCo) {
+    public Message<ShopVo> qrCode(@RequestBody ShopApproveCo shopApproveCo) {
         log.warn("店铺二维码解析-小程序:{}", JsonUtils.toJsonString(shopApproveCo));
         return Message.success(shopCommonService.qrCode(shopApproveCo));
     }
@@ -137,7 +137,7 @@ public class ShopCommonService {
      * @param shopApproveCo
      * @return
      */
-    public ShopQrCodeVo qrCode(ShopApproveCo shopApproveCo) {
+    public ShopVo qrCode(ShopApproveCo shopApproveCo) {
 //        shopApproveCo.checkMarketId();
         shopApproveCo.check(ShopApproveCo::getShopQrCodeData);
         String shopQrCodeData = shopApproveCo.getShopQrCodeData();
@@ -150,7 +150,7 @@ public class ShopCommonService {
         shopCo.setId(shopQrCodeVo.getShopId());
         ShopVo shopVo = shopService.detail(shopCo);
         shopVo.checkShopState();
-        return shopQrCodeVo;
+        return shopVo;
     }
     /**