调整京西商城支付

business/model/order.go

@@ -296,25 +296,26 @@ type OrderComment struct {
 type OrderPay struct {
 	ModelIDCULD
 
-	VendorOrderID string     `orm:"column(vendor_order_id);size(48)" json:"vendorOrderID"`
+	PayOrderID string `orm:"column(pay_order_id);size(48)" json:"payOrderID"` // 京西支付定单号
-	VendorID      int        `orm:"column(vendor_id)" json:"vendorID"`
+	PayType    int    `json:"payType"`
-	PayType       int        `json:"payType"`
+
 	VendorPayType string     `orm:"size(48)" json:"vendorPayType"`
+	VendorOrderID string     `orm:"column(vendor_order_id);size(48);index" json:"vendorOrderID"` // 支付对应的购物订单号
+	VendorID      int        `orm:"column(vendor_id)" json:"vendorID"`                           // 购物订单所属厂商代码（当前只有京西）
 	Status        int        `json:"status"`
 	PayCreatedAt  time.Time  `orm:"type(datetime);index" json:"payCreatedAt"`
 	PayFinishedAt *time.Time `orm:"type(datetime);null" json:"payFinishedAt"`
 	TotalFee      int        `json:"totalFee"`
 
-	TransactionID string `orm:"column(transaction_id);index;size(48)" json:"transactionID"`
+	PrepayID      string `orm:"column(prepay_id);index;size(48)" json:"prepayID"`           // 下单后，支付前，支付方生成的事务ID
-	PrepayID      string `orm:"column(prepay_id);unique;size(48)" json:"prepayID"`
+	TransactionID string `orm:"column(transaction_id);index;size(48)" json:"transactionID"` // 支付成功后，支付方生成的事务ID
 	CodeURL       string `orm:"column(code_url);size(256)" json:"codeURL"`
-	PayOrderID    string `orm:"column(pay_order_id);size(48)" json:"payOrderID"`
 	OriginalData  string `orm:"type(text)" json:"-"`
 }
 
 func (v *OrderPay) TableIndex() [][]string {
 	return [][]string{
-		[]string{"VendorOrderID", "VendorID", "PayType", "DeletedAt"},
+		[]string{"PayOrderID", "PayType", "DeletedAt"},
 	}
 }
 
@@ -322,12 +323,11 @@ type OrderPayRefund struct {
 	ModelIDCULD
 
 	RefundID       string `orm:"column(refund_id);unique;size(48)" json:"refundID"`
-	VendorRefundID string `orm:"column(vendor_refund_id);unique;size(48)" json:"vendorRefundID"`
+	VendorRefundID string `orm:"column(vendor_refund_id);unique;size(48)" json:"vendorRefundID"` // 支付方退款成功后生成的退款单号
 
-	AfsOrderID       string     `orm:"column(afs_order_id);index;size(48)" json:"afsOrderID"` // AfsOrderID与RefundID的区别？
 	VendorOrderID    string     `orm:"column(vendor_order_id);index;size(48)" json:"vendorOrderID"`
 	VendorID         int        `orm:"column(vendor_id)" json:"vendorID"`
-	TransactionID    string     `orm:"column(transaction_id);index;size(48)" json:"transactionID"`
+	TransactionID    string     `orm:"column(transaction_id);index;size(48)" json:"transactionID"` // 支付成功后，支付方生成的事务ID
 	Status           int        `json:"status"`
 	RefundCreatedAt  time.Time  `orm:"type(datetime);index" json:"payCreatedAt"`
 	RefundFinishedAt *time.Time `orm:"type(datetime);null" json:"payFinishedAt"`

business/partner/purchase/jx/localjx/order.go

@@ -272,6 +272,10 @@ func GenOrderNo(ctx *jxcontext.Context) (orderNo int64) {
 	return orderNo
 }
 
+func GenPayOrderID(order *model.GoodsOrder) (payOrderID int64) {
+	return utils.Str2Int64(order.VendorOrderID)
+}
+
 func GenRefundID(order *model.GoodsOrder) (refundID int64) {
 	const suffix = 100000
 	refundID = utils.Str2Int64(order.VendorOrderID) * suffix
@@ -507,6 +511,10 @@ func AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName stri
 	return changeOrderStatus(order.VendorOrderID, status, "")
 }
 
+func AdjustOrder(ctx *jxcontext.Context, order *model.GoodsOrder, removedSkuList []*model.OrderSku, reason string) (err error) {
+	return err
+}
+
 func PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) {
 	return changeOrderStatus(order.VendorOrderID, model.OrderStatusFinishedPickup, "")
 }
@@ -527,8 +535,9 @@ func CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string)
 			errList := errlist.New()
 			for _, orderPay := range payList {
 				if orderPay.Status == model.PayStatusYes {
-					refundID := utils.Int64ToStr(GenRefundID(order))
+					// refundID := utils.Int64ToStr(GenRefundID(order))
-					orderPayRefund, err2 := refundOrderByWX(ctx, orderPay, refundID)
+					refundID := order.VendorOrderID
+					orderPayRefund, err2 := refundOrderByWX(ctx, orderPay, refundID, orderPay.TotalFee, reason)
 					if err2 == nil {
 						dao.WrapAddIDCULDEntity(orderPayRefund, ctx.GetUserName())
 						errList.AddErr(dao.CreateEntity(dao.GetDB(), orderPayRefund))

business/partner/purchase/jx/localjx/wxpay.go

@@ -26,9 +26,9 @@ func getOrderBrief(order *model.GoodsOrder) string {
 func pay4OrderByWX(ctx *jxcontext.Context, order *model.GoodsOrder, vendorPayType string) (orderPay *model.OrderPay, err error) {
 	payCreatedAt := time.Now()
 	param := &wxpay.CreateOrderParam{
+		OutTradeNo:     utils.Int64ToStr(GenPayOrderID(order)),
 		Body:           getOrderBrief(order),
 		NotifyURL:      globals.WxpayNotifyURL,
-		OutTradeNo:     order.VendorOrderID,
 		SpbillCreateIP: ctx.GetRealRemoteIP(),
 		TradeType:      vendorPayType2WxpayType(vendorPayType),
 		TotalFee:       int(order.ActualPayPrice),
@@ -42,10 +42,12 @@ func pay4OrderByWX(ctx *jxcontext.Context, order *model.GoodsOrder, vendorPayTyp
 	result, err := api.WxpayAPI.CreateUnifiedOrder(param)
 	if err == nil {
 		orderPay = &model.OrderPay{
-			VendorOrderID: order.VendorOrderID,
+			PayOrderID:    param.OutTradeNo,
-			VendorID:      order.VendorID,
 			PayType:       model.PayTypeWX,
 			VendorPayType: vendorPayType,
+
+			VendorOrderID: order.VendorOrderID,
+			VendorID:      order.VendorID,
 			Status:        0,
 			PayCreatedAt:  payCreatedAt,
 			PrepayID:      result.PrepayID,
@@ -69,14 +71,12 @@ func OnWxPayCallback(msg *wxpay.CallbackMsg) (err error) {
 
 func onWxpayFinished(msg *wxpay.PayResultMsg) (err error) {
 	orderPay := &model.OrderPay{
-		VendorOrderID: msg.OutTradeNo,
+		PayOrderID: msg.OutTradeNo,
-		VendorID:      jxutils.GetPossibleVendorIDFromVendorOrderID(msg.OutTradeNo),
+		PayType:    model.PayTypeWX,
-		PayType:       model.PayTypeWX,
 	}
 	orderPay.DeletedAt = utils.DefaultTimeValue
 	db := dao.GetDB()
-	if err = dao.GetEntity(db, orderPay, "VendorOrderID", "VendorID", "PayType", "DeletedAt"); err == nil {
+	if err = dao.GetEntity(db, orderPay, "PayOrderID", "PayType", "DeletedAt"); err == nil {
-		orderPay.VendorPayType = msg.TradeType
 		orderPay.PayFinishedAt = utils.Time2Pointer(wxpay.PayTime2Time(msg.TimeEnd))
 		orderPay.TransactionID = msg.TransactionID
 		orderPay.OriginalData = utils.Format4Output(msg, true)
@@ -126,13 +126,14 @@ func onWxpayRefund(msg *wxpay.RefundResultMsg) (err error) {
 	return err
 }
 
-func refundOrderByWX(ctx *jxcontext.Context, orderPay *model.OrderPay, refundID string) (orderPayRefund *model.OrderPayRefund, err error) {
+func refundOrderByWX(ctx *jxcontext.Context, orderPay *model.OrderPay, refundID string, refundFee int, refundDesc string) (orderPayRefund *model.OrderPayRefund, err error) {
 	result, err := api.WxpayAPI.PayRefund(&wxpay.PayRefundParam{
 		OutTradeNo:  orderPay.VendorOrderID,
 		NotifyURL:   globals.WxpayNotifyURL,
 		OutRefundNo: refundID,
 		TotalFee:    orderPay.TotalFee,
-		RefundFee:   orderPay.TotalFee,
+		RefundFee:   refundFee,
+		RefundDesc:  wxpay.CData(refundDesc),
 	})
 	if err == nil {
 		orderPayRefund = &model.OrderPayRefund{

business/partner/purchase/jx/order.go

@@ -112,6 +112,10 @@ func (c *PurchaseHandler) CancelOrder(ctx *jxcontext.Context, order *model.Goods
 }
 
 func (c *PurchaseHandler) AdjustOrder(ctx *jxcontext.Context, order *model.GoodsOrder, removedSkuList []*model.OrderSku, reason string) (err error) {
+	if model.IsOrderJXTemp(order) {
+	} else {
+		err = localjx.AdjustOrder(ctx, order, removedSkuList, reason)
+	}
 	return err
 }