diff --git a/app/admin/models/game_card.go b/app/admin/models/game_card.go
index bdc9e31..307a66e 100644
--- a/app/admin/models/game_card.go
+++ b/app/admin/models/game_card.go
@@ -1650,8 +1650,16 @@ type ExportGoods struct {
 }
 
 func ExportGoodsStock(storeId uint32) string {
+	//var games []GameCard
+	//err := orm.Eloquent.Table("game_card").Order("id DESC").Find(&games).Error
+	//if err != nil {
+	//	logger.Error(err.Error())
+	//	return ""
+	//}
+
+	// 修改排序规则，按照商品名称的拼音字母进行排序
 	var games []GameCard
-	err := orm.Eloquent.Table("game_card").Order("id DESC").Find(&games).Error
+	err := orm.Eloquent.Table("game_card").Order("CONVERT(name USING gbk) COLLATE gbk_chinese_ci ASC").Find(&games).Error
 	if err != nil {
 		logger.Error(err.Error())
 		return ""
diff --git a/docs/docs.go b/docs/docs.go
index 7c8feda..bb522b7 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -7712,18 +7712,34 @@ const docTemplate = `{
                     "description": "调拨入库",
                     "type": "integer"
                 },
+                "allot_in_amount": {
+                    "description": "调拨入库金额",
+                    "type": "number"
+                },
                 "allot_out": {
                     "description": "调拨出库",
                     "type": "integer"
                 },
+                "allot_out_amount": {
+                    "description": "调拨出库金额",
+                    "type": "number"
+                },
                 "allot_wait_in": {
                     "description": "在途库存（入库）",
                     "type": "integer"
                 },
+                "allot_wait_in_amount": {
+                    "description": "在途库存（入库）金额",
+                    "type": "number"
+                },
                 "allot_wait_out": {
                     "description": "在途库存（出库）",
                     "type": "integer"
                 },
+                "allot_wait_out_amount": {
+                    "description": "在途库存（出库）金额",
+                    "type": "number"
+                },
                 "begin_amount": {
                     "description": "期初金额",
                     "type": "number"
@@ -7744,10 +7760,18 @@ const docTemplate = `{
                     "description": "盘点入库",
                     "type": "integer"
                 },
+                "check_in_amount": {
+                    "description": "盘点入库金额",
+                    "type": "number"
+                },
                 "check_out": {
                     "description": "盘点出库",
                     "type": "integer"
                 },
+                "check_out_amount": {
+                    "description": "盘点出库金额",
+                    "type": "number"
+                },
                 "commodity_id": {
                     "description": "商品id",
                     "type": "integer"
@@ -7772,29 +7796,57 @@ const docTemplate = `{
                     "description": "零售退货",
                     "type": "integer"
                 },
+                "order_reject_amount": {
+                    "description": "零售退货金额",
+                    "type": "number"
+                },
                 "order_sale": {
                     "description": "零售销售",
                     "type": "integer"
                 },
+                "order_sale_amount": {
+                    "description": "零售销售金额",
+                    "type": "number"
+                },
                 "product_in": {
                     "description": "产品入库",
                     "type": "integer"
                 },
+                "product_in_amount": {
+                    "description": "产品入库金额",
+                    "type": "number"
+                },
                 "purchase_return": {
                     "description": "采购退货",
                     "type": "integer"
                 },
+                "purchase_return_amount": {
+                    "description": "采购退货金额",
+                    "type": "number"
+                },
                 "purchase_stock": {
                     "description": "采购进货",
                     "type": "integer"
                 },
+                "purchase_stock_amount": {
+                    "description": "采购进货金额",
+                    "type": "number"
+                },
                 "system_in": {
                     "description": "系统入库",
                     "type": "integer"
                 },
+                "system_in_amount": {
+                    "description": "系统入库金额",
+                    "type": "number"
+                },
                 "system_out": {
                     "description": "系统出库",
                     "type": "integer"
+                },
+                "system_out_amount": {
+                    "description": "系统出库金额",
+                    "type": "number"
                 }
             }
         },
@@ -7805,10 +7857,18 @@ const docTemplate = `{
                     "description": "调拨入库",
                     "type": "integer"
                 },
+                "total_allot_in_amount": {
+                    "description": "调拨入库金额",
+                    "type": "number"
+                },
                 "total_allot_out": {
                     "description": "调拨出库",
                     "type": "integer"
                 },
+                "total_allot_out_amount": {
+                    "description": "调拨出库金额",
+                    "type": "number"
+                },
                 "total_allot_wait_in": {
                     "description": "在途库存（入库）",
                     "type": "integer"
@@ -7829,10 +7889,18 @@ const docTemplate = `{
                     "description": "盘点入库",
                     "type": "integer"
                 },
+                "total_check_in_amount": {
+                    "description": "盘点入库金额",
+                    "type": "number"
+                },
                 "total_check_out": {
                     "description": "盘点出库",
                     "type": "integer"
                 },
+                "total_check_out_amount": {
+                    "description": "盘点出库金额",
+                    "type": "number"
+                },
                 "total_end_amount": {
                     "description": "期末金额",
                     "type": "number"
@@ -7853,6 +7921,14 @@ const docTemplate = `{
                     "description": "产品入库",
                     "type": "integer"
                 },
+                "total_product_in_amount": {
+                    "description": "产品入库金额",
+                    "type": "number"
+                },
+                "total_purchase_amount": {
+                    "description": "采购进货金额",
+                    "type": "number"
+                },
                 "total_purchase_return": {
                     "description": "采购退货",
                     "type": "integer"
@@ -7861,13 +7937,41 @@ const docTemplate = `{
                     "description": "采购进货",
                     "type": "integer"
                 },
+                "total_reject_amount": {
+                    "description": "零售退货金额",
+                    "type": "number"
+                },
+                "total_return_amount": {
+                    "description": "采购退货金额",
+                    "type": "number"
+                },
+                "total_sale_amount": {
+                    "description": "零售销售金额",
+                    "type": "number"
+                },
                 "total_system_in": {
                     "description": "系统入库",
                     "type": "integer"
                 },
+                "total_system_in_amount": {
+                    "description": "系统入库金额",
+                    "type": "number"
+                },
                 "total_system_out": {
                     "description": "系统出库",
                     "type": "integer"
+                },
+                "total_system_out_amount": {
+                    "description": "系统出库金额",
+                    "type": "number"
+                },
+                "total_wait_in_amount": {
+                    "description": "在途库存（入库）金额",
+                    "type": "number"
+                },
+                "total_wait_out_amount": {
+                    "description": "在途库存（出库）金额",
+                    "type": "number"
                 }
             }
         },
@@ -16996,6 +17100,10 @@ const docTemplate = `{
                     "description": "标记",
                     "type": "integer"
                 },
+                "member_discount_flag": {
+                    "description": "会员优惠标志：0-不享受会员优惠，1-可享受会员优惠",
+                    "type": "integer"
+                },
                 "member_expire": {
                     "description": "会员到期时间",
                     "type": "string"
@@ -17169,6 +17277,10 @@ const docTemplate = `{
                     "description": "标记",
                     "type": "integer"
                 },
+                "member_discount_flag": {
+                    "description": "会员优惠标志：0-不享受会员优惠，1-可享受会员优惠",
+                    "type": "integer"
+                },
                 "member_expire": {
                     "description": "会员到期时间",
                     "type": "string"
diff --git a/docs/swagger.json b/docs/swagger.json
index 6285080..b1fddf7 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -7701,18 +7701,34 @@
                     "description": "调拨入库",
                     "type": "integer"
                 },
+                "allot_in_amount": {
+                    "description": "调拨入库金额",
+                    "type": "number"
+                },
                 "allot_out": {
                     "description": "调拨出库",
                     "type": "integer"
                 },
+                "allot_out_amount": {
+                    "description": "调拨出库金额",
+                    "type": "number"
+                },
                 "allot_wait_in": {
                     "description": "在途库存（入库）",
                     "type": "integer"
                 },
+                "allot_wait_in_amount": {
+                    "description": "在途库存（入库）金额",
+                    "type": "number"
+                },
                 "allot_wait_out": {
                     "description": "在途库存（出库）",
                     "type": "integer"
                 },
+                "allot_wait_out_amount": {
+                    "description": "在途库存（出库）金额",
+                    "type": "number"
+                },
                 "begin_amount": {
                     "description": "期初金额",
                     "type": "number"
@@ -7733,10 +7749,18 @@
                     "description": "盘点入库",
                     "type": "integer"
                 },
+                "check_in_amount": {
+                    "description": "盘点入库金额",
+                    "type": "number"
+                },
                 "check_out": {
                     "description": "盘点出库",
                     "type": "integer"
                 },
+                "check_out_amount": {
+                    "description": "盘点出库金额",
+                    "type": "number"
+                },
                 "commodity_id": {
                     "description": "商品id",
                     "type": "integer"
@@ -7761,29 +7785,57 @@
                     "description": "零售退货",
                     "type": "integer"
                 },
+                "order_reject_amount": {
+                    "description": "零售退货金额",
+                    "type": "number"
+                },
                 "order_sale": {
                     "description": "零售销售",
                     "type": "integer"
                 },
+                "order_sale_amount": {
+                    "description": "零售销售金额",
+                    "type": "number"
+                },
                 "product_in": {
                     "description": "产品入库",
                     "type": "integer"
                 },
+                "product_in_amount": {
+                    "description": "产品入库金额",
+                    "type": "number"
+                },
                 "purchase_return": {
                     "description": "采购退货",
                     "type": "integer"
                 },
+                "purchase_return_amount": {
+                    "description": "采购退货金额",
+                    "type": "number"
+                },
                 "purchase_stock": {
                     "description": "采购进货",
                     "type": "integer"
                 },
+                "purchase_stock_amount": {
+                    "description": "采购进货金额",
+                    "type": "number"
+                },
                 "system_in": {
                     "description": "系统入库",
                     "type": "integer"
                 },
+                "system_in_amount": {
+                    "description": "系统入库金额",
+                    "type": "number"
+                },
                 "system_out": {
                     "description": "系统出库",
                     "type": "integer"
+                },
+                "system_out_amount": {
+                    "description": "系统出库金额",
+                    "type": "number"
                 }
             }
         },
@@ -7794,10 +7846,18 @@
                     "description": "调拨入库",
                     "type": "integer"
                 },
+                "total_allot_in_amount": {
+                    "description": "调拨入库金额",
+                    "type": "number"
+                },
                 "total_allot_out": {
                     "description": "调拨出库",
                     "type": "integer"
                 },
+                "total_allot_out_amount": {
+                    "description": "调拨出库金额",
+                    "type": "number"
+                },
                 "total_allot_wait_in": {
                     "description": "在途库存（入库）",
                     "type": "integer"
@@ -7818,10 +7878,18 @@
                     "description": "盘点入库",
                     "type": "integer"
                 },
+                "total_check_in_amount": {
+                    "description": "盘点入库金额",
+                    "type": "number"
+                },
                 "total_check_out": {
                     "description": "盘点出库",
                     "type": "integer"
                 },
+                "total_check_out_amount": {
+                    "description": "盘点出库金额",
+                    "type": "number"
+                },
                 "total_end_amount": {
                     "description": "期末金额",
                     "type": "number"
@@ -7842,6 +7910,14 @@
                     "description": "产品入库",
                     "type": "integer"
                 },
+                "total_product_in_amount": {
+                    "description": "产品入库金额",
+                    "type": "number"
+                },
+                "total_purchase_amount": {
+                    "description": "采购进货金额",
+                    "type": "number"
+                },
                 "total_purchase_return": {
                     "description": "采购退货",
                     "type": "integer"
@@ -7850,13 +7926,41 @@
                     "description": "采购进货",
                     "type": "integer"
                 },
+                "total_reject_amount": {
+                    "description": "零售退货金额",
+                    "type": "number"
+                },
+                "total_return_amount": {
+                    "description": "采购退货金额",
+                    "type": "number"
+                },
+                "total_sale_amount": {
+                    "description": "零售销售金额",
+                    "type": "number"
+                },
                 "total_system_in": {
                     "description": "系统入库",
                     "type": "integer"
                 },
+                "total_system_in_amount": {
+                    "description": "系统入库金额",
+                    "type": "number"
+                },
                 "total_system_out": {
                     "description": "系统出库",
                     "type": "integer"
+                },
+                "total_system_out_amount": {
+                    "description": "系统出库金额",
+                    "type": "number"
+                },
+                "total_wait_in_amount": {
+                    "description": "在途库存（入库）金额",
+                    "type": "number"
+                },
+                "total_wait_out_amount": {
+                    "description": "在途库存（出库）金额",
+                    "type": "number"
                 }
             }
         },
@@ -16985,6 +17089,10 @@
                     "description": "标记",
                     "type": "integer"
                 },
+                "member_discount_flag": {
+                    "description": "会员优惠标志：0-不享受会员优惠，1-可享受会员优惠",
+                    "type": "integer"
+                },
                 "member_expire": {
                     "description": "会员到期时间",
                     "type": "string"
@@ -17158,6 +17266,10 @@
                     "description": "标记",
                     "type": "integer"
                 },
+                "member_discount_flag": {
+                    "description": "会员优惠标志：0-不享受会员优惠，1-可享受会员优惠",
+                    "type": "integer"
+                },
                 "member_expire": {
                     "description": "会员到期时间",
                     "type": "string"
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index a4d2929..646c0a2 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -1039,15 +1039,27 @@ definitions:
       allot_in:
         description: 调拨入库
         type: integer
+      allot_in_amount:
+        description: 调拨入库金额
+        type: number
       allot_out:
         description: 调拨出库
         type: integer
+      allot_out_amount:
+        description: 调拨出库金额
+        type: number
       allot_wait_in:
         description: 在途库存（入库）
         type: integer
+      allot_wait_in_amount:
+        description: 在途库存（入库）金额
+        type: number
       allot_wait_out:
         description: 在途库存（出库）
         type: integer
+      allot_wait_out_amount:
+        description: 在途库存（出库）金额
+        type: number
       begin_amount:
         description: 期初金额
         type: number
@@ -1063,9 +1075,15 @@ definitions:
       check_in:
         description: 盘点入库
         type: integer
+      check_in_amount:
+        description: 盘点入库金额
+        type: number
       check_out:
         description: 盘点出库
         type: integer
+      check_out_amount:
+        description: 盘点出库金额
+        type: number
       commodity_id:
         description: 商品id
         type: integer
@@ -1084,33 +1102,60 @@ definitions:
       order_reject:
         description: 零售退货
         type: integer
+      order_reject_amount:
+        description: 零售退货金额
+        type: number
       order_sale:
         description: 零售销售
         type: integer
+      order_sale_amount:
+        description: 零售销售金额
+        type: number
       product_in:
         description: 产品入库
         type: integer
+      product_in_amount:
+        description: 产品入库金额
+        type: number
       purchase_return:
         description: 采购退货
         type: integer
+      purchase_return_amount:
+        description: 采购退货金额
+        type: number
       purchase_stock:
         description: 采购进货
         type: integer
+      purchase_stock_amount:
+        description: 采购进货金额
+        type: number
       system_in:
         description: 系统入库
         type: integer
+      system_in_amount:
+        description: 系统入库金额
+        type: number
       system_out:
         description: 系统出库
         type: integer
+      system_out_amount:
+        description: 系统出库金额
+        type: number
     type: object
   models.DecisionSumData:
     properties:
       total_allot_in:
         description: 调拨入库
         type: integer
+      total_allot_in_amount:
+        description: 调拨入库金额
+        type: number
       total_allot_out:
         description: 调拨出库
         type: integer
+      total_allot_out_amount:
+        description: 调拨出库金额
+        type: number
       total_allot_wait_in:
         description: 在途库存（入库）
         type: integer
@@ -1126,9 +1171,15 @@ definitions:
       total_check_in:
         description: 盘点入库
         type: integer
+      total_check_in_amount:
+        description: 盘点入库金额
+        type: number
       total_check_out:
         description: 盘点出库
         type: integer
+      total_check_out_amount:
+        description: 盘点出库金额
+        type: number
       total_end_amount:
         description: 期末金额
         type: number
@@ -1144,18 +1195,45 @@ definitions:
       total_product_in:
         description: 产品入库
         type: integer
+      total_product_in_amount:
+        description: 产品入库金额
+        type: number
+      total_purchase_amount:
+        description: 采购进货金额
+        type: number
       total_purchase_return:
         description: 采购退货
         type: integer
       total_purchase_stock:
         description: 采购进货
         type: integer
+      total_reject_amount:
+        description: 零售退货金额
+        type: number
+      total_return_amount:
+        description: 采购退货金额
+        type: number
+      total_sale_amount:
+        description: 零售销售金额
+        type: number
       total_system_in:
         description: 系统入库
         type: integer
+      total_system_in_amount:
+        description: 系统入库金额
+        type: number
       total_system_out:
         description: 系统出库
         type: integer
+      total_system_out_amount:
+        description: 系统出库金额
+        type: number
+      total_wait_in_amount:
+        description: 在途库存（入库）金额
+        type: number
+      total_wait_out_amount:
+        description: 在途库存（出库）金额
+        type: number
     type: object
   models.DefaultUserNameAndPasswordResp:
     properties:
@@ -7763,6 +7841,9 @@ definitions:
       mark:
         description: 标记
         type: integer
+      member_discount_flag:
+        description: 会员优惠标志：0-不享受会员优惠，1-可享受会员优惠
+        type: integer
       member_expire:
         description: 会员到期时间
         type: string
@@ -7890,6 +7971,9 @@ definitions:
       mark:
         description: 标记
         type: integer
+      member_discount_flag:
+        description: 会员优惠标志：0-不享受会员优惠，1-可享受会员优惠
+        type: integer
       member_expire:
         description: 会员到期时间
         type: string