diff --git a/app/core/wecombot.py b/app/core/wecombot.py index 8ba9508..0d4da11 100644 --- a/app/core/wecombot.py +++ b/app/core/wecombot.py @@ -10,7 +10,7 @@ from app.models.community import CommunityDB from app.models.user import UserDB from sqlalchemy.orm import Session import logging - +from app.core.config import settings class WecomBot: """企业微信机器人工具类""" @@ -199,18 +199,27 @@ class WecomBot: raise ValueError("不支持的通知类型") content = f"""# {title} - + +**{settings.ENV_NAME}** + +**所属小区** +> {shipping_order.address_community_name} + +**订单信息** > 订单号: {shipping_order.orderid} > 下单时间: {CommonUtils.get_asia_datetime(shipping_order.create_time)} > 包裹数量: {shipping_order.package_count}个 -> 订单金额: ¥{shipping_order.original_amount} +> 基础配送费: ¥{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.final_amount} > 订单状态: {shipping_order.status.status_text} **收件信息** > 姓名: {shipping_order.address_customer_name} > 电话: {shipping_order.address_customer_phone[:3]}\*\*\*\*{shipping_order.address_customer_phone[7:]} -> 地址: {shipping_order.address_community_name} | {shipping_order.address_community_building_name} {shipping_order.address_detail[0:3]} \*\*\*\* +> 地址: {shipping_order.address_community_building_name} {shipping_order.address_detail[0:3]} \*\*\*\* """ if shipping_order.deliveryman_user_id: diff --git a/jobs.sqlite b/jobs.sqlite index b055225..ec16a8b 100644 Binary files a/jobs.sqlite and b/jobs.sqlite differ