1
This commit is contained in:
@@ -523,13 +523,14 @@ func Separate(ctx *jxcontext.Context, param *lakala.OrderSeparateReq, vendorOrde
|
|||||||
|
|
||||||
globals.SugarLogger.Debugf("------Separate resp--:%s", utils.Format4Output(resp, false))
|
globals.SugarLogger.Debugf("------Separate resp--:%s", utils.Format4Output(resp, false))
|
||||||
recv, _ := json.Marshal(param.RecvDatas)
|
recv, _ := json.Marshal(param.RecvDatas)
|
||||||
separateObj.OutSeparateNo = resp.RespData.OutSeparateNo
|
separateObj.OutSeparateNo = param.OutSeparateNo
|
||||||
separateObj.SeparateNo = resp.RespData.SeparateNo
|
separateObj.SeparateNo = resp.RespData.SeparateNo
|
||||||
separateObj.CalType = param.CalType
|
separateObj.CalType = param.CalType
|
||||||
separateObj.TotalAmt = resp.RespData.TotalAmt
|
separateObj.TotalAmt = resp.RespData.TotalAmt
|
||||||
separateObj.Status = resp.RespData.Status
|
separateObj.Status = resp.RespData.Status
|
||||||
separateObj.Remark += `->分账`
|
separateObj.Remark += `->分账`
|
||||||
separateObj.DetailData = string(recv)
|
separateObj.DetailData = string(recv)
|
||||||
|
separateObj.CmdType = lakala.SeparateOrder
|
||||||
t, err := time.Parse("20060102", param.LogDate)
|
t, err := time.Parse("20060102", param.LogDate)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t = time.Now()
|
t = time.Now()
|
||||||
@@ -559,6 +560,8 @@ func SeparateResultQuery(merchantNo, separateNo string) (*lakala.SeparateResultQ
|
|||||||
recordsObj.ActualSeparateAmt = result.ActualSeparateAmt
|
recordsObj.ActualSeparateAmt = result.ActualSeparateAmt
|
||||||
recordsObj.TotalFeeAmt = result.TotalFeeAmt
|
recordsObj.TotalFeeAmt = result.TotalFeeAmt
|
||||||
recordsObj.Status = result.Status
|
recordsObj.Status = result.Status
|
||||||
|
recordsObj.SeparateNo = result.SeparateNo
|
||||||
|
recordsObj.OutSeparateNo = result.OutSeparateNo
|
||||||
if len(result.DetailDatas) != 0 {
|
if len(result.DetailDatas) != 0 {
|
||||||
detail, _ := json.Marshal(result.DetailDatas)
|
detail, _ := json.Marshal(result.DetailDatas)
|
||||||
recordsObj.DetailData = string(detail)
|
recordsObj.DetailData = string(detail)
|
||||||
|
|||||||
Reference in New Issue
Block a user