Merge remote-tracking branch 'origin/master'

db/model/o2o_fin_user_flow.go

@@ -29,4 +29,5 @@ type O2oFinUserFlow struct {
 	AliOrdId     string    `json:"ali_ord_id" xorm:"default '' comment('支付宝订单号') VARCHAR(128)"`
 	CreateAt     time.Time `json:"create_at" xorm:"created not null default 'CURRENT_TIMESTAMP' comment('创建时间') TIMESTAMP"`
 	UpdateAt     time.Time `json:"update_at" xorm:"updated not null default 'CURRENT_TIMESTAMP' comment('更新时间') TIMESTAMP"`
+	SubsidyNum   int       `json:"subsidy_num" xorm:"not null default 1 comment('') INT(11)"`
 }

rule/consume_integral_settlement.go

@@ -199,7 +199,7 @@ func DailySettlementBlockConsumeIntegral(engine *xorm.Engine, mid string, isTask
 		//加余额流水
 		if len(storeTotalMap) > 0 {
 			for k, v := range storeTotalMap {
-				err1 := DealUserStoreAmountFlow(session, k, zhios_order_relate_utils.StrToFloat64(v.String()), mid, zhios_order_relate_utils.IntToStr(experienceTotalCountMap[k]))
+				err1 := DealUserStoreAmountFlow(session, k, zhios_order_relate_utils.StrToFloat64(v.String()), mid, zhios_order_relate_utils.IntToStr(storeTotalCountMap[k]))
 				if err1 != nil {
 					_ = session.Rollback()
 					return err1, totalMap, storeTotalMap

svc/svc_deal_user_amount.go

@@ -240,7 +240,7 @@ func DealUserStoreAmountFlow(session *xorm.Session, req md.DealUserAmount) (err
 		State:       1,
 		CreateAt:    now,
 		UpdateAt:    now,
-		Memo:        req.Num,
+		SubsidyNum:  zhios_order_relate_utils.StrToInt(req.Num),
 		Date:        now.Format("2006-01-02"),
 	}
 	finUserFlow.Type = 0