aa

business/jxcallback/scheduler/basesch/basesch_ext.go

@@ -289,12 +289,27 @@ func (c *BaseScheduler) ConfirmSelfTake(ctx *jxcontext.Context, vendorOrderID st
 	return err
 }
 
-func (c *BaseScheduler) SetOrderWaybillTip(ctx *jxcontext.Context, vendorOrderID string, vendorID int, tipFee int64) (err error) {
-	order, err2 := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID)
-	if err = err2; err == nil {
-		err = c.SetOrderWaybillTipByOrder(ctx, order, tipFee)
+func (c *BaseScheduler) SetOrderWaybillTip(ctx *jxcontext.Context, vendorOrderID string, vendorID int, tipFee int64) (errCode string, err error) {
+	if order, err := partner.CurOrderManager.LoadOrder(vendorOrderID, vendorID); err == nil {
+		if errCode, err = c.CheckStoreBalanceWithTip(ctx, order, tipFee); err == nil {
+			c.SetOrderWaybillTipByOrder(ctx, order, tipFee)
+		}
 	}
-	return err
+	return errCode, err
+}
+
+func (c *BaseScheduler) CheckStoreBalanceWithTip(ctx *jxcontext.Context, order *model.GoodsOrder, tipFee int64) (errCode string, err error) {
+	if order.CreateDeliveryType == model.YES {
+		//加小费只判断余额
+		storeAcct, err := cms.GetStoreAcctBalance(ctx, jxutils.GetSaleStoreIDFromOrder(order))
+		if err != nil {
+			return errCode, fmt.Errorf("获取账户余额失败！")
+		}
+		if tipFee > int64(storeAcct.AccountBalance) {
+			return model.ErrCodeAccountBalanceNotEnough, fmt.Errorf("门店账户余额不足，不能加小费！")
+		}
+	}
+	return errCode, err
 }
 
 func isWaybillCanAddTip(waybill *model.Waybill) (isCan bool) {
@@ -310,19 +325,26 @@ func (c *BaseScheduler) SetOrderWaybillTipByOrder(ctx *jxcontext.Context, order
 	if order.WaybillTipMoney >= tipFee {
 		return fmt.Errorf("当前小费已经是%s元，想要设置%s元", jxutils.IntPrice2StandardString(order.WaybillTipMoney), jxutils.IntPrice2StandardString(tipFee))
 	}
-
 	db := dao.GetDB()
 	storeDetail, err2 := dao.GetStoreDetail(db, jxutils.GetSaleStoreIDFromOrder(order), order.VendorID, "")
 	if err = err2; err != nil {
 		return err
 	}
-
+	flag := false
 	// 如果平台支持设置配送小费，必须要成功设置
 	if handler := partner.GetWaybillTipUpdater(order.VendorID); handler != nil {
 		if err = handler.UpdateWaybillTip(ctx, order.VendorOrgCode, order.VendorStoreID, order.VendorOrderID, "", "", utils.Int2Str(storeDetail.CityCode), tipFee); err != nil {
 			return err
+		} else {
+			//加小费成功扣钱
+			if order.CreateDeliveryType == model.YES {
+				if err = partner.CurStoreAcctManager.InsertStoreAcctExpendAndUpdateStoreAcctBalance(ctx, jxutils.GetSaleStoreIDFromOrder(order), int(tipFee), partner.StoreAcctTypeExpendCreateWaybillTip, order.VendorOrderID); err == nil {
+					flag = true
+				}
+			}
 		}
-	}
+	} //有可能进else，没加得起平台小费，就要到下面扣账户
+
 	order.WaybillTipMoney = tipFee
 	partner.CurOrderManager.UpdateOrderFields(order, []string{"WaybillTipMoney"})
 
@@ -347,6 +369,15 @@ func (c *BaseScheduler) SetOrderWaybillTipByOrder(ctx *jxcontext.Context, order
 				}, waybills2)
 			tasksch.HandleTask(task, nil, false).Run()
 			_, err = task.GetResult(0)
+			if err == nil {
+				//加起了至少只扣一次钱
+				if !flag {
+					//加小费成功扣钱
+					if order.CreateDeliveryType == model.YES {
+						partner.CurStoreAcctManager.InsertStoreAcctExpendAndUpdateStoreAcctBalance(ctx, jxutils.GetSaleStoreIDFromOrder(order), int(tipFee), partner.StoreAcctTypeExpendCreateWaybillTip, order.VendorOrderID)
+					}
+				}
+			}
 		}
 	}
 	return err