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:
邹宗楠
2025-07-07 16:53:07 +08:00
parent 15775cfb16
commit 0f5c95243f
3 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
business/partner/delivery/rider.go
View File

@@ -576,7 +576,7 @@ func UpdateFakeWayBillToTiktok() {
} }
// LoadingStoreOrderSettleAmount 获取平台门店的结算信息(订单的配送费和准时保险费) // LoadingStoreOrderSettleAmount 获取平台门店的结算信息(订单的配送费和准时保险费/运费)
func LoadingStoreOrderSettleAmount(startTime, endTime int64, jxStoreId []int) error { func LoadingStoreOrderSettleAmount(startTime, endTime int64, jxStoreId []int) error {
var ( var (
db = dao.GetDB() db = dao.GetDB()
@@ -626,27 +626,31 @@ func LoadingStoreOrderSettleAmount(startTime, endTime int64, jxStoreId []int) er
} }
for _, so := range storeOrder { for _, so := range storeOrder {
goodsOrder, _ := partner.CurOrderManager.LoadOrder(so.OrderId, model.VendorIDMTWM)
// 更新订单的结算信息 // 更新订单的结算信息
if so.PlatformSettlement > 0 { if so.PlatformSettlement > 0 && goodsOrder != nil {
goodsOrderSql := `UPDATE goods_order g SET g.total_shop_money = ? WHERE g.vendor_order_id = ? ` dao.UpdateEntity(db, goodsOrder, "TotalShopMoney")
if _, err := dao.ExecuteSQL(db, goodsOrderSql, []interface{}{so.PlatformSettlement, so.OrderId}...); err != nil { //goodsOrderSql := `UPDATE goods_order g SET g.total_shop_money = ? WHERE g.vendor_order_id = ? `
globals.SugarLogger.Debugf("更新订单结算信息错误: %v", err) //if _, err := dao.ExecuteSQL(db, goodsOrderSql, []interface{}{so.PlatformSettlement, so.OrderId}...); err != nil {
} // globals.SugarLogger.Debugf("更新订单结算信息错误: %v", err)
//}
} }
// 更新订单的配送信息 // 更新订单的配送信息
//if so.TimingFee != 0 || so.DeliveryFee != 0 { if goodsOrder.JxStoreID == 804947 {
// if so.TimingFee < 0 { if so.TimingFee != 0 || so.DeliveryFee != 0 {
// so.TimingFee = so.TimingFee * -1 if so.TimingFee < 0 {
// } so.TimingFee = so.TimingFee * -1
// if so.DeliveryFee < 0 { }
// so.DeliveryFee = so.DeliveryFee * -1 if so.DeliveryFee < 0 {
// } so.DeliveryFee = so.DeliveryFee * -1
// wayBillSql := `UPDATE waybill w SET w.desired_fee = ?,w.punctual_fee = ? WHERE w.vendor_order_id = ? AND w.vendor_waybill_id = ? ` }
// if _, err := dao.ExecuteSQL(db, wayBillSql, []interface{}{so.DeliveryFee, so.TimingFee, so.OrderId, so.OrderId}...); err != nil { wayBillSql := `UPDATE waybill w SET w.desired_fee = ?,w.punctual_fee = ? WHERE w.vendor_order_id = ? AND w.vendor_waybill_id = ? `
// globals.SugarLogger.Debugf("更新订单物流结算信息错误: %v", err) if _, err := dao.ExecuteSQL(db, wayBillSql, []interface{}{so.DeliveryFee, so.TimingFee, so.OrderId, so.OrderId}...); err != nil {
// } globals.SugarLogger.Debugf("更新订单物流结算信息错误: %v", err)
//} }
}
}
} }
return retVal, err return retVal, err

2
controllers/jx_order2.go
View File

@@ -106,7 +106,7 @@ func (c *JxOrderController) QueryBarCodeRefundStatus() {
c.callQueryBarCodeRefundStatus(func(params *tJxorderQueryBarCodeRefundStatusParams) (retVal interface{}, errCode string, err error) { c.callQueryBarCodeRefundStatus(func(params *tJxorderQueryBarCodeRefundStatusParams) (retVal interface{}, errCode string, err error) {
switch params.PayType { switch params.PayType {
case "tonglian": case "tonglian":
//retVal, err = localjx.RefundBarCodeScannerOrder(params.AfsOrderId) //err = localjx.RefundBarCodeScannerOrder(params.AfsOrderId)
case "lakala": case "lakala":
retVal, err = localjx.QueryBarCodeRefundStatus(params.AfsOrderId) retVal, err = localjx.QueryBarCodeRefundStatus(params.AfsOrderId)
} }

1
controllers/lakala.go
View File

@@ -185,6 +185,7 @@ func (c *LaKaLaController) UpdateBasicInfo() {
// QueryExamine 查询变更事件审核状态 // QueryExamine 查询变更事件审核状态
// @Title 查询变更事件审核状态 // @Title 查询变更事件审核状态
// @Description 查询变更事件审核状态 // @Description 查询变更事件审核状态
// @Param token header string true "认证token"
// @Param customerNo query string true "商户ID" // @Param customerNo query string true "商户ID"
// @Param reviewRelatedId query string true "变更事件ID" // @Param reviewRelatedId query string true "变更事件ID"
// @Success 200 {object} controllers.CallResult // @Success 200 {object} controllers.CallResult