etrade / zr-etrade · Commits

Commit eb291a65beb65717579ec9a41c6e0090e7ee110d

Authored by kangtian
1 parent fd91d5cf
build: skipped

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

Inline Side-by-side
Showing 2 changed files with 3 additions and 3 deletions
etrade-shop/src/main/java/com/diligrp/etrade/shop/api/ShopApi.java
  View file @eb291a6
... ... @@ -80,7 +80,7 @@ public class ShopApi {
80 80 * 店铺二维码解析-小程序
81 81 */
82 82 @RequestMapping(value = "/qrCode")
83   - public Message<ShopQrCodeVo> qrCode(@RequestBody ShopApproveCo shopApproveCo) {
  83 + public Message<ShopVo> qrCode(@RequestBody ShopApproveCo shopApproveCo) {
84 84 log.warn("店铺二维码解析-小程序:{}", JsonUtils.toJsonString(shopApproveCo));
85 85 return Message.success(shopCommonService.qrCode(shopApproveCo));
86 86 }
... ...
etrade-shop/src/main/java/com/diligrp/etrade/shop/service/ShopCommonService.java
  View file @eb291a6
... ... @@ -137,7 +137,7 @@ public class ShopCommonService {
137 137 * @param shopApproveCo
138 138 * @return
139 139 */
140   - public ShopQrCodeVo qrCode(ShopApproveCo shopApproveCo) {
  140 + public ShopVo qrCode(ShopApproveCo shopApproveCo) {
141 141 // shopApproveCo.checkMarketId();
142 142 shopApproveCo.check(ShopApproveCo::getShopQrCodeData);
143 143 String shopQrCodeData = shopApproveCo.getShopQrCodeData();
... ... @@ -150,7 +150,7 @@ public class ShopCommonService {
150 150 shopCo.setId(shopQrCodeVo.getShopId());
151 151 ShopVo shopVo = shopService.detail(shopCo);
152 152 shopVo.checkShopState();
153   - return shopQrCodeVo;
  153 + return shopVo;
154 154 }
155 155  
156 156 /**
... ...