2022年11月09 14:37

blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java

@@ -92,7 +92,7 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 				}
 			}*/
 			user.setOpenId(openId);
-			userClient.updateUser(user);
+			userClient.updateOpenId(user);
 
 			headerTenant = user.getTenantId();
 			paramTenant = user.getTenantId();

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java

@@ -112,4 +112,9 @@ public class User extends TenantEntity {
 	 * 微信用户唯一标识
 	 */
 	private String openId;
+
+	/**
+	 * 发送次数
+	 */
+	private Integer timesSending;
 }

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java

@@ -57,6 +57,7 @@ public interface IUserClient {
 	String USER_BY_IDS = API_PREFIX + "/selectUserIds";
 	String USER_ALL = API_PREFIX + "/selectUserAll";
 	String LOGIN_BY_ACCOUNT = API_PREFIX + "/loginByAccount";
+	String UPDATE_OPEN_ID = API_PREFIX + "/updateOpenId";
 
 	@GetMapping(LIST_USER_BY_ROLE_ID)
 	R<List<User>> listUserByRoleId(@RequestParam("roleId") Long roleId);
@@ -148,6 +149,12 @@ public interface IUserClient {
 	R<Boolean> updateUser(@RequestBody User user);
 
 	/**
+	 * 修改用户openId
+	 */
+	@PostMapping(UPDATE_OPEN_ID)
+	R<Boolean> updateOpenId(@RequestBody User user);
+
+	/**
 	 * 删除用户
 	 *
 	 * @param tenantIds 租户id集合

blade-service/blade-stock/src/main/java/org/springblade/stock/feign/StockGoodsClient.java

@@ -17,6 +17,7 @@ import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.stock.entity.StockGoods;
 import org.springblade.stock.service.IStockGoodsService;
 import org.springblade.stock.vo.StockGoodsVO;
@@ -283,8 +284,13 @@ public class StockGoodsClient implements IStockGoodsClient {
 			.eq(StringUtils.isNotBlank(stockGoods.getContractNumber()), StockGoods::getContractNumber, stockGoods.getContractNumber())
 			.eq(StringUtils.isNotBlank(stockGoods.getBillNo()), StockGoods::getBillNo, stockGoods.getBillNo())
 			.eq(StringUtils.isNotBlank(stockGoods.getCntrNo()), StockGoods::getCntrNo, stockGoods.getCntrNo())
-			.eq(StockGoods::getIsDeleted, 0)
-			.eq(StockGoods::getTenantId, AuthUtil.getTenantId());
+			.eq(StockGoods::getIsDeleted, 0);
+			if(ObjectUtil.isNotEmpty(stockGoods.getTenantId()) && stockGoods.getTenantId().equals("681169")){
+				stockGoodsLambdaQueryWrapper.eq(StockGoods::getTenantId, stockGoods.getTenantId());
+			}else {
+				stockGoodsLambdaQueryWrapper.eq(StockGoods::getTenantId, AuthUtil.getTenantId());
+			}
+
 		List<StockGoods> goodsList = stockGoodsService.list(stockGoodsLambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(goodsList)) {
 			goodsList.forEach(e -> {

blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java

@@ -119,6 +119,12 @@ public class UserClient implements IUserClient {
 	}
 
 	@Override
+	@PostMapping(UPDATE_OPEN_ID)
+	public R<Boolean> updateOpenId(@RequestBody User user) {
+		return R.data(service.updateOpenId(user));
+	}
+
+	@Override
 	@PostMapping(REMOVE_USER)
 	public R<Boolean> removeUser(String tenantIds) {
 		return R.data(service.remove(Wrappers.<User>query().lambda().in(User::getTenantId, Func.toStrList(tenantIds))));

blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java

@@ -55,6 +55,14 @@ public interface IUserService extends BaseService<User> {
 	boolean updateUser(User user);
 
 	/**
+	 * 修改用户openId
+	 *
+	 * @param user
+	 * @return
+	 */
+	boolean updateOpenId(User user);
+
+	/**
 	 * 修改用户基本信息
 	 *
 	 * @param user

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -128,6 +128,12 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public boolean updateOpenId(User user) {
+		return updateById(user);
+	}
+
+	@Override
 	public boolean updateUserInfo(User user) {
 		user.setPassword(null);
 		return updateById(user);