- OrderSkuFinancial中的Count正确更新（三平台）

- 售后单审核后，确认收到退货后设置标志
- GetAfsOrderSkuInfo返回图片image

business/jxcallback/orderman/orderman_ext.go

@@ -863,10 +863,12 @@ func (c *OrderManager) GetAfsOrders(ctx *jxcontext.Context, keyword, afsOrderID,
 	return pagedInfo, err
 }
 
-func (c *OrderManager) GetAfsOrderSkuInfo(ctx *jxcontext.Context, afsOrderID string, vendorID int) (skus []*model.OrderSkuFinancial, err error) {
+func (c *OrderManager) GetAfsOrderSkuInfo(ctx *jxcontext.Context, afsOrderID string, vendorID int) (skus []*model.OrderFinancialSkuExt, err error) {
 	sql := `
-	SELECT t1.*
+	SELECT t1.*, t3.img image
 	FROM order_sku_financial t1
+	JOIN sku t2 ON t2.id = IF(t1.jx_sku_id <> 0, t1.jx_sku_id, t1.sku_id)
+	JOIN sku_name t3 ON t3.id = t2.name_id
 	WHERE t1.afs_order_id  = ? AND t1.vendor_id = ?
 	`
 	sqlParams := []interface{}{

business/jxcallback/scheduler/basesch/basesch_ext.go

@@ -204,6 +204,13 @@ func (c *BaseScheduler) AgreeOrRefuseRefund(ctx *jxcontext.Context, afsOrderID s
 		if c.IsReallyCallPlatformAPI {
 			err = partner.GetPurchasePlatformFromVendorID(vendorID).AgreeOrRefuseRefund(ctx, afsOrder, approveType, reason)
 		}
+		if err == nil {
+			flag := model.AfsOrderFlagAgreeUserRefund
+			if approveType == partner.AfsApproveTypeRefused {
+				flag = model.AfsOrderFlagRefuseUserRefund
+			}
+			dao.SetAfsOrderFlag(dao.GetDB(), ctx.GetUserName(), afsOrderID, vendorID, flag)
+		}
 	}
 	return err
 }
@@ -214,6 +221,9 @@ func (c *BaseScheduler) ConfirmReceivedReturnGoods(ctx *jxcontext.Context, afsOr
 		if c.IsReallyCallPlatformAPI {
 			err = partner.GetPurchasePlatformFromVendorID(vendorID).ConfirmReceivedReturnGoods(ctx, afsOrder)
 		}
+		if err == nil {
+			dao.SetAfsOrderFlag(dao.GetDB(), ctx.GetUserName(), afsOrderID, vendorID, model.AfsOrderFlagMaskReturnGoods)
+		}
 	}
 	return err
 }

business/model/api.go

@@ -63,3 +63,8 @@ type OrderFinancialExt struct {
 	Skus            []*OrderSkuFinancial      `orm:"-" json:"skus"`                                         // 正向订单购买商品列表
 	Discounts       []*OrderDiscountFinancial `orm:"-" json:"discounts"`                                    // 正向订单享受优惠列表
 }
+
+type OrderFinancialSkuExt struct {
+	OrderSkuFinancial
+	Image string `json:"image"`
+}

business/model/const.go

@@ -324,6 +324,14 @@ const (
 	OrderFlagMaskCallPMCourier = 64 // 取货失败后召唤平台配送
 )
 
+const (
+	AfsOrderFlagMaskUserRefund   = 3 // 门店处理售后单申请
+	AfsOrderFlagAgreeUserRefund  = 1 // 门店同意售后单申请
+	AfsOrderFlagRefuseUserRefund = 3 // 门店拒绝售后单申请
+
+	AfsOrderFlagMaskReturnGoods = 4 // 门店确认收到退货
+)
+
 const (
 	AfsAppealTypeRefund          = 1 // 仅退款
 	AfsAppealTypeReturnAndRefund = 2 // 退货退款

business/model/dao/dao_order.go

@@ -51,3 +51,12 @@ func ClearOrderFlag(db *DaoDB, userName string, vendorOrderID string, vendorID i
 	`, flag, vendorOrderID, vendorID)
 	return err
 }
+
+func SetAfsOrderFlag(db *DaoDB, userName string, afsOrderID string, vendorID int, flag int) (err error) {
+	_, err = ExecuteSQL(db, `
+	UPDATE afs_order
+	SET flag = flag | ?
+	WHERE afs_order_id = ? AND vendor_id = ?
+	`, flag, afsOrderID, vendorID)
+	return err
+}

business/partner/purchase/ebai/order_afs.go

@@ -86,6 +86,8 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaia
 						VendorOrderID: afsOrder.VendorOrderID,
 						VendorStoreID: afsOrder.VendorStoreID,
 						StoreID:       afsOrder.StoreID,
+						Count:         sku.Number,
+
 						// ConfirmTime:          afsOrder.AfsCreateAt,
 						VendorSkuID:       sku.SkuID,
 						SkuID:             int(utils.Str2Int64WithDefault(sku.CustomSkuID, 0)),

business/partner/purchase/jd/order_afs.go

@@ -149,6 +149,8 @@ func (c *PurchaseHandler) buildAfsOrder(afsInfo *jdapi.AfsServiceResponse) (afsO
 			VendorOrderID: afsOrder.VendorOrderID,
 			VendorStoreID: afsOrder.VendorStoreID,
 			StoreID:       afsOrder.StoreID,
+			Count:         x.SkuCount,
+
 			// ConfirmTime:          afsOrder.AfsCreateAt,
 			VendorSkuID:       utils.Int64ToStr(x.WareID),
 			SkuID:             int(utils.Str2Int64WithDefault(x.SkuIDIsv, 0)),

business/partner/purchase/mtwm/order_afs.go

@@ -83,6 +83,8 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *mtwmapi.CallbackMsg) (retVal *mtwma
 					VendorOrderID: afsOrder.VendorOrderID,
 					VendorStoreID: afsOrder.VendorStoreID,
 					StoreID:       afsOrder.StoreID,
+					Count:         sku.Count,
+
 					// ConfirmTime:          afsOrder.AfsCreateAt,
 					VendorSkuID: sku.SkuID,
 					SkuID:       int(utils.Str2Int64WithDefault(sku.SkuID, 0)),