diff --git a/app/flexible_employment/svc/svc_fin_withdraw_apply.go b/app/flexible_employment/svc/svc_fin_withdraw_apply.go index 92834c5..54821d0 100644 --- a/app/flexible_employment/svc/svc_fin_withdraw_apply.go +++ b/app/flexible_employment/svc/svc_fin_withdraw_apply.go @@ -90,6 +90,7 @@ func DealFailResult(sess *xorm.Session, apply *model.FinWithdrawApply, masterId, } return nil } + func DealFailResultForPuPiao(sess *xorm.Session, apply *model.FinWithdrawApply, masterId, errMsg string) (err error) { userProfile, err := db.UserFindByIDWithSession(sess, apply.Uid) if err != nil { @@ -106,16 +107,16 @@ func DealFailResultForPuPiao(sess *xorm.Session, apply *model.FinWithdrawApply, if updateAck <= 0 { return errors.New("更新提现单失败") } - updateAck, err = sess.Where("request_id=?", apply.Id).Cols("state", "callback_data_for_trade_result").Update(model2.FlexibleEmploymentOrd{ - State: 3, - CallbackDataForTradeResult: errMsg, - }) - if err != nil { - return err - } - if updateAck <= 0 { - return errors.New("更新工猫记录失败") - } + //updateAck, err = sess.Where("request_id=?", apply.Id).Cols("state", "callback_data_for_trade_result").Update(model2.FlexibleEmploymentOrd{ + // State: 3, + // CallbackDataForTradeResult: errMsg, + //}) + //if err != nil { + // return err + //} + //if updateAck <= 0 { + // return errors.New("更新工猫记录失败") + //} //2、判断类型 加回手续费 var finUserFlow model.FinUserFlow diff --git a/consume/init.go b/consume/init.go index 3c1f5f2..9b10a40 100644 --- a/consume/init.go +++ b/consume/init.go @@ -94,14 +94,14 @@ func initConsumes() { //jobs[consumeMd.OneCirclesDealUserCoinConsumeFunName] = OneCirclesDealUserCoinConsume //////////////////////////////////////// withdraw ///////////////////////////////////////////////////// - //jobs[consumeMd.WithdrawConsumeFunName] = WithdrawConsume - //jobs[consumeMd.FlexibleEmploymentWithdrawForGongMaoConsumeFunName] = FlexibleEmploymentWithdrawForGongMaoConsume - //jobs[consumeMd.FlexibleEmploymentWithdrawForPupiaoConsumeFunName] = FlexibleEmploymentWithdrawForPupiaoConsume - //jobs[consumeMd.NewFlexibleEmploymentWithdrawForPupiaoConsumeFunName] = NewFlexibleEmploymentWithdrawForPupiaoConsume - //jobs[consumeMd.ServiceAwardDividendRelationConsumeFunName] = ServiceAwardDividendRelationConsume - //jobs[consumeMd.CanalServiceAwardDividendRelationConsumeFunName] = CanalServiceAwardDividendRelationConsume //服务奖消费 - //jobs[consumeMd.DividendRewardConsumeFunName] = DividendRewardConsume //蜂蜜分红 - //jobs[consumeMd.ContributionExchangeConsumeFunName] = ContributionExchangeConsume //蜂蜜分红-兑换贡献值 + jobs[consumeMd.WithdrawConsumeFunName] = WithdrawConsume + jobs[consumeMd.FlexibleEmploymentWithdrawForGongMaoConsumeFunName] = FlexibleEmploymentWithdrawForGongMaoConsume + jobs[consumeMd.FlexibleEmploymentWithdrawForPupiaoConsumeFunName] = FlexibleEmploymentWithdrawForPupiaoConsume + jobs[consumeMd.NewFlexibleEmploymentWithdrawForPupiaoConsumeFunName] = NewFlexibleEmploymentWithdrawForPupiaoConsume + jobs[consumeMd.ServiceAwardDividendRelationConsumeFunName] = ServiceAwardDividendRelationConsume + jobs[consumeMd.CanalServiceAwardDividendRelationConsumeFunName] = CanalServiceAwardDividendRelationConsume //服务奖消费 + jobs[consumeMd.DividendRewardConsumeFunName] = DividendRewardConsume //蜂蜜分红 + jobs[consumeMd.ContributionExchangeConsumeFunName] = ContributionExchangeConsume //蜂蜜分红-兑换贡献值 //jobs[consumeMd.ZhiosMallGreenCoinConsumeFunName] = ZhiosMallGreenCoinConsume //绿色双链积分 //jobs[consumeMd.ZhiosOneCirclesCoinConsumeFunName] = ZhiosOneCirclesCoinConsume //一个圈圈虚拟币变化 diff --git a/consume/withdraw_consume_new_pupiao.go b/consume/withdraw_consume_new_pupiao.go index 529abd2..4025b64 100644 --- a/consume/withdraw_consume_new_pupiao.go +++ b/consume/withdraw_consume_new_pupiao.go @@ -153,8 +153,11 @@ func handleNewFlexibleEmploymentWithdrawForPupiaoConsume(msgData []byte) error { return err } if response.Code != 200 { + fmt.Println("NewFlexibleEmploymentWithdrawForPupiaoCurlERR::::::::::::::::", response) + utils.FilePutContents("NewFlexibleEmploymentWithdrawForPupiaoCurl_ERR", utils.SerializeStr(response)) flexibleEmploymentPupiaoOrd.BatchStatus = 3 - updateAck, err := flexibleEmploymentPupiaoOrdDb.Update(flexibleEmploymentPupiaoOrd.Id, flexibleEmploymentPupiaoOrd, "batch_status") + flexibleEmploymentPupiaoOrd.CallbackData = response.Msg + updateAck, err := flexibleEmploymentPupiaoOrdDb.Update(flexibleEmploymentPupiaoOrd.Id, flexibleEmploymentPupiaoOrd, "batch_status", "callback_data") if err != nil { return err }