diff --git a/mall-pay/src/main/java/com/suisung/mall/pay/controller/admin/PayController.java b/mall-pay/src/main/java/com/suisung/mall/pay/controller/admin/PayController.java index fa853514..8ade5abc 100644 --- a/mall-pay/src/main/java/com/suisung/mall/pay/controller/admin/PayController.java +++ b/mall-pay/src/main/java/com/suisung/mall/pay/controller/admin/PayController.java @@ -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; diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java index f70101f7..1c596304 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java @@ -3303,7 +3303,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl 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 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 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 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