Merge branch 'master' of http://git.choozmo.com:3000/ai-anchor/video-maker

backend/app/app/api/api_v1/endpoints/payment.py

@@ -174,11 +174,12 @@ def ecpay_payment(
                                                     remark=remark_string)
     items = payment_data.item
     items = items.split("#")
+    print(payment.item)
     content = {}
     for item in items:
       pair = item.split()
       content[str(pair[0]).lower()] = pair[1]
-    content_string = json.dumps(content, ensure_ascii=False)
+    content_string = json.dumps(content, ensure_ascii=False).replace('"', "'")
     order_params = {
         'MerchantTradeNo': MerchantTradeNo,
         'StoreID': 'SaaS',
@@ -343,14 +344,14 @@ CheckMacValue: {CheckMacValue}\
     payment = crud.payment.get(db=db, id=payment_id)
     remark = json.loads(payment.remark)
     remark['TradeNo'] = TradeNo
+    payment = crud.payment.update(db, db_obj=payment, obj_in={"payment_state":"succeeded", "remark":json.dumps(remark, ensure_ascii=False)})
     content_string = CustomField3.replace("'",'"')
     content:dict = json.loads(content_string)
-    user = crud.user.get(db=db, id=int(CustomField2))
+    user_id = int(CustomField2)
+    user = crud.user.get(db=db, id=user_id)
     if 'credit' in content.keys():
       add_credit = content['credit']
       crud.user.update(db, db_obj=user, obj_in={"available_time": user.available_time + int(add_credit)})
-    payment = crud.payment.update(db, db_obj=payment, obj_in={"payment_state":"succeeded", "remark":json.dumps(remark, ensure_ascii=False)})
   else:  
     payment = crud.payment.update(db, db_obj=payment, obj_in={"payment_state":"failed", "remark":json.dumps(remark, ensure_ascii=False)})
-  print(payment.payment_state)
   return Response(content='1', status_code=status.HTTP_200_OK)

backend/app/app/crud/crud_payment.py

@@ -35,4 +35,4 @@ class CRUDPayment(CRUDBase[Payment, PaymentCreate, PaymentUpdate]):
             .all()
         )
         
-payment = CRUDPayment(Payment)
+payment = CRUDPayment(Payment)