java/HongRuiTang.git

			@@ -2,6 +2,9 @@

			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.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.service.shop.*;
			@@ -10,6 +13,7 @@
			import com.ruoyi.system.api.constant.AppErrorConstant;
			import com.ruoyi.system.api.domain.dto.*;
			import com.ruoyi.system.api.domain.poji.shop.Shop;
			import com.ruoyi.system.api.domain.poji.shop.ShopProportionVo;
			import com.ruoyi.system.api.domain.poji.sys.SysUser;
			import com.ruoyi.system.api.domain.vo.*;
			import com.ruoyi.system.api.model.QwH5LoginVo;
			@@ -59,6 +63,12 @@
			@Resource
			private MemberTaskService memberTaskService;

			@Resource
			private ShopAuthenticationService shopAuthenticationService;

			@Resource
			private ShopProportionService shopProportionService;

			/**
			* 企业微信H5登录
			* @param qwUserDetail
			@@ -90,6 +100,30 @@
			return R.ok(shop);
			}

			@PostMapping("/getShopSubMchId")
			public R<String> getShopSubMchId(@RequestBody Long shopId){
			String subMchid = "";
			ShopAuthentication authentication = shopAuthenticationService.getByShopId(shopId);
			if(null != authentication){
			subMchid = authentication.getSubMchid();
			}
			return R.ok(subMchid, "");
			}


			/**
			* 获取商户分成
			* @param shopId
			* @return
			*/
			@PostMapping("/getShopProportion")
			public R<ShopProportionVo> getShopProportion(@RequestBody Long shopId){
			ShopProportion shopProportion = shopProportionService.getByShopId(shopId);

			ShopProportionVo shopProportionVo = new ShopProportionVo();
			BeanUtils.copyBeanProp(shopProportionVo, shopProportion);
			return R.ok(shopProportionVo);
			}

			@PostMapping("/getShopByUserId")
			public R<ShopRelUserVo> getShopByUserId(@RequestBody Long userId)