backend/java-mall
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 店铺 空指针

Browse Source
This commit is contained in:
Jack 2025-07-01 18:03:12 +08:00
parent a87dab9a3e
commit 87b15279b7
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mall-shop/src/main/java/com/suisung/mall/shop/order/service/ShopOrderReturnService.java
View File

@ -110,6 +110,11 @@ public interface ShopOrderReturnService extends IBaseService<ShopOrderReturn> {
*/ */
boolean doOnlineRefund(String return_id); boolean doOnlineRefund(String return_id);
/**
* 更新退款订单状态
*
* @param shopOrderReturn
*/
boolean updateRefundOrderReturn(ShopOrderReturn shopOrderReturn); boolean updateRefundOrderReturn(ShopOrderReturn shopOrderReturn);
/** /**

2
mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
View File

@ -2381,7 +2381,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
throw new ApiException(I18nUtil._("该状态不可进行出库审核")); throw new ApiException(I18nUtil._("该状态不可进行出库审核"));
} }
} else { } else {
throw new ApiException(I18nUtil._("没有操作权限")); throw new ApiException(I18nUtil._("无操作权限"));
} }
} }

2
mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java
View File

@ -278,7 +278,7 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl<ShopMchEntryMapper,
return CommonResult.failed("入驻信息提交失败！"); return CommonResult.failed("入驻信息提交失败！");
} }
// 尊敬的管理员，商家 ${name}，提交了入驻我们平台的申请，请及时对相关资质材料予以审核，以便推进后续流程。 // 给平台管理员发短信，通知有商家入驻：尊敬的管理员，商家 ${name}，提交了入驻我们平台的申请，请及时对相关资质材料予以审核，以便推进后续流程。
// 获取平台方的手机号码，发送短信通知 // 获取平台方的手机号码，发送短信通知
Pair<String, String> mobileAndLicenseNumber = esignPlatformInfoService.getEsignPlatformMobileAndLicenseNumber(); Pair<String, String> mobileAndLicenseNumber = esignPlatformInfoService.getEsignPlatformMobileAndLicenseNumber();
if (mobileAndLicenseNumber != null) { if (mobileAndLicenseNumber != null) {

7
mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
View File

@ -1178,6 +1178,11 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl<ShopStoreBaseMappe
@Override @Override
public Map info() { public Map info() {
Integer store_id = Convert.toInt(getParameter("store_id"));
if (ObjectUtil.isNull(store_id)) {
throw new ApiException(I18nUtil._("缺少必要参数！"));
}
Map rows = new HashMap(); Map rows = new HashMap();
UserDto user = getCurrentUser(); UserDto user = getCurrentUser();
Integer user_id = ObjectUtil.isNotNull(user) ? user.getId() : null; Integer user_id = ObjectUtil.isNotNull(user) ? user.getId() : null;
@ -1185,7 +1190,7 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl<ShopStoreBaseMappe
ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
CompletableFuture<Void> infoFuture1 = CompletableFuture.runAsync(() -> { CompletableFuture<Void> infoFuture1 = CompletableFuture.runAsync(() -> {
RequestContextHolder.setRequestAttributes(servletRequestAttributes, true); RequestContextHolder.setRequestAttributes(servletRequestAttributes, true);
Integer store_id = Convert.toInt(getParameter("store_id")); //Integer store_id = Convert.toInt(getParameter("store_id"));
ShopStoreBase shopStoreBase = shopStoreBaseService.get(store_id); ShopStoreBase shopStoreBase = shopStoreBaseService.get(store_id);
Map store_base_row = Convert.toMap(String.class, Object.class, shopStoreBase); Map store_base_row = Convert.toMap(String.class, Object.class, shopStoreBase);