diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 0ff2caa97..3dd5d880f 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -576,7 +576,7 @@ func UpdateFakeWayBillToTiktok() { } -// LoadingStoreOrderSettleAmount 获取平台门店的结算信息(订单的配送费和准时保险费) +// LoadingStoreOrderSettleAmount 获取平台门店的结算信息(订单的配送费和准时保险费/运费) func LoadingStoreOrderSettleAmount(startTime, endTime int64, jxStoreId []int) error { var ( db = dao.GetDB() @@ -626,27 +626,31 @@ func LoadingStoreOrderSettleAmount(startTime, endTime int64, jxStoreId []int) er } for _, so := range storeOrder { + goodsOrder, _ := partner.CurOrderManager.LoadOrder(so.OrderId, model.VendorIDMTWM) + // 更新订单的结算信息 - if so.PlatformSettlement > 0 { - goodsOrderSql := `UPDATE goods_order g SET g.total_shop_money = ? WHERE g.vendor_order_id = ? ` - if _, err := dao.ExecuteSQL(db, goodsOrderSql, []interface{}{so.PlatformSettlement, so.OrderId}...); err != nil { - globals.SugarLogger.Debugf("更新订单结算信息错误: %v", err) - } + if so.PlatformSettlement > 0 && goodsOrder != nil { + dao.UpdateEntity(db, goodsOrder, "TotalShopMoney") + //goodsOrderSql := `UPDATE goods_order g SET g.total_shop_money = ? WHERE g.vendor_order_id = ? ` + //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 so.TimingFee < 0 { - // so.TimingFee = so.TimingFee * -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 { - // globals.SugarLogger.Debugf("更新订单物流结算信息错误: %v", err) - // } - //} - + if goodsOrder.JxStoreID == 804947 { + if so.TimingFee != 0 || so.DeliveryFee != 0 { + if so.TimingFee < 0 { + so.TimingFee = so.TimingFee * -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 { + globals.SugarLogger.Debugf("更新订单物流结算信息错误: %v", err) + } + } + } } return retVal, err diff --git a/controllers/jx_order2.go b/controllers/jx_order2.go index 3c8ece4d8..d9df9151b 100644 --- a/controllers/jx_order2.go +++ b/controllers/jx_order2.go @@ -106,7 +106,7 @@ func (c *JxOrderController) QueryBarCodeRefundStatus() { c.callQueryBarCodeRefundStatus(func(params *tJxorderQueryBarCodeRefundStatusParams) (retVal interface{}, errCode string, err error) { switch params.PayType { case "tonglian": - //retVal, err = localjx.RefundBarCodeScannerOrder(params.AfsOrderId) + //err = localjx.RefundBarCodeScannerOrder(params.AfsOrderId) case "lakala": retVal, err = localjx.QueryBarCodeRefundStatus(params.AfsOrderId) } diff --git a/controllers/lakala.go b/controllers/lakala.go index de6bc2fe3..bd2783f89 100644 --- a/controllers/lakala.go +++ b/controllers/lakala.go @@ -185,8 +185,9 @@ func (c *LaKaLaController) UpdateBasicInfo() { // QueryExamine 查询变更事件审核状态 // @Title 查询变更事件审核状态 // @Description 查询变更事件审核状态 +// @Param token header string true "认证token" // @Param customerNo query string true "商户ID" -// @Param reviewRelatedId query string true "变更事件ID" +// @Param reviewRelatedId query string true "变更事件ID" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult // @router /QueryExamine [get]