From bc5a7065b3393d6dd99411b54e91f90e3a4636ce Mon Sep 17 00:00:00 2001
From: chenlin <chenlin@deovo.net>
Date: Fri, 5 Jul 2024 15:39:36 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=9B=B6=E5=94=AE=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E5=AF=BC=E5=87=BAexcel=E6=B1=87=E6=80=BB=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E5=87=86=E7=A1=AE=E7=9A=84=E7=BC=BA=E9=99=B7?=
 =?UTF-8?q?=EF=BC=9B=202.=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=97=B6=E5=91=98=E5=B7=A5=E6=88=90=E6=9C=AC=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=EF=BC=8C=E5=8F=AF=E4=BB=A5=3D0=EF=BC=9B=203.?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=90=8D=E7=A7=B0=E6=90=9C=E7=B4=A2=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=BA=93=E5=AD=98=E6=98=8E=E7=BB=86=E6=97=B6=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=94=AF=E4=BB=98=E6=95=B0=E6=8D=AE=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=BA0=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/models/erp_order.go | 22 ++++++++++++++--------
 app/admin/models/file.go      | 10 +++++-----
 app/admin/models/game_card.go |  1 +
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/app/admin/models/erp_order.go b/app/admin/models/erp_order.go
index 59d9d0b..663a73b 100644
--- a/app/admin/models/erp_order.go
+++ b/app/admin/models/erp_order.go
@@ -3040,7 +3040,7 @@ func retailDetailExport(list []ErpOrder, sumData RetailDetailTotalData) (string,
 			return "", errors.New("RetailMarginDataExport, 订单类型异常:" + list[i].RetailType)
 		}
 
-		commodityIdMap := make(map[uint32]bool)
+		orderFlag := false
 		// 先判断商品数量，确定要写几行数据
 		for rowId := 0; rowId < len(list[i].Commodities); rowId++ {
 			if list[i].RetailType == RetailTypeSale {
@@ -3083,8 +3083,8 @@ func retailDetailExport(list []ErpOrder, sumData RetailDetailTotalData) (string,
 			}
 
 			// 单个订单的汇总数据只记录一次
-			if !commodityIdMap[list[i].Commodities[rowId].ErpCommodityId] {
-				commodityIdMap[list[i].Commodities[rowId].ErpCommodityId] = true
+			if !orderFlag {
+				orderFlag = true
 				salesMan := ""
 				nSalesProfitPer := 0.0
 				nStaffProfitPer := 0.0
@@ -3562,11 +3562,17 @@ func queryRetailDetailByJoin(req *ErpOrderRetailDetailReq, c *gin.Context) (*Erp
 	sumData.TotalAmount = 0      // 订单实收金额
 	sumData.StorePer = 0         // 门店提成
 
-	sumData.ScanAmount = cashier.ScanAmount
-	sumData.CashAmount = cashier.CashAmount
-	sumData.PosAmount = cashier.PosAmount
-	sumData.StoreVmAmount = cashier.StoreVmAmount
-	sumData.OtherAmount = cashier.OtherAmount
+	//sumData.ScanAmount = cashier.ScanAmount
+	//sumData.CashAmount = cashier.CashAmount
+	//sumData.PosAmount = cashier.PosAmount
+	//sumData.StoreVmAmount = cashier.StoreVmAmount
+	//sumData.OtherAmount = cashier.OtherAmount
+
+	sumData.ScanAmount = 0
+	sumData.CashAmount = 0
+	sumData.PosAmount = 0
+	sumData.StoreVmAmount = 0
+	sumData.OtherAmount = 0
 
 	var result []RetailDetailByJoin
 
diff --git a/app/admin/models/file.go b/app/admin/models/file.go
index 10a8c2e..953775c 100644
--- a/app/admin/models/file.go
+++ b/app/admin/models/file.go
@@ -531,11 +531,11 @@ func checkStockExcel(sheetCols [][]string) error {
 		//	}
 		//}
 
-		if i < len(sheetCols[5]) {
-			if employeeCost, err := strconv.ParseFloat(sheetCols[5][i], 64); err != nil || employeeCost <= 0 {
-				return errors.New("第" + strconv.Itoa(i+1) + "行员工成本价必须是大于0的数字")
-			}
-		}
+		//if i < len(sheetCols[5]) {
+		//	if employeeCost, err := strconv.ParseFloat(sheetCols[5][i], 64); err != nil || employeeCost <= 0 {
+		//		return errors.New("第" + strconv.Itoa(i+1) + "行员工成本价必须是大于0的数字")
+		//	}
+		//}
 
 		// 供应商不能为空
 		if i < len(sheetCols[6]) {
diff --git a/app/admin/models/game_card.go b/app/admin/models/game_card.go
index f99433b..b6f5ce3 100644
--- a/app/admin/models/game_card.go
+++ b/app/admin/models/game_card.go
@@ -1534,6 +1534,7 @@ func MemberExpirationReminderDay(days int64) {
 	}
 }
 
+// ExpireMemberSMSSend 用户过期如果一直不还卡，最多会收到12条短信，过期超过3个月就不会发送了
 func ExpireMemberSMSSend() {
 	nowTime := time.Now()
 	days := []uint32{1, 2, 3, 4, 5, 6, 7, 14, 21, 28, 60, 90}