fix 订单标题过长的问题

This commit is contained in:
Jack 2025-10-14 12:05:10 +08:00
parent 7fc99bb3ca
commit 93fa75f487
2 changed files with 34 additions and 10 deletions

View File

@ -139,15 +139,27 @@ public class PayController {
@RequestMapping(value = "/saveOrUpdatePayConsumeTrade", method = RequestMethod.POST)
public boolean saveOrUpdatePayConsumeTrade(@RequestBody PayConsumeTrade payConsumeTrade) {
boolean flag = false;
try {
flag = payConsumeTradeService.saveOrUpdate(payConsumeTrade);
} catch (Exception e) {
// 参数校验
if (payConsumeTrade == null) {
logger.warn("[保存或更新交易记录] 参数校验失败payConsumeTrade 为空");
return false;
}
try {
boolean flag = payConsumeTradeService.saveOrUpdate(payConsumeTrade);
if (flag) {
logger.debug("[保存或更新交易记录] 操作成功tradeId: {}", payConsumeTrade.getConsume_trade_id());
} else {
logger.warn("[保存或更新交易记录] 操作失败tradeId: {}", payConsumeTrade.getConsume_trade_id());
}
return flag;
} catch (Exception e) {
logger.error("[保存或更新交易记录] 系统异常tradeId: {}", payConsumeTrade.getConsume_trade_id(), e);
return false;
}
return flag;
}
@RequestMapping(value = "/saveOrUpdatePayUserResource", method = RequestMethod.POST)
public boolean saveOrUpdatePayUserResource(@RequestBody PayUserResource payUserResource) {
boolean flag;

View File

@ -3303,7 +3303,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
// RMK 第三方数据同步相关redis 给这个商品减去对应的库存
Map<String, Integer> stockDeltaMap = new HashMap<>();
stockDeltaMap.put(item_src_id+"_"+order_item_row.getOrder_id(), -order_item_quantity);
stockDeltaMap.put(item_src_id + "_" + order_item_row.getOrder_id(), -order_item_quantity);
syncThirdDataService.incrProductStockToRedis(stockDeltaMap);
}
}
@ -4226,7 +4226,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
log.debug("释放库存Item_src_id:{},数量:{}", shopProductItem.getItem_src_id(), order_item_quantity);
// RMK 第三方数据同步相关redis 给这个商品加上对应的库存
Map<String, Integer> stockDeltaMap = new HashMap<>();
stockDeltaMap.put(shopProductItem.getItem_src_id()+"_"+order_item_row.getOrder_id(), order_item_quantity);
stockDeltaMap.put(shopProductItem.getItem_src_id() + "_" + order_item_row.getOrder_id(), order_item_quantity);
syncThirdDataService.incrProductStockToRedis(stockDeltaMap);
}
}
@ -6523,7 +6523,20 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
// 订单信息保存处理
if (flag) {
String product_item_name = item_items.stream().map(s -> Convert.toStr(s.get("product_item_name"))).collect(Collectors.joining("|"));
// 订单商品标题
// String product_item_name = item_items.stream().map(s -> Convert.toStr(s.get("product_item_name"))).collect(Collectors.joining("|"));
String product_item_name = "";
if (CollUtil.isNotEmpty(item_items)) {
String firstProductName = Convert.toStr(item_items.get(0).get("product_item_name"));
if (StrUtil.isNotBlank(firstProductName)) {
// 限制长度防止超出字段限制
if (firstProductName.length() > 100) {
firstProductName = firstProductName.substring(0, 100);
}
product_item_name = firstProductName + "等商品";
}
}
Integer subsite_id = (Integer) store_item.get("subsite_id");
Integer store_is_selfsupport = (Integer) store_item.get("store_is_selfsupport");
Integer payment_type_id = (Integer) checkout_row.get("payment_type_id");
@ -7244,7 +7257,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
// RMK 第三方数据同步相关redis 给这个商品减去上对应的库存
log.debug("减库存Item_src_id:{},数量:{}", item_src_id, cart_quantity);
Map<String, Integer> stockDeltaMap = new HashMap<>();
stockDeltaMap.put(item_src_id+"_"+order_id, -cart_quantity);
stockDeltaMap.put(item_src_id + "_" + order_id, -cart_quantity);
syncThirdDataService.incrProductStockToRedis(stockDeltaMap);
}
@ -7877,7 +7890,6 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
consume_trade_row.setTrade_day(info_row.getOrder_day()); //
consume_trade_row.setTrade_title(info_row.getOrder_title()); // 标题
if (!payService.saveOrUpdatePayConsumeTrade(consume_trade_row)) {
throw new ApiException(I18nUtil._("订单支付信息失败!"));
} else {