Merge remote-tracking branch 'origin/v1' into v1
This commit is contained in:
commit
da28f930a9
|
|
@ -127,18 +127,6 @@ func (p DefParty) orderCreate() web_iris.Party {
|
|||
for _, value := range orderCreateRequest.PetGoodsInfos {
|
||||
database.Instance().Model(&models.UserCoupons{}).Where("id = ? and coupons_status = 1", value.Cid).Find(&userCoupons)
|
||||
userCouponsList = append(userCouponsList, userCoupons)
|
||||
if value.Cid > 0 {
|
||||
if userCoupons.Id == 0 {
|
||||
CouponsNotExistError.Fail(ctx, nil)
|
||||
return
|
||||
}
|
||||
coupons := CouponsMap[userCoupons.Cid]
|
||||
if coupons.Id == 0 {
|
||||
var couponsData *models.Coupons
|
||||
database.Instance().Model(&models.Coupons{}).Where("id = ?", coupons.Id).Find(&couponsData)
|
||||
coupons = models.Coupons{Id: couponsData.Id, Discount: couponsData.Discount, GoodsSubType: couponsData.GoodsSubType}
|
||||
}
|
||||
}
|
||||
|
||||
userPet := GetUserPet(headerBaseInfo.Uid, value.PetId)
|
||||
var dog = userPet.PetBaseInfo.PetType == 2
|
||||
|
|
|
|||
Loading…
Reference in New Issue