From 7fd3525256b0e4a0dbb6f08405368990619adf36 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期五, 20 十月 2023 14:08:26 +0800 Subject: [PATCH] 对接第三方分账接口 --- ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java index 03f7e1e..293a40c 100644 --- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java +++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java @@ -1,15 +1,14 @@ package com.ruoyi.shop.controller.console; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.ruoyi.common.core.constant.CacheConstants; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.utils.bean.BeanUtils; import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.shop.domain.pojo.shop.ShopAuthentication; -import com.ruoyi.shop.domain.pojo.shop.ShopProportion; -import com.ruoyi.shop.domain.pojo.shop.ShopRelUser; -import com.ruoyi.shop.domain.pojo.shop.ShopStaff; +import com.ruoyi.shop.domain.pojo.shop.*; import com.ruoyi.shop.service.shop.*; import com.ruoyi.shop.service.task.MemberTaskService; import com.ruoyi.shop.service.task.ShopTaskService; @@ -22,6 +21,7 @@ import com.ruoyi.system.api.model.QwH5LoginVo; import com.ruoyi.system.api.model.QwUserDetailDto; import com.ruoyi.system.api.service.RemoteUserService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -74,6 +74,12 @@ @Resource private RedisService redisService; + + @Autowired + private ShopAuthenticationHftxService shopAuthenticationHftxService; + + + /** * 企业微信H5登录 * @param qwUserDetail @@ -122,6 +128,17 @@ } + @PostMapping("/getShopHFTXSubMchId") + public R<ShopAuthenticationHftxVo> getShopHFTXSubMchId(@RequestBody Long shopId){ + ShopAuthenticationHftx shopAuthenticationHftx = shopAuthenticationHftxService.getOne(new QueryWrapper<ShopAuthenticationHftx>() + .eq("isDelete", 0).eq("shop_id", shopId)); + ShopAuthenticationHftxVo vo = new ShopAuthenticationHftxVo(); + BeanUtils.copyProperties(shopAuthenticationHftx, vo); + return R.ok(vo, ""); + } + + + /** * 获取商户分成 * @param shopId -- Gitblit v1.7.1