1

business/lakala/lakala_callback.go

@@ -158,7 +158,8 @@ func OrderStatusCallback(param *lakala.QueryOrderCallBackResp) error {
 	var (
 		db = dao.GetDB()
 	)
-	order, err := partner.CurOrderManager.LoadOrder(param.OrderCreateTime, model.VendorIDJX)
+
+	order, err := partner.CurOrderManager.LoadOrder(param.OutOrderNo, model.VendorIDJX)
 	if err != nil {
 		return err
 	}
@@ -181,7 +182,34 @@ func OrderStatusCallback(param *lakala.QueryOrderCallBackResp) error {
 	case "6":
 
 	}
+	order.VendorOrderID2 = param.OrderTradeInfo.LogNo
 	order.VendorStatus = param.OrderStatus
-	_, err = dao.UpdateEntity(db, order, "Status", "VendorStatus", "OrderFinishedAt")
+	_, err = dao.UpdateEntity(db, order, "Status", "VendorOrderID2", "VendorStatus", "OrderFinishedAt")
+
+	orderPay := &model.OrderPay{
+		PayOrderID: param.PayOrderNo,
+	}
+	orderPay.DeletedAt = utils.DefaultTimeValue
+	if err := dao.GetEntity(db, orderPay, "PayOrderID", "DeletedAt"); err == nil {
+		if orderPay.Status != 0 {
+			return err
+		}
+		loc, _ := time.LoadLocation("Local")
+		t1, _ := time.ParseInLocation("20060102150405", param.OrderTradeInfo.TradeTime, loc)
+		orderPay.PayFinishedAt = utils.Time2Pointer(t1)
+		orderPay.OriginalData = utils.Format4Output(param, true)
+		//TradeType              string `json:"trade_type"`                // M	String	16	交易类型	PAY-消费 REFUND-退款 CANCEL-撤销
+		//TradeStatus            string `json:"trade_status"`              // M	String	2	支付状态	返回状态 S:成功 F:失败 C:被冲正 U:预记状态 X:发送失败 T: 发送超时 P: 处理中
+		orderPay.TransactionID = param.OrderTradeInfo.LogNo
+		switch param.OrderTradeInfo.TradeStatus {
+		case "S":
+			orderPay.Status = model.PayStatusYes
+		default:
+			orderPay.Status = model.PayStatusFailed
+		}
+
+		dao.UpdateEntity(db, orderPay)
+	}
+
 	return err
 }