diff --git a/HTS_daily.py b/HTS_daily.py index 4ce9e40..8f2db78 100644 --- a/HTS_daily.py +++ b/HTS_daily.py @@ -122,7 +122,7 @@ class HTS_DAILY (HTS): # 다음 조건이면 매수한다. if len(data.index) > 10 and max(bsLine['buy'][len(bsLine['buy']) - 1:]) > 1000: - if not self.orderChecker.exist(today, stock_code, hours=4): + if not self.orderChecker.exist(today, stock_code, hours=2): last_index = len(bsLine['buy'])-1 if bsLine['buy'][last_index] > 0: bs_buy_price = bsLine['buy'][last_index] diff --git a/hts/OrderChecker.py b/hts/OrderChecker.py index 6198d66..a27c6cd 100644 --- a/hts/OrderChecker.py +++ b/hts/OrderChecker.py @@ -17,6 +17,7 @@ class OrderChecker: if os.path.isfile(saveFileName): order_df = pd.read_csv(saveFileName) else: + # type: 매수는 0 매도는 1 order_df = pd.DataFrame(columns=["datetime", "stock_code", "type", "orderNum", "count", "price"]) if 'Unnamed: 0' in order_df.columns: @@ -26,7 +27,7 @@ class OrderChecker: order_df['datetime'] = pd.to_datetime(order_df['datetime']) return order_df - def exist(self, ymd, stock_code, hours=4): + def exist(self, ymd, stock_code, hours=2): order_df = self.read(ymd) try: tmp = order_df.loc[order_df["stock_code"] == int(stock_code)] @@ -39,16 +40,15 @@ class OrderChecker: return False return True - def add(self, ymd, stock_code, type, count, price, orderNum=None): + def add(self, ymd, stock_code: str, type: int, count: int, price: int, orderNum=None): if self.exist(ymd, stock_code): return False order_df = self.read(ymd) - # 새로운 주문을 추가한다. - order_df = order_df.append({"stock_code": int(stock_code), "type": int(type), "orderNum": int(0), "count": int(count), "price": int(price), "datetime": datetime.now()}, ignore_index=True) - order_df = order_df.astype({"stock_code": int, "type": int, "orderNum": int, "count": int, "price": int}) + order_df = order_df.append({"stock_code": "A" + stock_code, "type": type, "orderNum": 0, "count": count, "price": price, "datetime": datetime.now()}, ignore_index=True) + order_df = order_df.astype({"stock_code": str, "type": int, "orderNum": int, "count": int, "price": int}) # 파일로 기록한다. saveFileName = os.path.join(self.RESOURCE_PATH, "order", ymd + ".csv") @@ -56,16 +56,17 @@ class OrderChecker: return True - def delete(self, ymd, stock_code): + def delete(self, ymd, stock_code: str): + if not self.exist(ymd, stock_code): return False order_df = self.read(ymd) - # 매도 주문을 삭제한다. - order_df = order_df.loc[(order_df["stock_code"] != stock_code)] + # 기존 매수 주문을 매도로 변경 한다. + order_df.loc[(order_df["stock_code"] == "A" + stock_code, 'type')] = 1 - # 파일로 기록한다. + # 파일로 기록 한다. saveFileName = os.path.join(self.RESOURCE_PATH, "order", ymd + ".csv") order_df.to_csv(saveFileName)