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-07-30 13:55:13 +08:00
parent 5edbd4dd49
commit 15c3428a70
4 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
business/jxcallback/orderman/order.go
View File

@@ -279,17 +279,17 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m
dao.UpdateEntity(db, order2, "OrderFinishedAt") dao.UpdateEntity(db, order2, "OrderFinishedAt")
} }
if orderStatus.Status == model.OrderStatusCanceled && orderStatus.VendorID == model.VendorIDMTWM { if orderStatus.Status == model.OrderStatusCanceled && orderStatus.VendorID == model.VendorIDMTWM {
num, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", utils.Int64ToFloat64(order.TotalShopMoney)/float64(100)), 64) num, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", utils.Int64ToFloat64(order2.TotalShopMoney)/float64(100)), 64)
applyErr := mtwm.GetAPI(order.VendorOrgCode, order.StoreID, order.VendorStoreID).ApplyCompensation(&mtwmapi.ApplyCompensationRes{ applyErr := mtwm.GetAPI(order2.VendorOrgCode, order2.StoreID, order2.VendorStoreID).ApplyCompensation(&mtwmapi.ApplyCompensationRes{
OrderId: utils.Str2Int64(order.VendorOrderID), OrderId: utils.Str2Int64(order2.VendorOrderID),
Reason: "商户申请", Reason: "商户申请",
ApplyStatus: mtwmapi.ApplyCompensationStatusOne, ApplyStatus: mtwmapi.ApplyCompensationStatusOne,
Amount: num, Amount: num,
}) })
if applyErr != nil { if applyErr != nil {
partner.CurOrderManager.OnOrderMsg(order, utils.Int2Str(order.Status), fmt.Sprintf("取消订单申请赔付失败:%s", applyErr.Error())) partner.CurOrderManager.OnOrderMsg(order2, utils.Int2Str(order2.Status), fmt.Sprintf("取消订单申请赔付失败:%s", applyErr.Error()))
} else { } else {
partner.CurOrderManager.OnOrderMsg(order, utils.Int2Str(order.Status), fmt.Sprintf("取消订单申请赔付:%s", "成功")) partner.CurOrderManager.OnOrderMsg(order2, utils.Int2Str(order2.Status), fmt.Sprintf("取消订单申请赔付:%s", "成功"))
} }
} }

1
business/jxstore/cms/user2.go
View File

@@ -668,6 +668,7 @@ func getAddressInfoFromCoord(db *dao.DaoDB, lng, lat float64) (formattedAddress
cityCode = districtInfo.ParentCode cityCode = districtInfo.ParentCode
} }
} }
// 地址 // 行政区划code
return formattedAddress, districtCode, cityCode, err return formattedAddress, districtCode, cityCode, err
} }

33
business/jxutils/ditu/ditu.go
View File

@@ -58,24 +58,29 @@ func GetGridsFromCoordinate(lng, lat float64, radius int, roundLng, roundLat int
} }
func GetDistrictCoordinateList(districtCode int, radius, gridWith int) (coordList []*Coordinate) { func GetDistrictCoordinateList(districtCode int, radius, gridWith int) (coordList []*Coordinate) {
districts, err := api.AutonaviAPI.GetDistricts(1, utils.Int2Str(districtCode)) //districts, err := api.AutonaviAPI.GetDistricts(1, utils.Int2Str(districtCode))
if err == nil { //if err == nil {
if len(districts) > 0 { // if len(districts) > 0 {
roundLng, roundLat := GetRound4Radius(districts[0].Lng, districts[0].Lat, gridWith) // roundLng, roundLat := GetRound4Radius(districts[0].Lng, districts[0].Lat, gridWith)
tmpCoordList := getDistrictCoordinateList(districts, radius, gridWith, roundLng, roundLat) // tmpCoordList := getDistrictCoordinateList(districts, radius, gridWith, roundLng, roundLat)
if len(tmpCoordList) > 0 { // if len(tmpCoordList) > 0 {
coordList = append(coordList, &Coordinate{ // coordList = append(coordList, &Coordinate{
Lng: districts[0].Lng, // Lng: districts[0].Lng,
Lat: districts[0].Lat, // Lat: districts[0].Lat,
}) // })
coordList = append(coordList, tmpCoordList...) // coordList = append(coordList, tmpCoordList...)
} // }
} // }
} //}
return coordList return coordList
} }
func GetCityCoordinateList(cityCode int, radius, gridWith int) (coordList []*Coordinate) { func GetCityCoordinateList(cityCode int, radius, gridWith int) (coordList []*Coordinate) {
//place, err := dao.GetPlaces(dao.GetDB(), []int{cityCode})
//if err != nil {
// return nil
//}
//level+1
districts, err := api.AutonaviAPI.GetDistricts(2, utils.Int2Str(cityCode)) districts, err := api.AutonaviAPI.GetDistricts(2, utils.Int2Str(cityCode))
if err == nil { if err == nil {
if len(districts) > 0 { if len(districts) > 0 {

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

@@ -47,9 +47,6 @@ func (c *PurchaseHandler) isAfsMsg(msg *mtwmapi.CallbackMsg) bool {
// refundData := msg.Data.(*mtwmapi.CallbackRefundInfo) // refundData := msg.Data.(*mtwmapi.CallbackRefundInfo)
orderID := utils.Str2Int64(GetOrderIDFromMsg(msg)) orderID := utils.Str2Int64(GetOrderIDFromMsg(msg))
order, _ := partner.CurOrderManager.LoadOrder(utils.Int64ToStr(orderID), model.VendorIDMTWM) order, _ := partner.CurOrderManager.LoadOrder(utils.Int64ToStr(orderID), model.VendorIDMTWM)
if orderID == 3801105140856800486 {
return true
}
if order != nil { if order != nil {
return true //TODO 有的美团订单售前退款，也当做售后处理试试 return true //TODO 有的美团订单售前退款，也当做售后处理试试
//} //}