update

app/api/endpoints/order.py

@@ -154,7 +154,7 @@ def calculate_price(price_request: OrderPriceCalculateRequest,user: UserDB,db: S
         result.price_info.final_amount = round(remaining_amount, 2)
 
         # 计算价格详情
-        result.price_detail_text = f"基础配送费{round(base_price, 1)}元(限{extra_package_threshold}件), 超件{round(extra_package_price, 1)}元/件, 超过1个驿站加收{round(base_more_station_price, 1)}元/站。"
+        result.price_detail_text = f"* 基础费{round(base_price, 1)}元(含1个驿站和{extra_package_threshold}件包裹), 超件{round(extra_package_price, 1)}元/件\r\n* 超过1个驿站, 增加配送路程, 加收{round(base_more_station_price, 1)}元/驿站"
 
         return result 
 

app/core/wecombot.py

@@ -200,7 +200,7 @@ class WecomBot:
 
             content = f"""# {title}
 
-**{settings.ENV_NAME}**
+> **环境:{settings.ENV_NAME}**
 
 **所属小区**
 > {shipping_order.address_community_name}
@@ -209,10 +209,7 @@ class WecomBot:
 > 订单号: {shipping_order.orderid}
 > 下单时间: {CommonUtils.get_asia_datetime(shipping_order.create_time)}
 > 包裹数量: {shipping_order.package_count}个
-> 基础配送费: ¥{shipping_order.original_amount - (shipping_order.more_station_price if shipping_order.more_station_price is not None else 0)}
-> 多驿站费: ¥{shipping_order.more_station_price if shipping_order.more_station_price is not None else 0}
-> 优惠券抵扣: ¥{shipping_order.coupon_discount_amount}
-> 积分抵扣: ¥{shipping_order.point_discount_amount}
+> 订单金额: ¥{shipping_order.original_amount}
 > 实付金额: ¥{shipping_order.final_amount}
 > 订单状态: <font color="{color}">{shipping_order.status.status_text}</font>