|
|
@@ -288,11 +288,14 @@ func (m *MerchantClientTicket) CancelAccountTicket(data models.RechargeCancelReq
|
|
|
err = errors.New("卡券数量不够")
|
|
|
return err
|
|
|
}
|
|
|
+ version := ticketInfo.Version
|
|
|
+ //quantity := v.CancelQuantity //交易前数量
|
|
|
+ quantityAfter := ticketInfo.RechargeProjectQuantity - v.CancelQuantity //交易后数量
|
|
|
|
|
|
result := tx.Table("merchant_client_ticket").Model(&ticketInfo).Where("id = ? and version = ? ", ticketInfo.ID, ticketInfo.Version).Updates(
|
|
|
map[string]interface{}{
|
|
|
- "recharge_project_quantity": ticketInfo.RechargeProjectQuantity - v.CancelQuantity,
|
|
|
- "version": rechargeAccount.Version + 1,
|
|
|
+ "recharge_project_quantity": quantityAfter,
|
|
|
+ "version": version + 1,
|
|
|
"updated_at": tools.GetCurrntTimeStr()})
|
|
|
|
|
|
if result.Error != nil {
|
|
|
@@ -310,7 +313,7 @@ func (m *MerchantClientTicket) CancelAccountTicket(data models.RechargeCancelReq
|
|
|
ClientOpenID: ticketInfo.ClientOpenID,
|
|
|
MerchantOpenID: ticketInfo.MerchantOpenID,
|
|
|
QuantityPre: ticketInfo.RechargeProjectQuantity,
|
|
|
- QuantityAfter: ticketInfo.RechargeProjectQuantity - v.CancelQuantity,
|
|
|
+ QuantityAfter: quantityAfter,
|
|
|
Quantity: v.CancelQuantity,
|
|
|
Operator: data.MerchantOpenId,
|
|
|
RechargeID: v.TicketId,
|
