Merge branch 'mp-20231016' of mangpiao/mp-server into mp-server-test

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserChannelController.java

@@ -9,10 +9,7 @@ import com.qs.mp.channel.domain.Channel;
 import com.qs.mp.channel.domain.ChannelCommission;
 import com.qs.mp.channel.domain.ChannelOrderDetail;
 import com.qs.mp.channel.domain.ChannelUserRel;
-import com.qs.mp.channel.domain.param.ChannelParam;
-import com.qs.mp.channel.domain.param.ChannelQrCodeParam;
-import com.qs.mp.channel.domain.param.SiteQueryParam;
-import com.qs.mp.channel.domain.param.VerifyParam;
+import com.qs.mp.channel.domain.param.*;
 import com.qs.mp.channel.domain.vo.ChannelOperDataVO;
 import com.qs.mp.channel.domain.vo.ChannelVO;
 import com.qs.mp.channel.service.IChannelCommissionService;
@@ -73,5 +70,20 @@ public class UserChannelController extends BaseApiController {
         return AjaxResult.success("门店'" + channel.getName() + "'二维码更新成功");
     }
 
+    @ApiOperation(value = "查询门店二维码信息", notes = "查询门店二维码信息")
+    @PostMapping("query/qrCode")
+    public AjaxResult queryQrCode(@Validated @RequestBody UserChannelQrCodeParam qrCodeParam){
+        if (null == qrCodeParam || null == qrCodeParam.getChannelId()) {
+            return error(ErrorCodeEnum.ERROR_CODE_1001);
+        }
+        Channel channel = null;
+        try {
+            channel = channelService.getById(qrCodeParam.getChannelId());
+        } catch (Exception e) {
+            return AjaxResult.error("门店'" + channel.getName() + "'二维码更新失败");
+        }
+        return AjaxResult.success(channel);
+    }
+
 
 }