deliveryman/deliveryman-api
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: deliveryman:main
Branches Tags
deliveryman:main
deliveryman:allinpay
..
compare: deliveryman:allinpay
Branches Tags
deliveryman:main
deliveryman:allinpay

No commits in common. "main" and "allinpay" have entirely different histories.
main ... allinpay

7 changed files with 39 additions and 123 deletions
Show Stats Expand all files Collapse all files

26
app/api/endpoints/coupon_activity.py
View File

@ -257,13 +257,13 @@ async def check_receive(
"message": message
})
@router.get("/{activity_id}/get_qr_code", response_model=ResponseModel)
async def get_qr_code(
@router.get("/{activity_id}/get_url_link", response_model=ResponseModel)
async def get_url_link(
activity_id: int,
db: Session = Depends(get_db),
current_user: UserDB = Depends(get_current_user)
):
"""获取二维码"""
"""获取URL链接"""
activity = db.query(CouponActivityDB).filter(
CouponActivityDB.id == activity_id
).first()
@ -287,26 +287,6 @@ async def get_qr_code(
return success_response(data=url)
@router.get("/{activity_id}/get_url_link", response_model=ResponseModel)
async def get_url_link(
activity_id: int,
db: Session = Depends(get_db),
current_user: UserDB = Depends(get_current_user)
):
"""获取URL链接"""
activity = db.query(CouponActivityDB).filter(
CouponActivityDB.id == activity_id
).first()
if not activity:
return error_response(code=404, message="活动不存在")
# 获取URL链接
wechat_client = WeChatClient()
url = await wechat_client.get_url_link(path=f"pages/my/promation/activities/index", query=f"id={activity_id}")
return success_response(data=url)
@router.put("/{activity_id}", response_model=ResponseModel)
async def update_coupon_activity(

8
app/api/endpoints/dashboard.py
View File

@ -41,7 +41,6 @@ async def get_dashboard_info(
# 查询已下单用户数
all_orders = db.query(ShippingOrderDB).all()
completed_orders = [order for order in all_orders if order.status == OrderStatus.COMPLETED]
unpaid_orders = [order for order in all_orders if order.status == OrderStatus.UNPAID]
#获取订单数超过 2 个的用户数量
repeat_user_count = 0
@ -59,7 +58,7 @@ async def get_dashboard_info(
has_order_user_count = len(set([order.userid for order in all_orders if order.status != OrderStatus.CANCELLED]))
has_order_completed_user_count = len(set([order.userid for order in completed_orders if order.status == OrderStatus.COMPLETED]))
has_paid_user_count = len(set([order.userid for order in completed_orders if order.status == OrderStatus.COMPLETED and order.final_amount > 0]))
has_unpaid_user_count = len(set([order.userid for order in unpaid_orders]))
order_count = len(completed_orders)
# 今日新增配送订单数
@ -72,7 +71,7 @@ async def get_dashboard_info(
#需要支付的订单数量
need_pay_order_count = len([order for order in completed_orders if order.final_amount > 0])
order_unpaid_count = len(unpaid_orders)
order_unpaid_count = len([order for order in completed_orders if order.status == OrderStatus.UNPAID and order.final_amount > 0])
order_pay_count = len([order for order in completed_orders if order.status == OrderStatus.COMPLETED and order.final_amount > 0])
pay_rate = order_pay_count / need_pay_order_count if need_pay_order_count > 0 else 0
@ -80,7 +79,7 @@ async def get_dashboard_info(
order_amount = sum([order.original_amount_with_additional_fee for order in completed_orders])
completed_order_amount = sum([order.original_amount_with_additional_fee for order in completed_orders if order.status == OrderStatus.COMPLETED])
pay_amount = sum([order.final_amount for order in completed_orders if order.status == OrderStatus.COMPLETED and order.final_amount > 0])
unpaid_amount = sum([order.original_amount_with_additional_fee for order in unpaid_orders])
unpaid_amount = sum([order.original_amount_with_additional_fee for order in completed_orders if order.status == OrderStatus.UNPAID])
# 今日订单金额
today_order_amount = sum([order.original_amount_with_additional_fee for order in completed_orders if order.completed_time.date() == datetime.now().date()])
@ -95,7 +94,6 @@ async def get_dashboard_info(
"has_order_user_count": has_order_user_count,
"has_order_completed_user_count": has_order_completed_user_count,
"has_paid_user_count": has_paid_user_count,
"has_unpaid_user_count": has_unpaid_user_count,
"order_count": order_count,
"need_pay_order_count": need_pay_order_count,
"order_completed_count": order_completed_count,

69
app/api/endpoints/order.py
View File

@ -16,7 +16,6 @@ from app.models.order import (
OrderPriceResult,
RefundOrderAmountRequest
)
from app.models.wechat_payment import WechatPaymentRecordDB
from app.models.order_additional_fee import OrderAdditionalFeeDB, OrderAdditionalFeeInfo, AdditionalFeeResult
from app.models.database import get_db
from app.api.deps import get_current_user, get_deliveryman_user, get_admin_user
@ -51,8 +50,6 @@ from app.models.community_timeperiod import CommunityTimePeriodDB
from app.models.community_profit_sharing import CommunityProfitSharing
from app.core.qcloud import QCloudManager
from app.core.wechat import WeChatClient
from app.models.community import CommunityStatus
router = APIRouter()
def calculate_price(price_request: OrderPriceCalculateRequest,user: UserDB,db: Session) -> OrderPriceResult:
@ -211,28 +208,27 @@ async def pre_order(
if request.delivery_date and request.delivery_date < datetime.now().date():
return error_response(code=400, message="配送日期不能选择过去的时间")
# 检查是否在服务时间
community = db.query(CommunityDB).filter(
CommunityDB.id == request.community_id
).first()
# 检查是否在服务时间
if community and community.status != CommunityStatus.OPENING:
return error_response(code=400, message="服务暂未开放")
if community:
# 检查是否在服务时间
if community.weekdays and request.delivery_date:
if request.delivery_date.isoweekday() not in community.weekdays:
# 检查是否在服务时间
if community and community.weekdays and request.delivery_date:
if request.delivery_date.isoweekday() not in community.weekdays:
#排序
sorted_weekdays = sorted(community.weekdays)
#排序
sorted_weekdays = sorted(community.weekdays)
if has_consecutive_weekdays(sorted_weekdays):
message = f"服务时间为: 周{sorted_weekdays[0]}-{sorted_weekdays[-1]}"
else:
message = f"服务时间为: "
for day in sorted_weekdays:
message += f"周{day}, "
message = message[:-2]
return error_response(code=400, message=message)
if has_consecutive_weekdays(sorted_weekdays):
message = f"服务时间为: 周{sorted_weekdays[0]}-{sorted_weekdays[-1]}"
else:
message = f"服务时间为: "
for day in sorted_weekdays:
message += f"周{day}, "
message = message[:-2]
return error_response(code=400, message=message)
# 检查是否有未支付的订单
unpay_order = db.query(ShippingOrderDB).filter(
@ -484,23 +480,6 @@ async def get_order_detail(
if not order:
return error_response(code=404, message="订单不存在")
# 检查订单是否已经支付
if order.status == OrderStatus.UNPAID:
payment = db.query(WechatPaymentRecordDB).filter(
WechatPaymentRecordDB.out_trade_no == orderid
).first()
# 如果订单已支付，则更新订单状态
if payment and payment.trade_state == "SUCCESS":
if order.deliveryman_user_id:
order.status = OrderStatus.COMPLETED
else:
order.status = OrderStatus.CREATED
order.pay_status = True
order.transaction_id = payment.transaction_id
order.pay_time = payment.success_time
db.commit()
db.refresh(order)
# 如果有配送员 id，则获取配送员信息
if order.deliveryman_user_id:
deliveryman_user = db.query(UserDB).filter(
@ -1319,6 +1298,12 @@ async def deliveryman_complete_order(
OrderStatus.COMPLETED
)
qcloud = QCloudManager()
background_tasks.add_task(
qcloud.send_sms_order_complete,
order.address_customer_phone
)
# 发送模板消息
if order.userid:
order_user = db.query(UserDB).filter(
@ -1342,12 +1327,6 @@ async def deliveryman_complete_order(
data=data,
orderid=order.orderid
)
else:
qcloud = QCloudManager()
background_tasks.add_task(
qcloud.send_sms_order_complete,
order.address_customer_phone
)
return success_response(
message="订单已完成" if order.final_amount == 0 else "请继续支付",
@ -1435,12 +1414,6 @@ async def deliveryman_receive_order(
data=data,
orderid=order.orderid
)
else:
qcloud = QCloudManager()
background_tasks.add_task(
qcloud.send_sms_order_receive,
order.address_customer_phone
)
return success_response(
message="接单成功",

26
app/api/endpoints/wechat.py
View File

@ -215,17 +215,15 @@ async def payment_notify(
# 获取订单信息
out_trade_no = data.get("out_trade_no")
transaction_id = data.get("transaction_id")
trade_state = data.get("trade_state")
trade_state_desc = data.get("trade_state_desc")
success_time = data.get("success_time")
logger.info(f"out_trade_no: {out_trade_no}")
logger.info(f"transaction_id: {transaction_id}")
logger.info(f"trade_state_desc: {trade_state_desc}")
logger.info(f"trade_state: {trade_state}")
logger.info(f"success_time: {success_time}")
if not all([out_trade_no, transaction_id, trade_state])or trade_state != "SUCCESS":
if not all([out_trade_no, transaction_id, trade_state_desc]) or trade_state_desc != "支付成功":
return error_response(code=400, message="缺少必要的订单信息或支付未成功")
# 判断订单类型并处理
@ -238,18 +236,12 @@ async def payment_notify(
if not order:
return error_response(code=404, message="订单不存在")
if trade_state == "SUCCESS":
if trade_state_desc == "支付成功":
# 更新订单状态
if order.deliveryman_user_id:
order.status = OrderStatus.COMPLETED # 支付成功后状态为已完成
else:
order.status = OrderStatus.CREATED # 支付成功后状态为已创建
order.pay_status = True
order.completed_time = datetime.now()
order.transaction_id = transaction_id
order.pay_time = datetime.fromisoformat(success_time.replace('Z', '+00:00'))
db.commit()
db.refresh(order)
# 发送企业微信消息
if order.status == OrderStatus.CREATED:
@ -261,6 +253,11 @@ async def payment_notify(
OrderStatus.CREATED
)
order.pay_status = True
order.completed_time = datetime.now()
order.transaction_id = transaction_id
order.pay_time = datetime.fromisoformat(success_time.replace('Z', '+00:00'))
elif out_trade_no.startswith("A"): # 加价订单
additon_fee_order = db.query(OrderAdditionalFeeDB).filter(
OrderAdditionalFeeDB.fee_order_id == out_trade_no
@ -286,8 +283,7 @@ async def payment_notify(
# 重新计算配送员配送费用
order.delivery_share = calculate_delivery_share(order, db)
db.commit()
db.refresh(order)
elif out_trade_no.startswith("M"): # 商家商品订单
# 查询商户订单
@ -317,8 +313,6 @@ async def payment_notify(
order.pay_status = True
order.transaction_id = transaction_id
order.pay_time = datetime.fromisoformat(success_time.replace('Z', '+00:00'))
db.commit()
db.refresh(order)
elif out_trade_no.startswith("P"): # 商家在线买单
order = db.query(MerchantPayOrderDB,MerchantDB).filter(
@ -345,8 +339,6 @@ async def payment_notify(
order.MerchantPayOrderDB.status = MerchantPayOrderStatus.PAID
order.MerchantPayOrderDB.transaction_id = transaction_id
order.MerchantPayOrderDB.pay_time = datetime.fromisoformat(success_time.replace('Z', '+00:00'))
db.commit()
db.refresh(order)
# 对商家进行分账计算
account_manager = AccountManager(db)
@ -368,7 +360,7 @@ async def payment_notify(
payment_record = WechatPaymentRecordDB(
out_trade_no=out_trade_no,
transaction_id=transaction_id,
trade_state=trade_state,
trade_state=data.get("trade_state"),
trade_state_desc=trade_state_desc,
success_time=datetime.fromisoformat(success_time) if success_time else None,
total_amount=float(data.get("amount", {}).get("total", 0)) / 100,

5
app/core/config.py
View File

@ -60,11 +60,10 @@ class Settings(BaseSettings):
TENCENT_SECRET_KEY: str = "ta6PXTMBsX7dzA7IN6uYUFn8F9uTovoU"
TENCENT_REGION: str = "ap-guangzhou" # 接口地域
SMS_SDK_APP_ID: str = "1400961527"
SMS_SIGN_NAME: str = "成都爱嘉辰科技"
SMS_SIGN_NAME: str = "蜂快到家公众号"
SMS_TEMPLATE_ID: str = "2353143" # 验证码短信模板ID
SMS_TEMPLATE_ID_ADDITIONAL_FEE: str = "2375181" # 加价短信模板ID
SMS_TEMPLATE_ID_ORDER_COMPLETE: str = "2410806" # 订单完成短信模板ID
SMS_TEMPLATE_ID_ORDER_RECEIVE: str = "2410809" # 订单接单短信模板ID
SMS_TEMPLATE_ID_ORDER_COMPLETE: str = "2382882" # 订单完成短信模板ID
# 腾讯云 COS 配置
COS_REGION: str = "ap-chengdu"

26
app/core/qcloud.py
View File

@ -108,32 +108,6 @@ class QCloudManager:
except TencentCloudSDKException as e:
raise Exception(f"发送短信失败: {str(e)}")
async def send_sms_order_receive(self, phone: str) -> tuple[str, str]:
"""
发送订单接单短信
"""
try:
self._init_sms_client()
# 构建请求
req = sms_models.SendSmsRequest()
req.SmsSdkAppId = settings.SMS_SDK_APP_ID
req.SignName = settings.SMS_SIGN_NAME
req.TemplateId = settings.SMS_TEMPLATE_ID_ORDER_RECEIVE
req.PhoneNumberSet = [f"+86{phone}"]
# 发送短信
response = self.sms_client.SendSms(req)
# 检查发送结果
if response.SendStatusSet[0].Code != "Ok":
raise Exception(response.SendStatusSet[0].Message)
return response.RequestId
except TencentCloudSDKException as e:
raise Exception(f"发送订单接单短信失败: {str(e)}")
async def send_sms_order_complete(self, phone: str) -> tuple[str, str]:
"""
发送订单完成短信

BIN
jobs.sqlite
View File

Binary file not shown.