From 5cc1cbe805f5ee9f4d7cdc18cbe71a52acf86d75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Fri, 5 Mar 2021 14:18:12 +0800 Subject: [PATCH] aa --- business/model/dao/store.go | 11 +++++++++-- business/partner/purchase/mtwm/store.go | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/business/model/dao/store.go b/business/model/dao/store.go index 0b7cdf912..2151c2f63 100644 --- a/business/model/dao/store.go +++ b/business/model/dao/store.go @@ -1138,12 +1138,19 @@ 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"` } func GetStoreAcctExpendLastCreateWayBillFee(db *DaoDB, vendorOrderID string) (lastFee int, err error) { - var expend *model.StoreAcctExpend + var expend *GetStoreAcctExpendLastCreateWayBillFeeResult sql := ` - SELECT a.id, b.id exp_id, c.id inc_id + SELECT a.id, b.id exp_id, c.id inc_id, + a.expend_price, b.expend_price mulit_expend_price, c.income_price mulit_income_price FROM store_acct_expend a LEFT JOIN store_acct_expend b ON a.id = b.exp_id LEFT JOIN store_acct_income c ON a.id = c.exp_id diff --git a/business/partner/purchase/mtwm/store.go b/business/partner/purchase/mtwm/store.go index 63d0b0c26..ef01d03ee 100644 --- a/business/partner/purchase/mtwm/store.go +++ b/business/partner/purchase/mtwm/store.go @@ -144,7 +144,7 @@ func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri } vendorInfoMap := storeVendorOrgCodeMap[vendorOrgCode] poiSettleSaveParam := &mtwmapi.PoiSettleSaveParam{ - Type: 0, //创建 + Type: 1, //创建 ApplyInfos: []*mtwmapi.ApplyInfo{ &mtwmapi.ApplyInfo{ AppPoiCode: utils.Int2Str(storeDetail.ID),