aa

business/jxcallback/orderman/order.go

@@ -225,6 +225,8 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m
 			//如果取消订单则要把库存加回去
 			if order, err2 := c.LoadOrder(orderStatus.VendorOrderID, orderStatus.VendorID); err2 == nil {
 				ModifyOrderSkusStock(db, order, true)
+				//门店发单的订单，取消后要退回配送费
+				resetCreateWaybillFee(db, order)
 			}
 		}
 		if !isDuplicated {
@@ -405,6 +407,16 @@ func filterOrderInfo(order *model.GoodsOrder) {
 	order.ConsigneeAddress = strings.ReplaceAll(order.ConsigneeAddress, "·", "")
 }
 
+func resetCreateWaybillFee(db *dao.DaoDB, order *model.GoodsOrder) (err error) {
+	store, _ := dao.GetStoreDetail(db, jxutils.GetSaleStoreIDFromOrder(order), order.VendorID, order.VendorOrgCode)
+	if store != nil {
+		if expend, lastFee, err := partner.CurStoreAcctManager.GetStoreAcctExpendLastCreateWayBillFee(order.VendorOrderID); err == nil {
+			partner.CurStoreAcctManager.InsertStoreAcctIncomeAndUpdateStoreAcctBalance(jxcontext.AdminCtx, jxutils.GetSaleStoreIDFromOrder(order), lastFee, partner.StoreAcctTypeIncomeCancelReal, order.VendorOrderID, expend.ID)
+		}
+	}
+	return err
+}
+
 func checkPriceDefendOrderByStock(db *dao.DaoDB, storeID, skuID, stock, jxPrice int) (realStock int) {
 	var (
 		sumStock = 0