From 23f2e8a7e29d7cefa86d80c92f8727f44b763bee Mon Sep 17 00:00:00 2001 From: Jack <46790855@qq.com> Date: Wed, 27 Aug 2025 18:03:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=9B=E5=BB=BA=E9=A1=BA?= =?UTF-8?q?=E4=B8=B0=E5=BA=97=E9=93=BA=EF=BC=8C=E8=8E=B7=E5=8F=96=E5=8E=BF?= =?UTF-8?q?=E7=BA=A7=E5=B8=82=E7=9A=84=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/ShopStoreSameCityTransport.java | 2 +- .../store/ShopStoreSameCityTransportBase.java | 2 +- .../controller/mobile/LakalaController.java | 2 +- .../mall/shop/lakala/utils/LakalaUtil.java | 17 +++-- .../service/impl/SFExpressApiServiceImpl.java | 15 ++-- .../impl/ShopStoreBaseServiceImpl.java | 69 ++++++++++--------- ...StoreSameCityTransportBaseServiceImpl.java | 15 +++- ...ShopStoreSameCityTransportServiceImpl.java | 9 +-- 8 files changed, 73 insertions(+), 58 deletions(-) diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStoreSameCityTransport.java b/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStoreSameCityTransport.java index 34b55c9b..3b102bdd 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStoreSameCityTransport.java +++ b/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStoreSameCityTransport.java @@ -40,7 +40,7 @@ public class ShopStoreSameCityTransport implements Serializable { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "运费自增ID") - @TableId(value = "transport_id", type = IdType.INPUT) + @TableId(value = "transport_id", type = IdType.AUTO) private Long transport_id; @ApiModelProperty(value = "基础运费自增ID") diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStoreSameCityTransportBase.java b/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStoreSameCityTransportBase.java index 4764f276..00c097b6 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStoreSameCityTransportBase.java +++ b/mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStoreSameCityTransportBase.java @@ -40,7 +40,7 @@ public class ShopStoreSameCityTransportBase implements Serializable { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "基础运费自增ID") - @TableId(value = "transport_base_id", type = IdType.INPUT) + @TableId(value = "transport_base_id", type = IdType.AUTO) private Long transport_base_id; @ApiModelProperty(value = "店铺ID") diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/controller/mobile/LakalaController.java b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/controller/mobile/LakalaController.java index 033faf4e..bf8a55ed 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/controller/mobile/LakalaController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/controller/mobile/LakalaController.java @@ -105,7 +105,7 @@ public class LakalaController extends BaseControllerImpl { // return shopOrderBaseService.sameCityOrderExpireSeconds(10000L); - return sfExpressApiService.createSfExpressShop(58, "桂平能辉超市", "桂平市", "广西壮族自治区贵港市桂平市中山南路凤凰商业中心19-3号", "谢能坤", "17777525395", "110.08105", "23.39339"); + return sfExpressApiService.createSfExpressShop(66, "能辉超市", "桂平市", "广西壮族自治区贵港市桂平市广佰汇超市(桂平店)", "谢能坤", "17777525395", "110.07165452271", "23.369069486251"); } diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/utils/LakalaUtil.java b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/utils/LakalaUtil.java index 9a5f2565..35c7e81a 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/utils/LakalaUtil.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/utils/LakalaUtil.java @@ -434,20 +434,23 @@ public class LakalaUtil { return decodedDataStr; } catch (IllegalArgumentException e) { - log.error("Base64解码失败: {}", e.getMessage(), e); + log.error("Base64解码失败: {}", e.getMessage()); + return null; } catch (NoSuchAlgorithmException | NoSuchPaddingException e) { - log.error("RSA算法初始化失败: {}", e.getMessage(), e); + log.error("RSA算法初始化失败: {}", e.getMessage()); + return null; } catch (InvalidKeySpecException | InvalidKeyException e) { - log.error("私钥格式或类型错误: {}", e.getMessage(), e); + log.error("私钥格式或类型错误: {}", e.getMessage()); + return null; } catch (BadPaddingException | IllegalBlockSizeException e) { - log.error("解密数据块大小或填充错误: {}", e.getMessage(), e); + log.error("解密数据块大小或填充错误: {}", e.getMessage()); + return null; } catch (Exception e) { - log.error("解密过程中出现未知异常: {}", e.getMessage(), e); + log.error("解密过程中出现未知异常: {}", e.getMessage()); + return null; } finally { closeQuietly(out); } - - return null; } /** diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java index 24885863..c1781ec4 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java @@ -126,14 +126,15 @@ public class SFExpressApiServiceImpl implements SFExpressApiService { if (transportBase == null) { // 如果没有商家配送运费设置，则初始化 - Pair initResult = shopStoreSameCityTransportBaseService.initDefaultSameCityTransport(storeId); - if (!initResult.getFirst()) { - logger.error("初始化商家配送运费设置失败：{}", initResult.getSecond()); - return initResult; - } + shopStoreSameCityTransportBaseService.initDefaultSameCityTransport(storeId); transportBase = shopStoreSameCityTransportBaseService.getShopStoreSameCityTransportBaseById(Long.valueOf(storeId)); } + if (transportBase == null) { + logger.error("创建商家配送信息失败！"); + return Pair.of(false, "创建商家配送信息失败"); + } + // 3. 如果已存在顺丰店铺ID，验证其有效性 if (CheckUtil.isNotEmpty(transportBase.getShop_id())) { logger.debug("如果存在店铺Id，从顺丰同城平台查询店铺ID，开始验证其有效性！"); @@ -163,11 +164,13 @@ public class SFExpressApiServiceImpl implements SFExpressApiService { params.put("shop_contact_name", contactName); // 联系人姓名 params.put("shop_contact_phone", contactPhone); // 联系电话 + logger.debug("开始创建顺丰店铺，参数：{}", params); + // 5. 发送请求到顺丰接口 String paramJSON = JsonUtil.toJSONString(params); String sendUrl = buildUrl("createShop", paramJSON); String responseStr = HttpUtil.post(sendUrl, paramJSON); - + logger.debug("创建顺丰店铺结果:{}", responseStr); if (StrUtil.isBlank(responseStr)) { logger.error("创建顺丰店铺异常，无返回值！"); return Pair.of(false, "创建顺丰店铺异常，无返回值！"); diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java index e8507e84..524fc96d 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java @@ -729,17 +729,17 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl paramsMap) { + public Map getStoreList(Integer page, Integer rows, Map paramsMap) { Map data; Map params = new HashMap<>(); Integer store_id = getParameter("store_id", Integer.class); Integer store_category_id = getParameter("store_category_id", Integer.class); - boolean findStore= MapUtils.getBoolean(paramsMap, "findStore", false); - if(ObjectUtil.isNull(store_category_id)){ - if(null!=paramsMap.get("store_category_id")){ - store_category_id=MapUtils.getInteger(paramsMap,"store_category_id"); + boolean findStore = MapUtils.getBoolean(paramsMap, "findStore", false); + if (ObjectUtil.isNull(store_category_id)) { + if (null != paramsMap.get("store_category_id")) { + store_category_id = MapUtils.getInteger(paramsMap, "store_category_id"); } } Long distance = getParameter("distance", Long.class); @@ -761,9 +761,9 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl storeCategoryQueryWrapper = new QueryWrapper<>(); storeCategoryQueryWrapper.eq("store_category_parent_id", store_category_id); storeCategoryQueryWrapper.select("store_category_id"); - List shopBaseStoreCategories= shopBaseStoreCategoryService.list(storeCategoryQueryWrapper); + List shopBaseStoreCategories = shopBaseStoreCategoryService.list(storeCategoryQueryWrapper); store_category_ids.add(store_category_id); - for (ShopBaseStoreCategory storeCategory:shopBaseStoreCategories) { + for (ShopBaseStoreCategory storeCategory : shopBaseStoreCategories) { store_category_ids.add(storeCategory.getStore_category_id()); } - if(store_category_ids.size()>1){ + if (store_category_ids.size() > 1) { queryWrapper.in("store_category_id", store_category_ids); - }else { + } else { queryWrapper.eq("store_category_id", store_category_id); } params.put("store_category_id", store_category_id); @@ -901,7 +901,7 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl= 2 ? areaNames[1] : shopStoreBase.getStore_area().replace("/", ""); + String cityName = areaNames.length > 0 ? areaNames[areaNames.length - 1] : shopStoreBase.getStore_area().replace("/", ""); sfExpressApiService.createSfExpressShop(storeId, shopStoreBase.getStore_name(), cityName, shopStoreBase.getStore_address(), shopMchEntry.getContact_name(), contact_mobile, shopStoreBase.getStore_longitude(), shopStoreBase.getStore_longitude()); return Pair.of(storeId, "新增成功"); @@ -3473,6 +3473,8 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl rights_group_id = shopStoreEmployeeRightsGroups.stream().map(s -> s.getRights_group_id()).collect(Collectors.toList()); if (CollUtil.isNotEmpty(rights_group_id)) { // 初始化雇员信息 @@ -3481,22 +3483,21 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl idList = new ArrayList<>(); String storeIds = accountUserBase.getStore_ids(); - if (!storeIds.endsWith(",")) { - storeIds += ","; + if (StrUtil.isBlank(storeIds)) { + idList.add(storeId.toString()); + } else { + idList = StrUtil.split(storeIds, ","); + if (!idList.contains(storeId.toString())) { + // 追加新店铺ID + idList.add(storeId.toString()); + } } - // 追加新店铺ID - return storeIds + storeId; - + return StrUtil.join(",", CollUtil.distinct(idList)); } catch (Exception e) { log.error("追加店铺ID到用户失败，userId: {}, storeId: {}", userId, storeId, e); return ""; diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreSameCityTransportBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreSameCityTransportBaseServiceImpl.java index fa4afa0d..4a0c602d 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreSameCityTransportBaseServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreSameCityTransportBaseServiceImpl.java @@ -332,8 +332,17 @@ public class ShopStoreSameCityTransportBaseServiceImpl extends BaseServiceImpl saveOrUpdateResult = saveOrUpdateShopStoreSameCityTransportBase(transportBase); Long transportBaseId = saveOrUpdateResult.getFirst(); if (transportBaseId == null || transportBaseId <= 0) { - log.error("初始化店铺默认配置：新增同城配送基础设置失败！"); + log.error("初始化店铺默认配置：新增同城配送基础设置失败！transportBaseId:{}", transportBaseId); return Pair.of(false, saveOrUpdateResult.getSecond()); } diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreSameCityTransportServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreSameCityTransportServiceImpl.java index 4d7dd627..1854c561 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreSameCityTransportServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreSameCityTransportServiceImpl.java @@ -116,7 +116,6 @@ public class ShopStoreSameCityTransportServiceImpl extends BaseServiceImpl