按需求增加出参

docs/docs.go

@@ -32351,6 +32351,10 @@ const docTemplate = `{
                 "zscurrencytypedisplay": {
                     "type": "string"
                 },
+                "zscurrencytypedisplayunit": {
+                    "description": "价格单位",
+                    "type": "string"
+                },
                 "zscuttypedisplay": {
                     "type": "string"
                 },
@@ -32558,6 +32562,10 @@ const docTemplate = `{
                     "description": "买方已冻/已扣金额",
                     "type": "number"
                 },
+                "buytodayamount": {
+                    "description": "买方今日扣/冻金额 (待开市时清零)",
+                    "type": "number"
+                },
                 "curstepid": {
                     "description": "当前步骤ID",
                     "type": "string"
@@ -32614,6 +32622,10 @@ const docTemplate = `{
                     "description": "卖方已收金额",
                     "type": "number"
                 },
+                "selltodayamount": {
+                    "description": "卖方今日收取金额(待开市时清零)",
+                    "type": "number"
+                },
                 "sizedisplay": {
                     "description": "尺寸",
                     "type": "string"
@@ -37871,6 +37883,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "settingmaterial": {
+                    "description": "镶嵌材料",
                     "type": "string"
                 },
                 "size1": {
@@ -37887,6 +37900,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "stonedesc": {
+                    "description": "配石描述",
                     "type": "string"
                 },
                 "totalqty": {

docs/swagger.json

@@ -32342,6 +32342,10 @@
                 "zscurrencytypedisplay": {
                     "type": "string"
                 },
+                "zscurrencytypedisplayunit": {
+                    "description": "价格单位",
+                    "type": "string"
+                },
                 "zscuttypedisplay": {
                     "type": "string"
                 },
@@ -32549,6 +32553,10 @@
                     "description": "买方已冻/已扣金额",
                     "type": "number"
                 },
+                "buytodayamount": {
+                    "description": "买方今日扣/冻金额 (待开市时清零)",
+                    "type": "number"
+                },
                 "curstepid": {
                     "description": "当前步骤ID",
                     "type": "string"
@@ -32605,6 +32613,10 @@
                     "description": "卖方已收金额",
                     "type": "number"
                 },
+                "selltodayamount": {
+                    "description": "卖方今日收取金额(待开市时清零)",
+                    "type": "number"
+                },
                 "sizedisplay": {
                     "description": "尺寸",
                     "type": "string"
@@ -37862,6 +37874,7 @@
                     "type": "string"
                 },
                 "settingmaterial": {
+                    "description": "镶嵌材料",
                     "type": "string"
                 },
                 "size1": {
@@ -37878,6 +37891,7 @@
                     "type": "string"
                 },
                 "stonedesc": {
+                    "description": "配石描述",
                     "type": "string"
                 },
                 "totalqty": {

docs/swagger.yaml

@@ -11752,6 +11752,9 @@ definitions:
         type: string
       zscurrencytypedisplay:
         type: string
+      zscurrencytypedisplayunit:
+        description: 价格单位
+        type: string
       zscuttypedisplay:
         type: string
       zsczcolor1typedisplay:
@@ -11900,6 +11903,9 @@ definitions:
       buypaidamount:
         description: 买方已冻/已扣金额
         type: number
+      buytodayamount:
+        description: 买方今日扣/冻金额 (待开市时清零)
+        type: number
       curstepid:
         description: 当前步骤ID
         type: string
@@ -11944,6 +11950,9 @@ definitions:
       sellreceivedamount:
         description: 卖方已收金额
         type: number
+      selltodayamount:
+        description: 卖方今日收取金额(待开市时清零)
+        type: number
       sizedisplay:
         description: 尺寸
         type: string
@@ -15840,6 +15849,7 @@ definitions:
         description: 卖方(查询字段-模糊查询)
         type: string
       settingmaterial:
+        description: 镶嵌材料
         type: string
       size1:
         type: string
@@ -15851,6 +15861,7 @@ definitions:
         description: 尺寸
         type: string
       stonedesc:
+        description: 配石描述
         type: string
       totalqty:
         description: 总重量

models/guangzuan.go

@@ -391,8 +391,8 @@ type SellOrder struct {
 	CPCERTNO                   string  `json:"cpcertno" xorm:"CPCERTNO"`                                     //
 	KPWEIGHT                   string  `json:"kpweight" xorm:"KPWEIGHT"`                                     //
 	KPPATH                     string  `json:"kppath" xorm:"KPPATH"`                                         //
-	STONEDESC                  string  `json:"stonedesc" xorm:"STONEDESC"`                                   //
-	SETTINGMATERIAL            string  `json:"settingmaterial" xorm:"SETTINGMATERIAL"`                       //
+	STONEDESC                  string  `json:"stonedesc" xorm:"STONEDESC"`                                   // 配石描述
+	SETTINGMATERIAL            string  `json:"settingmaterial" xorm:"SETTINGMATERIAL"`                       // 镶嵌材料
 	PRICE                      float64 `json:"price" xorm:"PRICE"`                                           // 价格
 	SIZEDISPLAY                string  `json:"sizedisplay" xorm:"SIZEDISPLAY"`                               // 尺寸
 
@@ -1654,9 +1654,10 @@ type MyDelistingApply struct {
 	WAREHOUSEINFOSDISPLAY     string `json:"warehouseinfosdisplay" xorm:"WAREHOUSEINFOSDISPLAY"`         //
 	SIZEDISPLAY               string `json:"sizedisplay" xorm:"SIZEDISPLAY"`                             // 尺寸
 
-	GOODSNO string  `json:"goodsno" xorm:"GOODSNO"` // 商品编号
-	PRICE   float64 `json:"price" xorm:"PRICE"`     // 价格
-	WEIGHT  float64 `json:"weight" xorm:"WEIGHT"`   // 克拉重量
+	GOODSNO                   string  `json:"goodsno" xorm:"GOODSNO"`                                     // 商品编号
+	PRICE                     float64 `json:"price" xorm:"PRICE"`                                         // 价格
+	WEIGHT                    float64 `json:"weight" xorm:"WEIGHT"`                                       // 克拉重量
+	ZSCURRENCYTYPEDISPLAYUNIT string  `json:"zscurrencytypedisplayunit" xorm:"ZSCURRENCYTYPEDISPLAYUNIT"` // 价格单位
 
 	SELLDELISTINGAPPLYID string    `json:"selldelistingapplyid" xorm:"SELLDELISTINGAPPLYID1"`                    // [询价单号]卖摘牌申请ID(916+Unix秒时间戳(10位)+xxxxxx)
 	BUYWRTRADEORDERID    string    `json:"buywrtradeorderid" xorm:"BUYWRTRADEORDERID1" form:"buywrtradeorderid"` // 买委托单ID
@@ -1695,6 +1696,7 @@ func (r *MyDelistingApply) buildSql() string {
 		q.GOODSNO,
 		q.PRICE,
 		q.WEIGHT,
+		q.ZSCURRENCYTYPEDISPLAYUNIT,
 		p.ZSALLPROPERTIES          ,
 		p.ZSTABLEDISPLAY           ,
 		p.BUYUSERNAME              ,
@@ -1918,6 +1920,8 @@ type MyPerformanc struct {
 	BUYERINFO                string  `json:"buyerinfo" xorm:"BUYERINFO"`                               // 买方联系信息 - 存JSON字符串, 根据枚举‘BuyerContactInfo'，显示\隐藏字段，若数据不为JSON，则直接显示{    "ContactInfo": "xxxxxxxx",    "ReceiveInfo": "xxxxxxxxx",    "ReceiptInfo": "xxxxxxxxxxxx"}
 	SELLERINFO               string  `json:"sellerinfo" xorm:"SELLERINFO"`                             // 卖方联系信息 - 存JSON字符串, 根据枚举‘SellerContactInfo'，显示\隐藏字段，若数据不为JSON，则直接显示{    "ContactInfo": "xxxxxxxx"}
 	BUYACCOUNTID             int64   `json:"buyaccountid" xorm:"BUYACCOUNTID"`                         // 买方账号
+	BUYTODAYAMOUNT           float64 `json:"buytodayamount" xorm:"BUYTODAYAMOUNT"`                     // 买方今日扣/冻金额 (待开市时清零)
+	SELLTODAYAMOUNT          float64 `json:"selltodayamount" xorm:"SELLTODAYAMOUNT"`                   // 卖方今日收取金额(待开市时清零)
 
 	STEPTYPEID int32 `json:"steptypeid" xorm:"STEPTYPEID"` // 履约步骤类型ID - 1:买方支付 2:卖方收款 3:买方自提 4:卖方发货 5:买方确认货 6:卖方发票 7:买方确认票 8:仓单转移 9:释放卖方冻结  10:货款溢短 11:生成合同[中江] 12:运费 90:确认支付 91. 确认放行 92买方支付(直接扣款)   用于-1模板“
 	REMAINDAYS int32 `json:"remaindays" xorm:"REMAINDAYS"` // 剩余天数
@@ -1969,6 +1973,8 @@ func (r *MyPerformanc) calc() {
 func (r *MyPerformanc) buildSql() string {
 	var sqlId utils.SQLVal = `
 	SELECT
+		pp.BUYTODAYAMOUNT,
+		pp.SELLTODAYAMOUNT,
 		to_char(pp.PERFORMANCEPLANID) PERFORMANCEPLANID1,
 		to_char(pp.RELATEDORDERID) RELATEDORDERID1          ,
 		pp.AMOUNT                  ,
@@ -2042,6 +2048,8 @@ func (r *MyPerformanc) buildSql() string {
 func (r *MyPerformanc) buildSql_His() string {
 	var sqlId utils.SQLVal = `
 	SELECT
+		pp.BUYTODAYAMOUNT,
+		pp.SELLTODAYAMOUNT,
 		to_char(pp.PERFORMANCEPLANID) PERFORMANCEPLANID1,
 		pp.RELATEDORDERID          ,
 		pp.AMOUNT                  ,