fix:error

Uni-dthon · Nov 3, 2024 · 556c835 · 556c835
1 parent f8ec4f6
commit 556c835
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Service/purchase_service.py b/Service/purchase_service.py
@@ -8,7 +8,10 @@ def purchase_history_list_db(item: ItemAdd):
         with get_db() as db:
             for item_add in item.items:
                 item_id = db.query(UserItem).filter(UserItem.user_id == item_add.user_id, UserItem.item_name == item_add.item_name).first().item_id
-                data_list.append(PurchaseHistory(user_id=item_add.user_id, item_id=item_id, price=item_add.price, count=item_add.count, date=item_add.purchase_date))
+                if item_add.count > item_add.price:
+                    data_list.append(PurchaseHistory(user_id=item_add.user_id, item_id=item_id, price=item_add.count, count=item_add.price, date=item_add.purchase_date))
+                else:
+                    data_list.append(PurchaseHistory(user_id=item_add.user_id, item_id=item_id, price=item_add.price, count=item_add.count, date=item_add.purchase_date))
         return data_list
 
 

diff --git a/Service/useritem_service.py b/Service/useritem_service.py
@@ -109,11 +109,12 @@ def add_userItems(itemAdd : ItemAdd):
         with get_db() as db:
             for addItem in itemAdd.items:
                 useritem = db.query(UserItem).filter(UserItem.user_id == addItem.user_id, UserItem.item_name == addItem.item_name).first()
-
                 if useritem.consume_date is None or useritem.count == 0:
                     useritem.consume_date = addItem.purchase_date
-
-                useritem.count += addItem.count
+                if addItem.count > addItem.price:
+                    useritem.count += addItem.price
+                else:
+                    useritem.count += addItem.count
                 useritem.consume_date += timedelta(days=useritem.consume_expectation * addItem.count)
             db.commit()
         return True