Ver código fonte

1、修改商品更新查询逻辑;
2、错误 #96185

zhou.xiaoning 4 anos atrás
pai
commit
4685d5105a
2 arquivos alterados com 25 adições e 5 exclusões
  1. 15 2
      models/account.go
  2. 10 3
      models/ermcpGoods.go

+ 15 - 2
models/account.go

@@ -1068,10 +1068,11 @@ func UpdateUserAccountStatus(userID, accountStatus int) error {
 		Update(&useraccount); err != nil {
 		return err
 	}
-	// UserInfo表的状态为1-正常;2-注销
+
+	// UserInfo表的状态为1-正常;2-注销; 3-停用
 	userStatus := 1
 	if accountStatus == 6 {
-		userStatus = 2
+		userStatus = 3
 	}
 	userinfo := Userinfo{Userstatus: int32(userStatus)}
 	if _, err := engine.Table("USERINFO").
@@ -1080,6 +1081,18 @@ func UpdateUserAccountStatus(userID, accountStatus int) error {
 		return err
 	}
 
+	// Loginaccount表的状态为1-正常;2-冻结(停用);3-无效(注销)
+	loginStatus := 1
+	if accountStatus == 6 {
+		userStatus = 2
+	}
+	Loginaccount := Loginaccount{Loginstatus: int32(loginStatus)}
+	if _, err := engine.Table("LOGINACCOUNT").
+		Where("USERID = ?", userID).
+		Update(&Loginaccount); err != nil {
+		return err
+	}
+
 	return nil
 }
 

+ 10 - 3
models/ermcpGoods.go

@@ -84,6 +84,13 @@ type ErmcpGoods struct {
 func GetErmcpGoodses(lastUpdateTime string) ([]ErmcpGoods, error) {
 	engine := db.GetEngine()
 
+	// 对比数据库与终端的更新时间戳
+	ermcpGoods := make([]ErmcpGoods, 0)
+	engine.Table("GOODS G").Where(fmt.Sprintf("G.MODIFYTIME > to_date('%s','yyyy-MM-dd hh24:mi:ss')", lastUpdateTime)).Find(&ermcpGoods)
+	if len(ermcpGoods) == 0 {
+		return make([]ErmcpGoods, 0), nil
+	}
+
 	goodses := make([]ErmcpGoods, 0)
 	session := engine.Table("GOODS G").
 		Select("G.*, P.RELATEDGOODSID, M.TRADEMODE").
@@ -94,9 +101,9 @@ func GetErmcpGoodses(lastUpdateTime string) ([]ErmcpGoods, error) {
 	// 	session = session.And("GOODSID > ?", lastID)
 	// }
 	// session = session.Asc("GOODSID")
-	if len(lastUpdateTime) != 0 {
-		session = session.And(fmt.Sprintf("G.MODIFYTIME > to_date('%s','yyyy-MM-dd hh24:mi:ss')", lastUpdateTime))
-	}
+	// if len(lastUpdateTime) != 0 {
+	// 	session = session.And(fmt.Sprintf("G.MODIFYTIME > to_date('%s','yyyy-MM-dd hh24:mi:ss')", lastUpdateTime))
+	// }
 	if err := session.Find(&goodses); err != nil {
 		return nil, err
 	}