修改门店发单和品牌发单是扣费问题

business/model/dao/store.go

@@ -3,6 +3,7 @@ package dao
 import (
 	"errors"
 	"fmt"
+	"git.rosy.net.cn/jx-callback/business/partner"
 	"sort"
 	"strings"
 	"time"
@@ -29,7 +30,7 @@ type StoreDetail struct {
 	PricePercentage        int16                     `orm:"default(100)" json:"pricePercentage"` // todo 厂商价格相对于本地价格的百分比，这个字段的修改会比较特殊，因为可能需要刷新厂商价格
 	PricePercentagePackStr string                    `orm:"size(4096)" json:"-"`                 //
 	PricePercentagePackObj model.PricePercentagePack `orm:"-" json:"-"`
-	CreateDeliveryType     int                       `orm:"default(0)" json:"createDeliveryType"` //默认0系统发单，1为门店发单
+	CreateDeliveryType     int                       `orm:"default(0)" json:"createDeliveryType"` //默认0系统(品牌)发单，1为门店发单
 
 	FreightDeductionPackStr string                      `orm:"size(4096)" json:"-"` //
 	FreightDeductionPackObj *model.FreightDeductionPack `orm:"-" json:"-"`
@@ -1162,11 +1163,11 @@ func GetStoreAcctExpendTotal(db *DaoDB, storeID int, expendTypes []int, vendorOr
 
 type GetStoreAcctExpendLastCreateWayBillFeeResult struct {
 	ID               int `orm:"column(id)" json:"id"`
-	ExpID            int `orm:"column(exp_id)" json:"expID"` //少扣的钱
-	IncID            int `orm:"column(inc_id)" json:"incID"` //多扣的钱
-	ExpendPrice      int `json:"expendPrice"`
-	MulitExpendPrice int `json:"mulitExpendPrice"`
-	MulitIncomePrice int `json:"mulitIncomePrice"`
+	ExpID            int `orm:"column(exp_id)" json:"expID"` // 支出记录id(金额补充)
+	IncID            int `orm:"column(inc_id)" json:"incID"` // 退费记录id(金额退款)
+	ExpendPrice      int `json:"expendPrice"`                // 运单支出金额
+	MulitExpendPrice int `json:"mulitExpendPrice"`           // 运单补充金额
+	MulitIncomePrice int `json:"mulitIncomePrice"`           // 运单退还金额
 }
 
 func GetStoreAcctExpendLastCreateWayBillFee(db *DaoDB, vendorOrderID string) (expend *GetStoreAcctExpendLastCreateWayBillFeeResult, lastFee int, err error) {
@@ -1180,7 +1181,7 @@ func GetStoreAcctExpendLastCreateWayBillFee(db *DaoDB, vendorOrderID string) (ex
 		   AND a.type = ?
 	`
 	sqlParams := []interface{}{
-		20,
+		partner.StoreAcctTypeExpendCreateWaybillEx,
 	}
 	if vendorOrderID != "" {
 		sql += " AND a.vendor_order_id = ?"