更新商城赠送积分账单状态

ldt-core/src/main/java/org/springblade/modules/resource/builder/oss/OssBuilder.java

@@ -18,6 +18,7 @@ package org.springblade.modules.resource.builder.oss;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.springblade.common.constant.TenantConstant;
 import org.springblade.core.cache.utils.CacheUtil;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.oss.OssTemplate;
@@ -84,7 +85,7 @@ public class OssBuilder {
 	 * @return OssTemplate
 	 */
 	public OssTemplate template(String code) {
-		String tenantId = AuthUtil.getTenantId();
+		String tenantId = "000000";
 		Oss oss = getOss(tenantId, code);
 		Oss ossCached = ossPool.get(tenantId);
 		OssTemplate template = templatePool.get(tenantId);

ldt-core/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java

@@ -24,6 +24,7 @@ import org.springblade.core.oss.model.BladeFile;
 import org.springblade.core.oss.model.OssFile;
 import org.springblade.core.secure.annotation.PreAuth;
 import org.springblade.core.tenant.annotation.NonDS;
+import org.springblade.core.tenant.annotation.TenantIgnore;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.RoleConstant;
 import org.springblade.core.tool.utils.FileUtil;
@@ -144,6 +145,7 @@ public class OssEndpoint {
 	 */
 	@SneakyThrows
 	@PostMapping("/put-file")
+	@TenantIgnore
 	public R<BladeFile> putFile(@RequestParam MultipartFile file) {
 		BladeFile bladeFile = ossBuilder.template().putFile(file.getOriginalFilename(), file.getInputStream());
 		return R.data(bladeFile);

ldt-core/src/main/java/org/springblade/payment/callback/trade/UserPayCS.java

@@ -251,7 +251,9 @@ public class UserPayCS {
 		Member member = null;
 		if(!Objects.isNull(pointBills)){
 			user.setChannelPoint(user.getChannelPoint().add(pointBills.getPrice()));
-			userChannelPoint = userChannelPointService.getOne(new QueryWrapper<UserChannelPoint>().lambda().eq(UserChannelPoint::getChannelId, pointBills.getChannelId()));
+			userChannelPoint = userChannelPointService.getOne(new QueryWrapper<UserChannelPoint>().lambda()
+				.eq(UserChannelPoint::getUserId,user.getId())
+				.eq(UserChannelPoint::getChannelId, pointBills.getChannelId()));
 			if (Objects.isNull(userChannelPoint)) {
 				userChannelPoint = initUserChannelPoint(user, pointBills);
 			}