minghui/mh_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、卡带发货/归还，增加记录店员识别码。

Browse Source
This commit is contained in:
chenlin 2025-02-14 10:23:00 +08:00
parent 911f580bf6
commit 84fe0da18b
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
model/order.go
View File

@ -99,6 +99,8 @@ type OrderCard struct {
IssueType uint32 `json:"issue_type"` // 问题类型: 1-问题反馈 2-正常 IssueType uint32 `json:"issue_type"` // 问题类型: 1-问题反馈 2-正常
CooperativeBusinessId uint32 `json:"cooperative_business_id" gorm:"index"` // 合作商id CooperativeBusinessId uint32 `json:"cooperative_business_id" gorm:"index"` // 合作商id
CooperativeName string `json:"cooperative_name"` // 合作商名称 CooperativeName string `json:"cooperative_name"` // 合作商名称
DeliverShopperCode string `json:"deliver_shopper_code"` // 发货店员码
RevertShopperCode string `json:"revert_shopper_code"` // 收货识别码
Postage uint32 `json:"postage" gorm:"-"` // 邮费 Postage uint32 `json:"postage" gorm:"-"` // 邮费
PostageType uint32 `json:"postage_type"` // 邮费类型 PostageType uint32 `json:"postage_type"` // 邮费类型
@ -1120,6 +1122,12 @@ func (m *CooperativeRentCardOrderDeliverReq) Deliver() (error, string) {
return errors.New("order not pay"), "订单未支付" return errors.New("order not pay"), "订单未支付"
} }
var shopperPromotionCode ShopperPromotionCode
err = NewShopperPromotionCodeQuerySet(DB).UidEq(m.OperationUid).One(&shopperPromotionCode)
if err != nil {
logger.Error("shopper promotion code err:", err)
}
orderCard := GetOrderCardMapSerialNumberUnset(orderCardMaps, uint32(gameCardGoods.GameCardId)) orderCard := GetOrderCardMapSerialNumberUnset(orderCardMaps, uint32(gameCardGoods.GameCardId))
if orderCard == nil { if orderCard == nil {
begin.Rollback() begin.Rollback()
@ -1208,12 +1216,13 @@ func (m *CooperativeRentCardOrderDeliverReq) Deliver() (error, string) {
}) })
eg.Go(func() error { eg.Go(func() error {
err = begin.Table("order_card").Where("id=?", orderCard.ID).Updates(map[string]interface{}{ err = begin.Table("order_card").Where("id=?", orderCard.ID).Updates(map[string]interface{}{
"store_id": m.StoreId, "store_id": m.StoreId,
"delivery_time": time.Now(), "delivery_time": time.Now(),
"game_card_goods_id": gameCardGoods.ID, "game_card_goods_id": gameCardGoods.ID,
"serial_number": gameCardGoods.SerialNumber, "serial_number": gameCardGoods.SerialNumber,
"card_status": 2, "card_status": 2,
"receipt_time": receiptTime, "receipt_time": receiptTime,
"deliver_shopper_code": shopperPromotionCode.Code,
}).Error }).Error
if err != nil { if err != nil {
begin.Rollback() begin.Rollback()
@ -1340,6 +1349,12 @@ func (m *CooperativeRentCardOrderRevertReq) Revert() error {
return errors.New("order store id not game card goods store id") return errors.New("order store id not game card goods store id")
} }
var shopperPromotionCode ShopperPromotionCode
err = NewShopperPromotionCodeQuerySet(DB).UidEq(m.OperationUid).One(&shopperPromotionCode)
if err != nil {
logger.Error("shopper promotion code err:", err)
}
begin := DB.Begin() begin := DB.Begin()
var eg errgroup.Group var eg errgroup.Group
eg.Go(func() error { eg.Go(func() error {
@ -1451,9 +1466,10 @@ func (m *CooperativeRentCardOrderRevertReq) Revert() error {
}) })
eg.Go(func() error { eg.Go(func() error {
err := begin.Table("order_card").Where("id=?", orderCard.ID).Updates(map[string]interface{}{ err := begin.Table("order_card").Where("id=?", orderCard.ID).Updates(map[string]interface{}{
"card_status": OrderCardStatusCompleted, "card_status": OrderCardStatusCompleted,
"revert_store_id": m.RevertStoreId, "revert_store_id": m.RevertStoreId,
"revert_time": time.Now(), "revert_time": time.Now(),
"revert_shopper_code": shopperPromotionCode.Code,
}).Error }).Error
if err != nil { if err != nil {
begin.Rollback() begin.Rollback()