Merge branch 'dev_v2.4.23_wh' of jianyu/qmx_admin into feature/v2.4.23

src/order/orderManageController.go

@@ -45,7 +45,7 @@ type Params struct {
 	SubPayMoney           int                      `form:"subPayMoney"`             //子账号实付金额
 	SupplyPayMoney        int                      `form:"supplyPayMoney"`          //补充包实付金额
 	PayV                  string                   `form:"payV"`                    //支付凭证地址
-	CreateType            int                      `form:"createType"`              //创建方式 1-新建 2-补充 3-延期
+	CreateType            int                      `form:"createType"`              //创建方式 1-新建 2-补充 、?
 	ComboId               int                      `form:"comboId"`                 //套餐id
 	ServersId             string                   `form:"serversId"`               //服务id逗号拼接
 	ServersName           string                   `form:"serversName"`             //服务名逗号拼接
@@ -3804,7 +3804,7 @@ func EntLicense(entId, empowerCount, provinceCount, orderId, userCount int, prod
 			util.JysqlDB.Insert("entniche_order", inData)
 			if userCount > 0 {
 				if user != nil && len(*user) > 0 {
-					sql := "SELECT  COUNT(1)  FROM  entniche_power a  INNER JOIN entniche_wait_empower b ON a.wait_empower_id = b.id  where  a.ent_id=" + fmt.Sprint(entId) + " and a.ent_user_id=" + qutil.InterfaceToStr((*user)["id"]) + " and  a.`status`=1"
+					sql := "SELECT  COUNT(1)  FROM  entniche_power a  INNER JOIN entniche_wait_empower b ON a.wait_empower_id = b.id  and  b.end_time > now()   where  a.ent_id=" + fmt.Sprint(entId) + " and a.ent_user_id=" + qutil.InterfaceToStr((*user)["id"]) + " and  a.`status`=1"
 					number := util.JysqlDB.CountBySql(sql)
 					if number == 0 {
 						util.JysqlDB.Insert("entniche_power", map[string]interface{}{"wait_empower_id": id,

src/order/orderManageService.go

@@ -4173,7 +4173,7 @@ func EntServiceOpen(entId int, phone, productType string, st int64) (bool, int)
 	if user == nil {
 		return false, 0
 	}
-	sql := "SELECT  COUNT(1)  FROM  entniche_power a  INNER JOIN entniche_wait_empower b ON a.wait_empower_id = b.id  where  a.ent_id=" + qutil.InterfaceToStr(entId) + " and a.ent_user_id=" + qutil.InterfaceToStr((*user)["id"]) + " and  a.`status`=1"
+	sql := "SELECT  COUNT(1)  FROM  entniche_power a  INNER JOIN entniche_wait_empower b ON a.wait_empower_id = b.id  and  b.end_time > now() where  a.ent_id=" + qutil.InterfaceToStr(entId) + " and a.ent_user_id=" + qutil.InterfaceToStr((*user)["id"]) + " and  a.`status`=1"
 	number := util.JysqlDB.CountBySql(sql)
 	if number == 0 {
 		return true, 1