Merge remote-tracking branch 'origin/mark' into su
This commit is contained in:
@@ -28,6 +28,7 @@ func OnCallbackMsg(msg *weimobapi.CallbackMsg) (response *weimobapi.CallbackResp
|
|||||||
func onOrderMsg(msg *weimobapi.CallbackMsg) (response *weimobapi.CallbackResponse) {
|
func onOrderMsg(msg *weimobapi.CallbackMsg) (response *weimobapi.CallbackResponse) {
|
||||||
globals.SugarLogger.Debugf("onOrderMsg:%s", utils.Format4Output(msg, true))
|
globals.SugarLogger.Debugf("onOrderMsg:%s", utils.Format4Output(msg, true))
|
||||||
if msg.Event == weimobapi.MsgEventOrderStatusChange {
|
if msg.Event == weimobapi.MsgEventOrderStatusChange {
|
||||||
|
if utils.ForceInterface2Int64(msg.MsgBody["orderStatus"]) == weimobapi.MsgOrderStatusFinished {
|
||||||
if orderDetail, err := api.WeimobAPI.QueryOrderDetail2(msg.OrderNo, false); err == nil {
|
if orderDetail, err := api.WeimobAPI.QueryOrderDetail2(msg.OrderNo, false); err == nil {
|
||||||
if orderDetail.OrderStatus == weimobapi.OrderStatusFinished && orderDetail.PaymentAmount >= minCSOrderPayment {
|
if orderDetail.OrderStatus == weimobapi.OrderStatusFinished && orderDetail.PaymentAmount >= minCSOrderPayment {
|
||||||
changeStoreSkusByOrder(orderDetail)
|
changeStoreSkusByOrder(orderDetail)
|
||||||
@@ -37,14 +38,14 @@ func onOrderMsg(msg *weimobapi.CallbackMsg) (response *weimobapi.CallbackRespons
|
|||||||
response = weimobapi.Err2CallbackResponse(err, "")
|
response = weimobapi.Err2CallbackResponse(err, "")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return response
|
return response
|
||||||
}
|
}
|
||||||
|
|
||||||
func changeStoreSkusByOrder(order *weimobapi.OrderDetail) {
|
func changeStoreSkusByOrder(order *weimobapi.OrderDetail) {
|
||||||
globals.SugarLogger.Debugf("changeStoreSkusByOrder order:%s", utils.Format4Output(order, true))
|
globals.SugarLogger.Debugf("changeStoreSkusByOrder order:%s", utils.Format4Output(order, true))
|
||||||
receiverMobile := order.DeliveryDetail.LogisticsDeliveryDetail.ReceiverMobile
|
receiverMobile := order.DeliveryDetail.LogisticsDeliveryDetail.ReceiverMobile
|
||||||
storeList, err := dao.GetStoreList(dao.GetDB(), nil, []string{receiverMobile}, "")
|
if storeList, err := dao.GetStoreList(dao.GetDB(), nil, []string{receiverMobile}, ""); err == nil {
|
||||||
if err != nil {
|
|
||||||
if len(storeList) == 1 {
|
if len(storeList) == 1 {
|
||||||
var skuBindInfos []*cms.StoreSkuBindInfo
|
var skuBindInfos []*cms.StoreSkuBindInfo
|
||||||
storeID := storeList[0].ID
|
storeID := storeList[0].ID
|
||||||
|
|||||||
Reference in New Issue
Block a user