登录时间2

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/AdminUserServiceImpl.java

@@ -198,8 +198,8 @@ public class AdminUserServiceImpl implements AdminUserService {
                     userVo.setPhone(user.getMobile());
                     userVo.setCreateTime(user.getAddTime());
                     userVoList.add(userVo);
-                    return Result.success(PageSearchResult.of(pageInfo, userVoList));
                 }
+                return Result.success(PageSearchResult.of(pageInfo, userVoList));
             } else if (dto.getListType() == 3) {
                 List<ShareRecordVo> shareRecordVoList = new ArrayList<>();
                 //分享列表

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysSupplierItemServiceImpl.java

@@ -117,6 +117,7 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
             supplierItem.setUpdateTime(now);
             supplierItem.setIsOnSale(true);
             supplierItem.setIsDeleted(false);
+            supplierItem.setStatus(SupplierItemEnum.StatusEnum.COMMON.getCode());
             if (dto.getStock() == null) {
                 supplierItem.setStock(1);
             }

ch-dao/src/main/java/com/wwdz/ch/db/impl/UserDaoImpl.java

@@ -34,8 +34,9 @@ public class UserDaoImpl implements UserDao {
         long count = userMapper.countByExample(example);
         if (count == 0) {
             return userMapper.insertBySelfId(user);
+        } else {
+            return userMapper.updateByPrimaryKeySelective(user);
         }
-        return 0;
     }
 
 

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/UserServiceImpl.java

@@ -175,6 +175,7 @@ public class UserServiceImpl implements UserService {
         }
         com.wwdz.user.api.model.user.User wUser = userCloudServerResponse.getResult();
         User user = User.of(wUser);
+        user.setId(dto.getUserId());
         logger.info(">>>>>>> 登录用户的信息:{}", JsonUtils.from(user));
 
         String phone = user.getMobile();

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/SupplierItemServiceImpl.java

 package com.wwdz.ch.wx.impl.distribution;
 
 import com.github.pagehelper.PageInfo;
-import com.wwdz.ch.core.consts.CommConsts;
-import com.wwdz.ch.core.consts.DistributionEnum;
-import com.wwdz.ch.core.consts.MediaTypeEnum;
-import com.wwdz.ch.core.consts.ResultCode;
+import com.wwdz.ch.core.consts.*;
 import com.wwdz.ch.core.storage.QiniuStorage;
 import com.wwdz.ch.core.type.PageSearchResult;
 import com.wwdz.ch.core.type.Result;
@@ -587,6 +584,7 @@ public class SupplierItemServiceImpl implements SupplierItemService {
             supplierItem.setIsDeleted(false);
             supplierItem.setCreatorId(dto.getUserId());
             supplierItem.setType(DistributionEnum.DistributionTypeEnum.COLLECT.getCode());
+            supplierItem.setStatus(SupplierItemEnum.StatusEnum.COMMON.getCode());
             long itemId = supplierItemDao.insert(supplierItem);
             //商品对应收藏册关联
             if (StringUtils.hasLength(dto.getCollectionBookId())) {