shopUser 接口

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java

@@ -140,10 +140,6 @@ public class ShopUser implements Serializable {
 
     @Column(onInsertValue = "now()", onUpdateValue = "now()")
     private LocalDateTime updateTime;
-    /**
-     * 已经合并过来的用户信息，jsonArray格式,[{"id":1,"shopId":2,...},{"id":1,"shopId":2,...}]
-     */
-    private String mergedUsers;
 
     private Long memberLevelId;
 

cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UShopUserServiceImpl.java

@@ -188,7 +188,7 @@ public class UShopUserServiceImpl implements UShopUserService {
     @Override
     public ShopUserDetailDTO getInfo(Long shopId, long userId) {
         Long mainId = shopInfoService.getMainIdByShopId(shopId);
-        ShopUser shopUser = shopUserService.getShopUserInfo(mainId, shopId);
+        ShopUser shopUser = shopUserService.getShopUserInfo(mainId, userId);
         UserInfo userInfo = userInfoService.getById(userId);
         if (userInfo == null) {
             throw new ApiNotPrintException("用户信息不存在");