feat: 商家罚单列表统计与证据图管理接口
This commit is contained in:
@@ -57,7 +57,7 @@ from orders.notice_tasks import dingdan_guangbo
|
||||
|
||||
from .models import (
|
||||
Order, MerchantOrderExt, PlatformOrderExt, PlayerDeliveryImage,
|
||||
PenaltyRecord, PenaltyEvidenceImage, Penalty, PenaltyBonus,
|
||||
PenaltyRecord, PenaltyEvidenceImage, Penalty, PenaltyAppealImage, PenaltyBonus,
|
||||
CommissionRate, PlayerRating, RefundRecord,
|
||||
)
|
||||
from jituan.services.club_config import get_commission_rate, get_commission_rate_object
|
||||
@@ -3871,6 +3871,27 @@ class DashouCOSZhengshuView(APIView):
|
||||
elif yongtu == 'fakuan':
|
||||
# 罚款申诉不需要订单验证
|
||||
pass
|
||||
elif yongtu == 'fakuan_evidence':
|
||||
# 商家上传罚单证据图(Purpose=1)
|
||||
fadan_id = request.data.get('fadan_id')
|
||||
if not dingdan_id or not fadan_id:
|
||||
return Response(
|
||||
{'code': 400, 'msg': '缺少订单ID或罚单ID'},
|
||||
status=status.HTTP_400_BAD_REQUEST,
|
||||
)
|
||||
try:
|
||||
shangjia_profile = request.user.ShopProfile
|
||||
if shangjia_profile.zhuangtai != 1:
|
||||
return Response({'code': 403, 'msg': '商家状态异常'}, status=403)
|
||||
except Exception:
|
||||
return Response({'code': 403, 'msg': '非商家无权上传'}, status=403)
|
||||
fadan = Penalty.query.filter(
|
||||
id=fadan_id,
|
||||
RelatedOrderID=dingdan_id,
|
||||
ApplicantID=request.user.UserUID,
|
||||
).first()
|
||||
if not fadan:
|
||||
return Response({'code': 403, 'msg': '罚单不存在或无权操作'}, status=403)
|
||||
else:
|
||||
# 默认为订单相关,需要验证订单且打手必须接单
|
||||
try:
|
||||
@@ -3910,6 +3931,10 @@ class DashouCOSZhengshuView(APIView):
|
||||
resources.append(
|
||||
f"qcs::cos:{settings.COS_REGION}:uid/{settings.COS_APPID}:{settings.COS_BUCKET}/fakuan/dashoufakuan/dashoufakuanshensu/*"
|
||||
)
|
||||
elif yongtu == 'fakuan_evidence':
|
||||
resources.append(
|
||||
f"qcs::cos:{settings.COS_REGION}:uid/{settings.COS_APPID}:{settings.COS_BUCKET}/fakuan/shangjiafakuan/zhengju/*"
|
||||
)
|
||||
else:
|
||||
resources.append(
|
||||
f"qcs::cos:{settings.COS_REGION}:uid/{settings.COS_APPID}:{settings.COS_BUCKET}/order/{dingdan_id}/*"
|
||||
@@ -3948,8 +3973,11 @@ class DashouCOSZhengshuView(APIView):
|
||||
|
||||
# 5. 构建响应
|
||||
current_time = int(time.time())
|
||||
upload_dir = 'fakuan/dashoufakuan/dashoufakuanshensu/' if yongtu == 'fakuan' else (
|
||||
'a_long/chfajltp/dssstp/' if yongtu == 'chufa' else f'order/{dingdan_id}/'
|
||||
upload_dir = (
|
||||
'fakuan/shangjiafakuan/zhengju/' if yongtu == 'fakuan_evidence' else
|
||||
'fakuan/dashoufakuan/dashoufakuanshensu/' if yongtu == 'fakuan' else (
|
||||
'a_long/chfajltp/dssstp/' if yongtu == 'chufa' else f'order/{dingdan_id}/'
|
||||
)
|
||||
)
|
||||
response_data = {
|
||||
'credentials': {
|
||||
@@ -6499,6 +6527,8 @@ class ShangjiaFakuaiXiugaiView(APIView):
|
||||
return self._cancel_penalty(fadan, request.data.get('liyou', ''))
|
||||
elif operation == 'resubmit_penalty':
|
||||
return self._resubmit_penalty(fadan, request.data.get('liyou', ''), request.data.get('jine'))
|
||||
elif operation == 'manage_penalty_evidence':
|
||||
return self._manage_penalty_evidence(fadan, request.data)
|
||||
else:
|
||||
return Response({'code': 400, 'msg': '无效的操作类型'}, status=status.HTTP_400_BAD_REQUEST)
|
||||
|
||||
@@ -6541,6 +6571,10 @@ class ShangjiaFakuaiXiugaiView(APIView):
|
||||
fadan.FineAmount = jine
|
||||
# 如果之前是驳回状态修改,需要重置状态为待缴纳?不,修改不应改变状态
|
||||
fadan.save()
|
||||
logger.info(
|
||||
f"商家修改罚单{fadan.id}:理由={liyou[:50]},金额={jine},"
|
||||
f"操作人={fadan.ApplicantID}"
|
||||
)
|
||||
return Response({'code': 0, 'msg': '罚款修改成功'})
|
||||
|
||||
def _cancel_penalty(self, fadan, liyou):
|
||||
@@ -6553,6 +6587,7 @@ class ShangjiaFakuaiXiugaiView(APIView):
|
||||
fadan.Status = 4 # 已驳回
|
||||
fadan.RejectReason = liyou[:500]
|
||||
fadan.save()
|
||||
logger.info(f"商家撤销罚单{fadan.id},驳回理由={liyou[:50]}")
|
||||
return Response({'code': 0, 'msg': '罚款已撤销(驳回)'})
|
||||
|
||||
def _resubmit_penalty(self, fadan, liyou, jine_str):
|
||||
@@ -6573,4 +6608,33 @@ class ShangjiaFakuaiXiugaiView(APIView):
|
||||
fadan.FineAmount = jine
|
||||
fadan.RejectReason = '' # 清空驳回理由
|
||||
fadan.save()
|
||||
return Response({'code': 0, 'msg': '已重新申请罚款'})
|
||||
logger.info(f"商家重新申请罚单{fadan.id},金额={jine}")
|
||||
return Response({'code': 0, 'msg': '已重新申请罚款'})
|
||||
|
||||
def _manage_penalty_evidence(self, fadan, data):
|
||||
"""管理罚单证据图片(Purpose=1),与申诉图片严格隔离"""
|
||||
if fadan.Status not in (1, 3):
|
||||
return Response({'code': 400, 'msg': '当前罚单状态不可修改证据图片'})
|
||||
add_urls = data.get('add_urls') or []
|
||||
remove_ids = data.get('remove_ids') or []
|
||||
if not add_urls and not remove_ids:
|
||||
return Response({'code': 400, 'msg': '未提供图片变更'})
|
||||
with transaction.atomic():
|
||||
if remove_ids:
|
||||
PenaltyAppealImage.query.filter(
|
||||
Penalty=fadan, Purpose=1, id__in=remove_ids
|
||||
).delete()
|
||||
for url in add_urls:
|
||||
url = str(url).strip()
|
||||
if not url:
|
||||
continue
|
||||
PenaltyAppealImage.query.create(
|
||||
Penalty=fadan,
|
||||
PenalizedUserID=fadan.PenalizedUserID,
|
||||
ImageURL=url,
|
||||
Purpose=1,
|
||||
)
|
||||
logger.info(
|
||||
f"罚单{fadan.id}证据图变更:新增{len(add_urls)}张,删除{len(remove_ids)}张"
|
||||
)
|
||||
return Response({'code': 0, 'msg': '证据图片已更新'})
|
||||
Reference in New Issue
Block a user