java/HongRuiTang.git

			@@ -3,6 +3,7 @@
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.toolkit.Wrappers;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.ruoyi.common.core.utils.uuid.IdUtils;
			import com.ruoyi.shop.domain.dto.*;
			import com.ruoyi.shop.domain.pojo.shop.*;
			import com.ruoyi.shop.domain.pojo.task.ShopFile;
			@@ -71,6 +72,8 @@
			@Resource
			private RemoteOrderService remoteOrderService;

			@Resource
			private ShopStaffService shopStaffService;
			/**
			* 获取商户详情
			* @param shopId
			@@ -398,5 +401,22 @@
			return merAgencyPageVoList;
			}


			private void handleShopStaff(Long shopId,SysUser sysUser){
			ShopStaff shopStaff = shopStaffService.getByUserId(sysUser.getUserId());
			if(shopStaff!=null){
			shopStaff.setShopId(shopId);
			}else{
			String staffId = IdUtils.simpleUUID();
			shopStaff = new ShopStaff();
			shopStaff.setStaffId(staffId);
			shopStaff.setDelFlag(0);
			shopStaff.setUserId(sysUser.getUserId());
			shopStaff.setShopId(shopId);
			shopStaff.setStaffName(sysUser.getNickName());
			shopStaff.setStaffMobile(sysUser.getPhonenumber());
			shopStaff.setStaffGender(Integer.valueOf(sysUser.getSex()));
			shopStaff.setStaffAvatar(sysUser.getAvatar());
			}
			shopStaffService.saveOrUpdate(shopStaff);
			}
			}

	ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopStaff.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -32,8 +32,8 @@
			/**
			* 员工id
			*/
			@TableId(value = "staff_id", type = IdType.AUTO)
			private Long staffId;
			@TableId(value = "staff_id")
			private String staffId;
			/**
			* 删除标记
			*/