优化日志打印

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

@@ -8513,12 +8513,14 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
      * 2、商家的详细地址、电话和经纬度
      * 3、收货人的姓名、电话、详细地址、经纬度
      *
-     * @param shopOrderId 商城订单id
+     * @param devId          开发者ID
-     * @return
+     * @param shopOrderId    商城订单id
+     * @param orderPickupNum 订单取货编号
+     * @return SFCreateOrderReq 顺丰同城订单请求对象，如果构建失败返回null
      */
     public SFCreateOrderReq buildSFOrderData(Integer devId, String shopOrderId, Long orderPickupNum) {
         if (StrUtil.isBlank(shopOrderId)) {
-            logger.error("缺少订单Id");
+            logger.error("构建顺丰订单失败：缺少订单Id，devId={}, shopOrderId={}", devId, shopOrderId);
             return null;
         }
 
@@ -8528,13 +8530,13 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
         queryWrapper.eq("order_id", shopOrderId);
         List<ShopOrderItem> shopOrderItemList = shopOrderItemService.list(queryWrapper);
         if (shopOrderBase == null || shopOrderData == null || CollUtil.isEmpty(shopOrderItemList)) {
-            logger.error("无法获取订单信息！");
+            logger.error("构建顺丰订单失败：无法获取订单信息，订单ID={}", shopOrderId);
             return null;
         }
 
         Integer storeId = shopOrderBase.getStore_id();
         if (storeId == null || storeId <= 0) {
-            logger.error("缺少店铺 Id！");
+            logger.error("构建顺丰订单失败：缺少店铺Id，订单ID={}，storeId={}", shopOrderId, storeId);
             return null;
         }
 
@@ -8543,12 +8545,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
         ShopOrderDeliveryAddress shopOrderDeliveryAddress = shopOrderDeliveryAddressService.selectByOrderId(shopOrderId);
         ShopStoreSameCityTransportBase shopStoreSameCityTransportBase = shopStoreSameCityTransportBaseService.getShopStoreSameCityTransportBaseById(storeId.longValue());
         if (shopStoreBase == null || shopStoreInfo == null || shopOrderDeliveryAddress == null || shopStoreSameCityTransportBase == null) {
-            logger.error("无法获取店铺信息！");
+            logger.error("构建顺丰订单失败：无法获取店铺信息，订单ID={}，storeId={}", shopOrderId, storeId);
-            return null;
-        }
-
-        if (shopStoreSameCityTransportBase == null) {
-            logger.error("请配置同城配送设置！");
             return null;
         }
 
@@ -8556,11 +8553,11 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
         String shopId = "3243279847393";
         //3269768224353 到时启用这个正式店铺 type:便利店
         Integer businessType = 6;// 生鲜分类
-        if (enable_sf_express.equals(CommonConstant.Enable)) {//开启正式配送服务的时候
+        if (CommonConstant.Enable.equals(enable_sf_express)) {//开启正式配送服务的时候
             // 顺丰同城业务员给的店铺id
             shopId = shopStoreSameCityTransportBase.getShop_id();
             if (StrUtil.isBlank(shopId)) {
-                logger.error("请联系顺丰同城配置店铺ID！");
+                logger.error("构建顺丰订单失败：请联系顺丰同城配置店铺ID，订单ID={}，storeId={}", shopOrderId, storeId);
                 return null;
             }
 
@@ -8582,8 +8579,8 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
         sfCreateOrderReq.setVersion(19);
         sfCreateOrderReq.setReturn_flag(511);
 
-        Integer productNum = 0;
+        Integer totalProductQuantity = 0;
-        Integer productTypeNum = shopOrderItemList.size();
+        Integer productTypeCount = shopOrderItemList.size();
 
         // 订单详情信息
         SFOrderDetailReq orderDetail = new SFOrderDetailReq();
@@ -8592,24 +8589,35 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
         List<SFOrderProductDetailReq> orderProductList = new ArrayList<>();
 
         for (ShopOrderItem shopOrderItem : shopOrderItemList) {
-            productNum += shopOrderItem.getOrder_item_quantity();
+            totalProductQuantity += shopOrderItem.getOrder_item_quantity();
             // 产品详情
             SFOrderProductDetailReq orderProductDetail = new SFOrderProductDetailReq();
             orderProductDetail.setProduct_id(shopOrderItem.getProduct_id());
             orderProductDetail.setProduct_name(shopOrderItem.getItem_name());
             orderProductDetail.setProduct_num(shopOrderItem.getOrder_item_quantity());
-            // 单个商品金额=数量*单价，单位分
+            // 单个商品金额=单价*数量，单位分
-            Integer itemPrice = shopOrderItem.getOrder_item_unit_price().multiply(BigDecimal.valueOf(shopOrderItem.getOrder_item_quantity())).multiply(BigDecimal.valueOf(100)).intValue();
+            BigDecimal itemPriceDecimal = shopOrderItem.getOrder_item_unit_price()
+                    .multiply(BigDecimal.valueOf(100))
+                    .multiply(BigDecimal.valueOf(shopOrderItem.getOrder_item_quantity()));
+            Integer itemPrice = itemPriceDecimal.intValue();
             orderProductDetail.setProduct_price(itemPrice);
             orderProductList.add(orderProductDetail);
+
+            // 记录商品详情日志，便于部署后排查问题
+            logger.debug("订单{}商品详情：商品ID={}, 商品名称={}, 数量={}, 单价(分)={}, 小计(分)={}",
+                    shopOrderId,
+                    shopOrderItem.getProduct_id(),
+                    shopOrderItem.getItem_name(),
+                    shopOrderItem.getOrder_item_quantity(),
+                    shopOrderItem.getOrder_item_unit_price().multiply(BigDecimal.valueOf(100)).intValue(),
+                    itemPrice);
         }
 
         orderDetail.setProduct_type(businessType); // 店铺主营商品分类，参考：https://commit-openic.sf-express.com/#/apidoc
         orderDetail.setTotal_price(shopOrderBase.getOrder_payment_amount().multiply(BigDecimal.valueOf(100)).intValue()); // 单位分
         orderDetail.setWeight_gram(0); // 重量一律传 0kg 先，谢总本地运营商协商好的
-        orderDetail.setProduct_num(productNum); //物品个数
+        orderDetail.setProduct_num(totalProductQuantity); //物品个数
-        orderDetail.setProduct_type_num(productTypeNum); //物品种类个数
+        orderDetail.setProduct_type_num(productTypeCount); //物品种类个数
-
 
         // 订单里的所有商品列表
         orderDetail.setProduct_detail(orderProductList);
@@ -8623,6 +8631,11 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
 
             // 店铺信息（发货人信息）
             Pair<Boolean, StandardAddressDTO> pairShopAddr = shopStoreBaseService.checkStoreAddress(shopStoreBase);
+            if (!pairShopAddr.getFirst()) {
+                logger.error("构建顺丰订单失败：店铺地址校验失败，订单ID={}，storeId={}", shopOrderId, storeId);
+                return null;
+            }
+
             shop.setShop_name(shopStoreBase.getStore_name());
             shop.setShop_phone(shopStoreInfo.getStore_tel());
             shop.setShop_address(pairShopAddr.getSecond().getFullAddress());
@@ -8631,6 +8644,11 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
 
             // 收货人信息
             Pair<Boolean, StandardAddressDTO> pairReceiveAddr = shopOrderDeliveryAddressService.checkAddress(shopOrderDeliveryAddress);
+            if (!pairReceiveAddr.getFirst()) {
+                logger.error("构建顺丰订单失败：收货地址校验失败，订单ID={}，storeId={}", shopOrderId, storeId);
+                return null;
+            }
+
             receive.setUser_name(shopOrderDeliveryAddress.getDa_name());
             receive.setUser_phone(shopOrderDeliveryAddress.getDa_mobile());
             receive.setUser_address(pairReceiveAddr.getSecond().getFullAddress());
@@ -8655,6 +8673,11 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
         sfCreateOrderReq.setShop(shop);
         sfCreateOrderReq.setReceive(receive);
 
+        // 记录完整的订单信息，便于部署后排查问题
+        logger.info("成功构建顺丰订单：订单ID={}, 店铺ID={}, 顺丰同城店铺ID={}, 商品种类数={}, 商品总数={}, 总价(分)={}",
+                shopOrderId, storeId, shopId, productTypeCount, totalProductQuantity,
+                shopOrderBase.getOrder_payment_amount().multiply(BigDecimal.valueOf(100)).intValue());
+
         return sfCreateOrderReq;
     }
 

mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderLklServiceImpl.java

@@ -229,7 +229,7 @@ public class ShopOrderLklServiceImpl extends BaseServiceImpl<ShopOrderLklMapper,
             record.setLkl_log_no(logNo);
 
             // 设置日期字段
-            record.setLkl_log_date(DateTimeUtils.formatDateTime(LocalDateTime.now(), "yyyy-MM-dd"));
+            record.setLkl_log_date(DateTimeUtils.formatDateTime(LocalDateTime.now(), "yyyyMMdd"));
 
             // 设置可选字段
             record.setLkl_trade_no(lklPayNotifyDataJson.getStr("trade_no"));
@@ -250,7 +250,7 @@ public class ShopOrderLklServiceImpl extends BaseServiceImpl<ShopOrderLklMapper,
             if (CheckUtil.isEmpty(record.getSplit_amt())) {
                 record.setSplit_amt(record.getTotal_amt());
             }
-            
+
             // 安全地设置响应内容
             record.setLkl_notify_resp(JSONUtil.toJsonStr(lklPayNotifyDataJson));