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

京东用户修改订单信息

Browse Source
This commit is contained in:
苏尹岚
2020-07-01 08:50:36 +08:00
parent 7b81213216
commit e3b33f0c3d
2 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
business/jxutils/weixinmsg/weixinmsg.go
View File

@@ -332,44 +332,39 @@ func NotifyUserApplyCancel(order *model.GoodsOrder, cancelReason string) (err er
} }
func NotifyOrderChanged(order *model.GoodsOrder) (err error) { func NotifyOrderChanged(order *model.GoodsOrder) (err error) {
globals.SugarLogger.Debugf("NotifyOrderCanceled orderID:%s", order.VendorOrderID) globals.SugarLogger.Debugf("NotifyOrderChanged orderID:%s", order.VendorOrderID)
if order.VendorID == model.VendorIDELM { if order.VendorID == model.VendorIDELM {
return nil return nil
} }
title := fmt.Sprintf("您有订单的信息已被修改")
if !model.IsOrderSolid(order) {
globals.SugarLogger.Infof("NotifyOrderCanceled orderID:%s is not solid", order.VendorOrderID)
return nil
}
title := fmt.Sprintf("老板，您的订单%s第%d号订单, %s被取消了！", model.VendorChineseNames[order.VendorID], order.OrderSeq, order.VendorOrderID)
data := map[string]interface{}{ data := map[string]interface{}{
"first": map[string]interface{}{ "first": map[string]interface{}{
"value": title, "value": title,
"color": WX_NEW_ORDER_TEMPLATE_COLOR, "color": WX_NEW_ORDER_TEMPLATE_COLOR,
}, },
"orderProductPrice": map[string]interface{}{ "keyword1": map[string]interface{}{
"value": jxutils.IntPrice2StandardCurrencyString(order.ActualPayPrice), "value": order.VendorOrderID,
"color": WX_NEW_ORDER_TEMPLATE_COLOR, "color": WX_NEW_ORDER_TEMPLATE_COLOR,
}, },
"orderProductName": map[string]interface{}{ "keyword2": map[string]interface{}{
"value": getOrderDetailBrief(order), "value": "用户修改订单",
"color": WX_NEW_ORDER_TEMPLATE_COLOR, "color": WX_NEW_ORDER_TEMPLATE_COLOR,
}, },
"orderAddress": map[string]interface{}{ "keyword3": map[string]interface{}{
"value": order.ConsigneeAddress, "value": order.ConsigneeAddress + "，" + order.ConsigneeName + "，" + order.ConsigneeMobile,
"color": WX_NEW_ORDER_TEMPLATE_COLOR, "color": WX_NEW_ORDER_TEMPLATE_COLOR,
}, },
"orderName": map[string]interface{}{ "keyword4": map[string]interface{}{
"value": fmt.Sprintf("%s第%d号订单, %s", model.VendorChineseNames[order.VendorID], order.OrderSeq, order.VendorOrderID), "value": utils.Time2Str(order.OrderCreatedAt),
"color": VendorColors[order.VendorID], "color": VendorColors[order.VendorID],
}, },
"remark": map[string]interface{}{ "remark": map[string]interface{}{
"value": order.ConsigneeMobile, "value": "请及时处理",
"color": WX_NEW_ORDER_TEMPLATE_COLOR, "color": WX_NEW_ORDER_TEMPLATE_COLOR,
}, },
} }
storeID := jxutils.GetSaleStoreIDFromOrder(order) storeID := jxutils.GetSaleStoreIDFromOrder(order)
err = SendMsgToStore(storeID, WX_ORDER_ORDER_CANCELED_TEMPLATE_ID, "", "", data) err = SendMsgToStore(storeID, WX_ORDER_CHANGE_INFO_TEMPLATE_ID, "", "", data)
netprinter.NofityOrderMsg(jxcontext.AdminCtx, jxutils.GetSaleStoreIDFromOrder(order), order.VendorOrderID, title) netprinter.NofityOrderMsg(jxcontext.AdminCtx, jxutils.GetSaleStoreIDFromOrder(order), order.VendorOrderID, title)
return err return err
} }

16
business/partner/purchase/jd/order.go
View File

@@ -6,6 +6,8 @@ import (
"strings" "strings"
"time" "time"
"git.rosy.net.cn/jx-callback/business/jxutils/weixinmsg"
"git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/business/jxutils/tasksch" "git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
@@ -129,9 +131,9 @@ func (c *PurchaseHandler) onOrderInfoChangeMsg(vendorOrgCode string, msg *jdapi.
globals.SugarLogger.Debugf("onOrderInfoChangeMsg orderID:%s", msg.BillID) globals.SugarLogger.Debugf("onOrderInfoChangeMsg orderID:%s", msg.BillID)
orderInfoChangeSet(order, msg) orderInfoChangeSet(order, msg)
globals.SugarLogger.Debugf("onOrderInfoChangeMsg2: %v", order) globals.SugarLogger.Debugf("onOrderInfoChangeMsg2: %v", order)
// db := dao.GetDB() db := dao.GetDB()
// _, err = dao.UpdateEntity(db, order, "ConsigneeAddress", "ConsigneeName", "ConsigneeMobile", "ConsigneeLat", "ConsigneeLng", "BuyerComment") _, err = dao.UpdateEntity(db, order, "ConsigneeAddress", "ConsigneeName", "ConsigneeMobile", "ConsigneeLat", "ConsigneeLng", "BuyerComment")
// weixinmsg.NotifyOrderChanged(order) weixinmsg.NotifyOrderChanged(order)
// partner.CurOrderManager.ChangeOrderInfo(order) // partner.CurOrderManager.ChangeOrderInfo(order)
} }
return retVal return retVal
@@ -588,11 +590,11 @@ func orderInfoChangeSet(order *model.GoodsOrder, msg *jdapi.CallbackOrderInfoCha
if msg.BuyerMobile != "" { if msg.BuyerMobile != "" {
order.ConsigneeMobile = msg.BuyerMobile order.ConsigneeMobile = msg.BuyerMobile
} }
if msg.BuyerLat != 0 { if msg.BuyerLat != "" {
order.ConsigneeLat = jxutils.StandardCoordinate2Int(msg.BuyerLat) order.ConsigneeLat = jxutils.StandardCoordinate2Int(utils.Str2Float64(msg.BuyerLat))
} }
if msg.BuyerLng != 0 { if msg.BuyerLng != "" {
order.ConsigneeLng = jxutils.StandardCoordinate2Int(msg.BuyerLng) order.ConsigneeLng = jxutils.StandardCoordinate2Int(utils.Str2Float64(msg.BuyerLng))
} }
if msg.OrderBuyerRemark != "" { if msg.OrderBuyerRemark != "" {
order.BuyerComment = msg.OrderBuyerRemark order.BuyerComment = msg.OrderBuyerRemark