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

1

Browse Source
This commit is contained in:
邹宗楠
2024-10-18 14:58:51 +08:00
parent 6455cc02aa
commit 0ec80eb412
4 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxutils/unipush/push.go
View File

@@ -53,7 +53,7 @@ func NotifyNewOrder(order *model.GoodsOrder) {
msg.Context = "老板,你有新的订单了!" msg.Context = "老板,你有新的订单了!"
msg.VendorOrderId = order.VendorOrderID msg.VendorOrderId = order.VendorOrderID
context, _ := json.Marshal(msg) context, _ := json.Marshal(msg)
body := fmt.Sprintf(msg.Context+"(%s)", model.VendorChineseNames[order.VendorID]+"#"+msg.OrderSqs+"号订单") body := fmt.Sprintf(msg.Context+"门店ID:%d"+"(%s)", storeId, model.VendorChineseNames[order.VendorID]+"#"+msg.OrderSqs+"号订单")
pushMsgByUniApp(storeDetail.ID, storeDetail.Name, cid, string(context), body, SoundsFileNewOrder, FlagOrder) pushMsgByUniApp(storeDetail.ID, storeDetail.Name, cid, string(context), body, SoundsFileNewOrder, FlagOrder)
} }

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

@@ -247,7 +247,7 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *mtwmapi.CallbackMsg) (retVal *mtwma
dao.UpdateEntity(db, order, "TotalShopMoney", "ShopPrice", "EarningPrice") dao.UpdateEntity(db, order, "TotalShopMoney", "ShopPrice", "EarningPrice")
} else { } else {
globals.SugarLogger.Debugf("美团平台售后获取退款金额信息错误: = %v", err) globals.SugarLogger.Debugf("美团平台售后获取退款金额信息错误: = %v", err)
ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "美团平台售后获取退款金额信息错误", fmt.Sprintf("orderid := %d,%s", model.VendorIDMTWM, order.VendorOrderID)) ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "美团平台售后获取退款金额信息错误", fmt.Sprintf("orderid := %d,%s,%v", model.VendorIDMTWM, order.VendorOrderID, err))
} }
} }

31
conf/app.conf
View File

@@ -473,10 +473,8 @@ wxBackstageHost = "http://wx-jxgy.jxc4.com"
dingdingAgentID = 258707199 dingdingAgentID = 258707199
dingdingAppKey = "dingtozhutfr98qgwc7d" dingdingAppKey = "dingtozhutfr98qgwc7d"
dingdingSecret = "7EJ0HDbkxQri-O2RSaYUu7_ZwvvMKtRVHT8cpyfvIvK6A9n9HRwPNCNRJFuEDeT_" dingdingSecret = "7EJ0HDbkxQri-O2RSaYUu7_ZwvvMKtRVHT8cpyfvIvK6A9n9HRwPNCNRJFuEDeT_"
dingdingQRCodeAppKey = "dingoaw990o1jm9jswvwib" dingdingQRCodeAppKey = "dingoaw990o1jm9jswvwib"
dingdingQRCodeSecret = "N9dyC9qB84sauQPs4_JYrILMsG5Krqm9-PSSVJ8t9hb87rrHiFUirISxGF5G57RV" dingdingQRCodeSecret = "N9dyC9qB84sauQPs4_JYrILMsG5Krqm9-PSSVJ8t9hb87rrHiFUirISxGF5G57RV"
dingdingCallbackURL = "http://callback-jxgy.jxc4.com/dingding/msg" dingdingCallbackURL = "http://callback-jxgy.jxc4.com/dingding/msg"
getWeixinTokenURL = "http://www.jxc4.com/v2/sys/GetWXToken" getWeixinTokenURL = "http://www.jxc4.com/v2/sys/GetWXToken"
@@ -560,7 +558,7 @@ ebaiStorePageCookieWMSTOKEN = "QAAGALAAAFd2VaeBVCNBtlDTJUL2NXW2YFIiBzMWksCWFWQRC
# 要用 # 要用
mtwmAppID = "4123" mtwmAppID = "4123"
mtwmSecret = "df2c88338b85f830cebce2a9eab56628" mtwmSecret = "df2c88338b85f830cebce2a9eab56628"
mtwmCallbackURL = "http://callback-jxpet.jxc4.com" mtwmCallbackURL = "http://callback-gblm.jxc4.com"
mtwmCookieStr = "_lxsdk_cuid=16f413bd94fc8-0daccb808f461b-1d336b5a-13c680-16f413bd94fc8; _lxsdk=16f413bd94fc8-0daccb808f461b-1d336b5a-13c680-16f413bd94fc8; uuid=d1e8adb3d2774b89fe6e.1577347439.1.0.0; uuid_update=true; wpush_server_url=wss://wpush.meituan.com; acctId=62884810; token=0LhaIAAgrL1Hy0DDATjZqt4lRHauN_bBL3q0AvxUFUWo*; brandId=-1; wmPoiId=-1; isOfflineSelfOpen=0; city_id=0; isChain=1; existBrandPoi=true; ignore_set_router_proxy=true; region_id=; region_version=0; newCategory=false; bsid=SUVq2IfzZ53EHaTVoCE3UsmKkH5ZevxTjkwpNcaLKkbUOBkEyuZp8mPFwhgqkxsCGNjZILNj5aV8uVSQc888bg; device_uuid=!625e0297-431a-49ad-8b18-a0562c38a8eb; cityId=510100; provinceId=510000; city_location_id=0; location_id=0; pushToken=0LhaIAAgrL1Hy0DDATjZqt4lRHauN_bBL3q0AvxUFUWo*; set_info=%7B%22wmPoiId%22%3A-1%2C%22ignoreSetRouterProxy%22%3Atrue%7D; igateApp=shangouepc; LX_SC_CONSTANT=c_nehoktcu; shopCategory=food; JSESSIONID=unlrbu07lvm2s734eyedxr0j; _lxsdk_s=16f413bd950-189-8bb-8df%7C%7C33" mtwmCookieStr = "_lxsdk_cuid=16f413bd94fc8-0daccb808f461b-1d336b5a-13c680-16f413bd94fc8; _lxsdk=16f413bd94fc8-0daccb808f461b-1d336b5a-13c680-16f413bd94fc8; uuid=d1e8adb3d2774b89fe6e.1577347439.1.0.0; uuid_update=true; wpush_server_url=wss://wpush.meituan.com; acctId=62884810; token=0LhaIAAgrL1Hy0DDATjZqt4lRHauN_bBL3q0AvxUFUWo*; brandId=-1; wmPoiId=-1; isOfflineSelfOpen=0; city_id=0; isChain=1; existBrandPoi=true; ignore_set_router_proxy=true; region_id=; region_version=0; newCategory=false; bsid=SUVq2IfzZ53EHaTVoCE3UsmKkH5ZevxTjkwpNcaLKkbUOBkEyuZp8mPFwhgqkxsCGNjZILNj5aV8uVSQc888bg; device_uuid=!625e0297-431a-49ad-8b18-a0562c38a8eb; cityId=510100; provinceId=510000; city_location_id=0; location_id=0; pushToken=0LhaIAAgrL1Hy0DDATjZqt4lRHauN_bBL3q0AvxUFUWo*; set_info=%7B%22wmPoiId%22%3A-1%2C%22ignoreSetRouterProxy%22%3Atrue%7D; igateApp=shangouepc; LX_SC_CONSTANT=c_nehoktcu; shopCategory=food; JSESSIONID=unlrbu07lvm2s734eyedxr0j; _lxsdk_s=16f413bd950-189-8bb-8df%7C%7C33"
enableStoreWrite = true enableStoreWrite = true
@@ -575,7 +573,7 @@ mtpsAppKey = "3c0a05d464c247c19d7ec13accc78605"
mtpsSecret = "b1M}9?:sTbsB[OF2gNORnN(|(iy9rB8(`7]|[wGLnbmt`evfM>E:A90DjHAW:UPE" mtpsSecret = "b1M}9?:sTbsB[OF2gNORnN(|(iy9rB8(`7]|[wGLnbmt`evfM>E:A90DjHAW:UPE"
dadaIsProd = true dadaIsProd = true
dadaCallbackURL = "http://callback-jxpet.jxc4.com/dadadelivery/msg" dadaCallbackURL = "http://callback-gblm.jxc4.com/dadadelivery/msg"
dadaSourceID = "6660" dadaSourceID = "6660"
weixinAppID = "wx2bb99eb5d2c9b82c" weixinAppID = "wx2bb99eb5d2c9b82c"
@@ -590,27 +588,26 @@ weixinMiniSecret2 = "2a57228a716ce991a52739f0ff41111d"
weixinAppIdPrint = "wx2bfbc02e6251b71b" weixinAppIdPrint = "wx2bfbc02e6251b71b"
weixinAppSecretPrint = "ff4128908947cfb71002f74599c0dbf9" weixinAppSecretPrint = "ff4128908947cfb71002f74599c0dbf9"
wxpayNotifyURL = "http://callback-jxpet.jxc4.com/wxpay/msg/" wxpayNotifyURL = "http://callback-gblm.jxc4.com/wxpay/msg/"
# 抖音支付回调地址 # 抖音支付回调地址
tiktokNotifyUrl = "https://callback-jxpet.jxc4.com/tictoc/tiktokMsg" tiktokNotifyUrl = "https://callback-gblm.jxc4.com/tictoc/tiktokMsg"
tonglianPayAppID = "00183083" tonglianPayAppID = "00183083"
tonglianPayKey = "18048531223" tonglianPayKey = "18048531223"
tonglianPayCusID = "56065105499TVAH" tonglianPayCusID = "56065105499TVAH"
tonglianPayNotifyURL = "http://callback-jxpet.jxc4.com/tonglian/msg/" tonglianPayNotifyURL = "http://callback-gblm.jxc4.com/tonglian/msg/"
backstageHost = "http://www-jxpet.jxc4.com" backstageHost = "http://www-gblm.jxc4.com"
wxBackstageHost = "http://wx-jxpet.jxc4.com" wxBackstageHost = "http://wx-gblm.jxc4.com"
dingdingAgentID = 258707199 dingdingAgentID = 3276722398
dingdingAppKey = "dingtozhutfr98qgwc7d" dingdingAppKey = "dingnmp0q0z0ytyljftb"
dingdingSecret = "7EJ0HDbkxQri-O2RSaYUu7_ZwvvMKtRVHT8cpyfvIvK6A9n9HRwPNCNRJFuEDeT_" dingdingSecret = "tlw6CTdb-rY4Vb3YotJJWZzVlpLd7Vw2wbMLV0rC_TwnO6Jt-pqBMEcpU1hUI64q"
dingdingQRCodeAppKey = "dingnmp0q0z0ytyljftb"
dingdingQRCodeSecret = "tlw6CTdb-rY4Vb3YotJJWZzVlpLd7Vw2wbMLV0rC_TwnO6Jt-pqBMEcpU1hUI64q"
dingdingCallbackURL = "http://callback-gblm.jxc4.com/dingding/msg"
dingdingQRCodeAppKey = "dingoaw990o1jm9jswvwib"
dingdingQRCodeSecret = "N9dyC9qB84sauQPs4_JYrILMsG5Krqm9-PSSVJ8t9hb87rrHiFUirISxGF5G57RV"
dingdingCallbackURL = "http://callback-jxpet.jxc4.com/dingding/msg"
getWeixinTokenURL = "http://www.jxc4.com/v2/sys/GetWXToken" getWeixinTokenURL = "http://www.jxc4.com/v2/sys/GetWXToken"
getWeixin2TokenURL = "http://www.jxc4.com/v2/sys/GetWX2Token" getWeixin2TokenURL = "http://www.jxc4.com/v2/sys/GetWX2Token"
@@ -632,7 +629,7 @@ jdShopAppSecret2 = "71e1061ac2f246f6ac27efb900edba12"
fnAppID = "6705486294797503379" fnAppID = "6705486294797503379"
fnAppSecret = "c1e6c280-e618-4103-9d0a-673bc54fb22e" fnAppSecret = "c1e6c280-e618-4103-9d0a-673bc54fb22e"
fnMerchantId= "51658" fnMerchantId= "51658"
fnCallbackURL = "http://callback-jxpet.jxc4.com/fn/msg" fnCallbackURL = "http://callback-gblm.jxc4.com/fn/msg"
#顺丰派送 #顺丰派送
sfpsAppID = 1663705444 sfpsAppID = 1663705444

2
controllers/jx_order.go
View File

@@ -529,8 +529,6 @@ func (c *OrderController) StaleIndexInfo() {
dataList = append(dataList, v.Store.ID) dataList = append(dataList, v.Store.ID)
mapDataList[v.Store.ID] = model.YES mapDataList[v.Store.ID] = model.YES
} }
} else {
return retVal, "", err
} }
if params.StoreID != 0 && mapDataList[params.StoreID] != model.YES { if params.StoreID != 0 && mapDataList[params.StoreID] != model.YES {
return retVal, "", fmt.Errorf("此门店%d,不归属于该用户%s", params.StoreID, ctx.GetUserName()) return retVal, "", fmt.Errorf("此门店%d,不归属于该用户%s", params.StoreID, ctx.GetUserName())