加入会员修改

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

@@ -35,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.List;
+import java.util.Objects;
 
 
 /**
@@ -272,7 +273,7 @@ public class ShopUserServiceImpl extends ServiceImpl<ShopUserMapper, ShopUser> i
 
         // 查询系统添加的会员
         UserInfo oriInfo = userInfoService.getOne(new QueryWrapper().eq(UserInfo::getPhone, shopUserAddDTO.getPhone()));
-        if (oriInfo != null) {
+        if (oriInfo != null && !oriInfo.getId().equals(userId)) {
             // 迁移订单
             OrderInfo orderInfo = new OrderInfo();
             orderInfo.setUserId(userId);