Merge branch 'feat/coupon' into dev

dotbitHQ · Nov 14, 2023 · e80ef43 · e80ef43
2 parents 83d64f4 + 238ac0b
commit e80ef43
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/http_server/handle/auto_order_create.go b/http_server/handle/auto_order_create.go
@@ -176,10 +176,15 @@ func (h *HttpHandle) doAutoOrderCreate(req *ReqAutoOrderCreate, apiResp *api_cod
 			apiResp.ApiRespErr(api_code.ApiCodeError500, "this coupon code can not use, because it not open")
 			return nil
 		}
-		if time.Now().After(time.UnixMilli(setInfo.ExpiredAt)) {
+		if now.After(time.UnixMilli(setInfo.ExpiredAt)) {
 			apiResp.ApiRespErr(api_code.ApiCodeError500, "this coupon code can not use, because it expired")
 			return nil
 		}
+		couponAccId := common.Bytes2Hex(common.GetAccountIdByAccount(setInfo.Account))
+		if couponAccId != parentAccountId {
+			apiResp.ApiRespErr(api_code.ApiCodeParamsInvalid, "this coupon code can not use, because it not belong to this account")
+			return nil
+		}
 
 		if setInfo.Price.LessThan(usdAmount) {
 			actualUsdPrice = usdAmount.Sub(setInfo.Price)
@@ -295,7 +300,7 @@ func (h *HttpHandle) doAutoOrderCreate(req *ReqAutoOrderCreate, apiResp *api_cod
 		CouponCode:        req.CouponCode,
 		PayStatus:         tables.PayStatusUnpaid,
 		OrderStatus:       tables.OrderStatusDefault,
-		Timestamp:         time.Now().UnixMilli(),
+		Timestamp:         now.UnixMilli(),
 		SvrName:           config.Cfg.Slb.SvrName,
 		PremiumPercentage: premiumPercentage,
 		PremiumBase:       premiumBase,