子账号天机修改调整

src/main/java/org/springblade/modules/api/controller/ApiMerchantUserController.java

@@ -90,6 +90,13 @@ public class ApiMerchantUserController extends BaseController {
 //        UserMerchantVO vo = iUserMerchantService.getByUserId(AuthUtil.getUserId());
 //        Assert.notNull(user, "未查询到商户信息");
         user.setAvatar(userMerchantVO.getAvatar());
+
+//        if (!isMerchant()){//子账号可以更新身份证号码
+//            UserMerchantVO userMerchantVO1 = iUserMerchantService.getByUserId(user.getId());
+//            userMerchantVO1.setIdCard(userMerchantVO.getIdCard());
+//            iUserMerchantService.updateById(userMerchantVO1);
+//        }
+
         return R.status(iUserService.updateById(user));
     }
 
@@ -135,6 +142,9 @@ public class ApiMerchantUserController extends BaseController {
         if (CollectionUtil.isNotEmpty(query1)) {
             return R.fail("手机号已注册，请更换其他手机号！");
         }
+        if (!isMerchant()){
+            return R.fail("没有添加子账号权限！");
+        }
         String tenantId = WebUtil.getRequest().getHeader(TokenUtil.TENANT_HEADER_KEY);
         User user = new User();
         user.setAccount(request.getPhone());
@@ -152,8 +162,15 @@ public class ApiMerchantUserController extends BaseController {
         userMerchant.setParentId(AuthUtil.getUserId());
         userMerchant.setAuditStatus(AuditStatusEnum.PASS.getValue());
         userMerchant.setAuthShop(request.getAuthShopIds());
-        iUserMerchantService.save(userMerchant);
 
+        //复制主账号信息
+        UserMerchant myUserMerchant = iUserMerchantService.getByUserId(AuthUtil.getUserId());
+        userMerchant.setAuthShop(request.getAuthShopIds());
+        userMerchant.setMerchantName(myUserMerchant.getMerchantName());
+        userMerchant.setBusinessLicence(myUserMerchant.getBusinessLicence());
+        userMerchant.setAddress(myUserMerchant.getAddress());
+
+        iUserMerchantService.save(userMerchant);
         return R.success("添加成功");
     }
 
@@ -166,6 +183,9 @@ public class ApiMerchantUserController extends BaseController {
         if (Objects.isNull(userMerchant)) {
             return R.fail("子账号不存在");
         }
+        if (!isMerchant()){
+            return R.fail("没有编辑子账号权限！");
+        }
         //获取子账号用户信息
         User user = iUserService.getById(userMerchant.getUserId());
         user.setAvatar(request.getCover());
@@ -176,6 +196,14 @@ public class ApiMerchantUserController extends BaseController {
         userMerchant.setParentId(AuthUtil.getUserId());
         userMerchant.setAuditStatus(AuditStatusEnum.PASS.getValue());
         userMerchant.setAuthShop(request.getAuthShopIds());
+
+        //复制主账号信息
+        UserMerchant myUserMerchant = iUserMerchantService.getByUserId(AuthUtil.getUserId());
+        userMerchant.setAuthShop(request.getAuthShopIds());
+        userMerchant.setMerchantName(myUserMerchant.getMerchantName());
+        userMerchant.setBusinessLicence(myUserMerchant.getBusinessLicence());
+        userMerchant.setAddress(myUserMerchant.getAddress());
+
         iUserMerchantService.updateById(userMerchant);
         return R.success("修改成功");
     }

src/main/java/org/springblade/modules/api/controller/UserCenterController.java

@@ -8,19 +8,16 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.protostuff.Response;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
-import oracle.jdbc.proxy.annotation.Post;
 import org.springblade.common.base.BaseEntity;
 import org.springblade.common.cache.DictBizCache;
 import org.springblade.common.cache.DictCache;
 import org.springblade.common.constant.CommonConstant;
 import org.springblade.common.enums.DictBizEnum;
 import org.springblade.common.enums.DictEnum;
-import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.cache.utils.CacheUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -45,9 +42,10 @@ import org.springblade.modules.system.entity.Region;
 import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.entity.UserApp;
 import org.springblade.modules.system.service.IRegionService;
+import org.springblade.modules.system.service.IUserMerchantService;
 import org.springblade.modules.system.service.IUserService;
-import org.springblade.modules.system.service.impl.UserServiceImpl;
 import org.springblade.modules.system.vo.UserAppVO;
+import org.springblade.modules.system.vo.UserMerchantVO;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
 
@@ -70,7 +68,7 @@ import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE;
 @AllArgsConstructor
 @RequestMapping(CommonConstant.API_URL)
 @Api(value = "我的", tags = "04.个人中心")
-public class UserCenterController extends BladeController {
+public class UserCenterController extends BaseController {
 
 	private final IUserAddressService userAddressService;
 	private final IUserFeedbacksService userFeedbacksService;
@@ -82,6 +80,8 @@ public class UserCenterController extends BladeController {
 	private final IFreightService freightService;
 	private final IUserCardInfoService userCardInfoService;
 	private final BladeRedis bladeRedis;
+	private final IUserMerchantService iUserMerchantService;
+
 	@Resource
 	private IMessageService messageService;
 	@Resource
@@ -124,6 +124,15 @@ public class UserCenterController extends BladeController {
 		user.setSex(request.getSex());
 		user.setPhone(request.getPhone());
 		user.setWxQrcode(request.getWxQrcode());
+
+		if (!isMerchant()){//子账号可以更新身份证号码
+            UserMerchantVO userMerchantVO1 = iUserMerchantService.getByUserId(user.getId());
+			if (Objects.nonNull(userMerchantVO1)){
+				userMerchantVO1.setIdCard(request.getIdCard());
+				iUserMerchantService.updateById(userMerchantVO1);
+			}
+        }
+
 		boolean flg = userService.updateById(user);
 		if (flg){
 			//清除缓存

src/main/java/org/springblade/modules/api/request/UserAppUpdateRequest.java

@@ -74,4 +74,8 @@ public class UserAppUpdateRequest implements Serializable {
 	 */
 	@ApiModelProperty(value = "电话")
 	private String phone;
+
+	@ApiModelProperty(value = "电话")
+	private String idCard;
+
 }

src/main/java/org/springblade/modules/system/wrapper/UserMerchantWrapper.java

@@ -36,14 +36,14 @@ public class UserMerchantWrapper extends BaseEntityWrapper<UserMerchant, UserMer
 
 	@Override
 	public UserMerchantVO entityVO(UserMerchant userMerchant) {
-		UserMerchantVO userMerchantVO = Objects.requireNonNull(BeanUtil.copy(userMerchant, UserMerchantVO.class));
+        Objects.requireNonNull(userMerchant);
+	    return BeanUtil.copy(userMerchant, UserMerchantVO.class);
 
 		//User createUser = UserCache.getUser(userMerchant.getCreateUser());
 		//User updateUser = UserCache.getUser(userMerchant.getUpdateUser());
 		//userMerchantVO.setCreateUserName(createUser.getName());
 		//userMerchantVO.setUpdateUserName(updateUser.getName());
-
-		return userMerchantVO;
+        //return userMerchantVO;
 	}
 
 }