liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/mark' into don

Browse Source
This commit is contained in:
Rosy-zhudan
2019-07-30 08:35:17 +08:00
parent 72e8e62da5 d8852a569b
commit 0fa2d29dca
8 changed files with 46 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -390,6 +390,9 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
}
}
s.updateOrderByBill(order, nil, false)
if time.Now().Sub(order.OrderCreatedAt) < 2*time.Minute { // 京东一些门店设置成了接单即拣货完成，这种情况下自动调用拣货完成
s.autoPickupGood(savedOrderInfo)
}
} else {
s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime)
}

5
business/jxstore/cms/store.go
View File

@@ -1349,6 +1349,8 @@ func GetStoresVendorSnapshot(ctx *jxcontext.Context, parentTask tasksch.ITask, v
CloseTime1: store.CloseTime1,
OpenTime2: store.OpenTime2,
CloseTime2: store.CloseTime2,
DeliveryType: store.DeliveryType,
}}
}
}
@@ -1391,7 +1393,8 @@ func updateVendorStoreStatusBySnapshot(db *dao.DaoDB, curSnapshotList []*model.V
for _, v := range storeMapList {
if snapshot := snapshotMap[jxutils.Combine2Int(v.StoreID, v.VendorID)]; snapshot != nil && v.Status != snapshot.Status {
v.Status = snapshot.Status
if _, err = dao.UpdateEntity(db, v, model.FieldStatus); err != nil {
v.DeliveryType = snapshot.DeliveryType
if _, err = dao.UpdateEntity(db, v, model.FieldStatus, "DeliveryType"); err != nil {
return err
}
}

11
business/model/store.go
View File

@@ -397,11 +397,12 @@ type VendorStoreSnapshot struct {
VendorStoreID string `orm:"column(vendor_store_id);size(48)" json:"vendorStoreID"`
SnapshotAt time.Time `orm:"type(datetime)" json:"snapshotAt"` // 这个不同于CreatedAt，SnapshotAt是逻辑上的时间，CreatedAt是实际存储的时间
Status int `json:"status"` // 取值同Store.Status
OpenTime1 int16 `json:"openTime1"` // 930就表示9点半，用两个的原因是为了支持中午休息，1与2的时间段不能交叉，为0表示没有
CloseTime1 int16 `json:"closeTime1"` // 格式同上
OpenTime2 int16 `json:"openTime2"` // 格式同上
CloseTime2 int16 `json:"closeTime2"` // 格式同上
Status int `json:"status"` // 取值同Store.Status
OpenTime1 int16 `json:"openTime1"` // 930就表示9点半，用两个的原因是为了支持中午休息，1与2的时间段不能交叉，为0表示没有
CloseTime1 int16 `json:"closeTime1"` // 格式同上
OpenTime2 int16 `json:"openTime2"` // 格式同上
CloseTime2 int16 `json:"closeTime2"` // 格式同上
DeliveryType int8 `orm:"default(0)" json:"deliveryType"` // 配送类型
}
func (*VendorStoreSnapshot) TableUnique() [][]string {

4
business/partner/purchase/ebai/order_afs.go
View File

@@ -190,10 +190,10 @@ func (c *PurchaseHandler) ConfirmReceivedReturnGoods(ctx *jxcontext.Context, ord
// 发起全款退款
func (c *PurchaseHandler) RefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) {
return fmt.Errorf("饿百不支持全款退款")
return fmt.Errorf("%s不支持售后全额退款，请让买家发起退款", model.VendorChineseNames[model.VendorIDEBAI])
}
// 发起部分退款
func (c *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, refundSkuList []*model.OrderSku, reason string) (err error) {
return fmt.Errorf("饿百不支持部分退款")
return fmt.Errorf("%s不支持售后部分退款，请让买家发起退款", model.VendorChineseNames[model.VendorIDEBAI])
}

4
business/partner/purchase/jd/store.go
View File

@@ -277,9 +277,9 @@ func (p *PurchaseHandler) RefreshAllStoresID(ctx *jxcontext.Context, parentTask
// }
func JdDeliveryType2Jx(deliveryType int) int8 {
if deliveryType == 2938 {
if deliveryType == jdapi.CarrierNoSelfDelivery {
return scheduler.StoreDeliveryTypeByStore
} else if deliveryType == 9966 {
} else if deliveryType == jdapi.CarrierNoCrowdSourcing {
return scheduler.StoreDeliveryTypeCrowdSourcing
}
return scheduler.StoreDeliveryTypeByPlatform

2
business/partner/purchase/mtwm/order_afs.go
View File

@@ -173,7 +173,7 @@ func (c *PurchaseHandler) ConfirmReceivedReturnGoods(ctx *jxcontext.Context, ord
// 发起全款退款
func (c *PurchaseHandler) RefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) {
return c.CancelOrder(ctx, order, reason)
return fmt.Errorf("%s不支持售后全额退款，请让买家发起退款", model.VendorChineseNames[model.VendorIDMTWM])
}
// 发起部分退款

9
business/partner/purchase/mtwm/store.go
View File

@@ -68,17 +68,18 @@ func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorStoreID string
retVal.ID = int(utils.Str2Int64WithDefault(poiCode, 0))
retVal.DeliveryRangeType = model.DeliveryRangeTypePolygon
var deliveryRangeInfo []map[string]interface{}
deliveryRangeInfo, err = api.MtwmAPI.ShippingList(poiCode)
deliveryRangeInfo, err = api.MtwmAPI.ShippingFetch(poiCode)
if err != nil {
deliveryRangeInfo, err = api.MtwmAPI.ShippingFetch(poiCode)
deliveryRangeInfo, err = api.MtwmAPI.ShippingList(poiCode)
}
if err == nil {
if len(deliveryRangeInfo) > 0 {
retVal.DeliveryRange = rangeMtwm2JX(deliveryRangeInfo[0]["area"].(string))
if utils.Interface2String(deliveryRangeInfo[0]["logistics_code"]) == mtwmapi.PeiSongTypeSelf {
logisticsCode := utils.Interface2String(deliveryRangeInfo[0]["logistics_code"])
if logisticsCode == "" || logisticsCode == mtwmapi.PeiSongTypeSelf {
retVal.DeliveryType = scheduler.StoreDeliveryTypeByStore
} else {
retVal.DeliveryType = scheduler.StoreDeliveryTypeCrowdSourcing
retVal.DeliveryType = scheduler.StoreDeliveryTypeByPlatform
}
}
}

34
controllers/jx_order.go
View File

@@ -503,9 +503,10 @@ func (c *OrderController) GetPrinterStatus() {
})
}
func skuList2Map(skuList []*model.OrderSku) (skuMap map[int]*model.OrderSku) {
func skuList2Map(skuList []*model.OrderSku) (skuCount int, skuMap map[int]*model.OrderSku) {
skuMap = make(map[int]*model.OrderSku)
for _, sku := range skuList {
skuCount += sku.Count
skuID := jxutils.GetSkuIDFromOrderSku(sku)
if sku.SkuID > 0 {
if skuMap[skuID] == nil {
@@ -515,7 +516,7 @@ func skuList2Map(skuList []*model.OrderSku) (skuMap map[int]*model.OrderSku) {
}
}
}
return skuMap
return skuCount, skuMap
}
// @Title 调整订单
@@ -536,8 +537,13 @@ func (c *OrderController) AdjustOrder() {
var order *model.GoodsOrder
order, err = partner.CurOrderManager.LoadOrder(params.VendorOrderID, params.VendorID)
if err == nil {
if err = fillSkuList(skuList, order.Skus); err == nil {
err = defsch.FixedScheduler.AdjustOrder(params.Ctx, order, skuList, params.Reason)
removedAll, err2 := fillSkuList(skuList, order.Skus)
if err = err2; err == nil {
if removedAll {
err = fmt.Errorf("至少要保留一个商品")
} else {
err = defsch.FixedScheduler.AdjustOrder(params.Ctx, order, skuList, params.Reason)
}
}
}
}
@@ -733,8 +739,13 @@ func (c *OrderController) PartRefundOrder() {
var order *model.GoodsOrder
order, err = partner.CurOrderManager.LoadOrder(params.VendorOrderID, params.VendorID)
if err == nil {
if err = fillSkuList(skuList, order.Skus); err == nil {
err = defsch.FixedScheduler.PartRefundOrder(params.Ctx, order, skuList, params.Reason)
removedAll, err2 := fillSkuList(skuList, order.Skus)
if err = err2; err == nil {
if removedAll {
err = defsch.FixedScheduler.RefundOrder(params.Ctx, order, params.Reason)
} else {
err = defsch.FixedScheduler.PartRefundOrder(params.Ctx, order, skuList, params.Reason)
}
}
}
}
@@ -742,10 +753,11 @@ func (c *OrderController) PartRefundOrder() {
})
}
func fillSkuList(skuList, orderSkuList []*model.OrderSku) (err error) {
orderSkuMap := skuList2Map(orderSkuList)
removeSkuMap := skuList2Map(skuList)
for _, sku := range removeSkuMap {
func fillSkuList(skuList, orderSkuList []*model.OrderSku) (isSame bool, err error) {
skuCount, orderSkuMap := skuList2Map(orderSkuList)
skuCount2 := 0
for _, sku := range skuList {
skuCount2 += sku.Count
skuID := jxutils.GetSkuIDFromOrderSku(sku)
if orderSkuMap[skuID] == nil {
err = fmt.Errorf("找不到SKU:%d", skuID)
@@ -760,7 +772,7 @@ func fillSkuList(skuList, orderSkuList []*model.OrderSku) (err error) {
sku.Count = count
}
}
return err
return skuCount == skuCount2, err
}
// @Title 商家主动发起全额退款售后