Merge branch 'main' of https://git.gvsds.com/XingQue/Django

Co-authored-by: Cursor <cursoragent@cursor.com>
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

users/views/pay.py

@@ -475,6 +475,16 @@ class FaKuanPayPollView(APIView):
                 return Response({'code': 400, 'message': '订单ID不能为空'})
 
             order = Czjilu.query.get(dingdan_id=dingdanid, yonghuid=request.user.UserUID)
+            # 订单未支付时，尝试补偿履约（回调延迟/失败时通过轮询兜底）
+            if order.zhuangtai == 9:
+                from jituan.services.czjilu_fulfill import confirm_czjilu_paid, CzjiluFulfillError
+                try:
+                    confirm_czjilu_paid(dingdanid, request.user.UserUID, expected_leixing=6)
+                    order = Czjilu.query.get(dingdan_id=dingdanid, yonghuid=request.user.UserUID)
+                except CzjiluFulfillError as exc:
+                    logger.info(f"罚款确认未就绪 {dingdanid}: {exc}")
+                    return Response({'code': 400, 'message': '订单尚未支付'})
+
             if order.zhuangtai == 3:
                 return Response({'code': 200, 'message': '支付成功'})
             else:
@@ -998,6 +1008,16 @@ class KaohePayPollView(APIView):
             return Response({'code': 400, 'message': '订单ID不能为空'})
         try:
             order = Czjilu.query.get(dingdan_id=dingdanid, yonghuid=request.user.UserUID, leixing=5)
+            # 订单未支付时，尝试补偿履约（回调延迟/失败时通过轮询兜底）
+            if order.zhuangtai == 9:
+                from jituan.services.czjilu_fulfill import confirm_czjilu_paid, CzjiluFulfillError
+                try:
+                    confirm_czjilu_paid(dingdanid, request.user.UserUID, expected_leixing=5)
+                    order = Czjilu.query.get(dingdan_id=dingdanid, yonghuid=request.user.UserUID, leixing=5)
+                except CzjiluFulfillError as exc:
+                    logger.info(f"考核确认未就绪 {dingdanid}: {exc}")
+                    return Response({'code': 400, 'message': '订单尚未支付'})
+
             if order.zhuangtai == 3:
                 return Response({'code': 200, 'message': '支付成功'})
             return Response({'code': 400, 'message': '订单尚未支付'})