|
|
@@ -124,6 +124,9 @@ func (r *QhjMgrCustomer) calc() {
|
|
|
r.CARDNUM = DecryptField(r.CARDNUM)
|
|
|
r.MOBILE = DecryptField(r.MOBILE)
|
|
|
r.EMAIL = DecryptField(r.EMAIL)
|
|
|
+ if r.LOGINCODE == "" {
|
|
|
+ r.LOGINCODE = r.MOBILE
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
func (r *QhjMgrCustomer) level() int32 {
|
|
|
@@ -408,10 +411,17 @@ type QhjTradeEx struct {
|
|
|
DECIMALPLACE int32 `json:"decimalplace" xorm:"DECIMALPLACE"` // 报价小数位
|
|
|
QTYDECIMALPLACE int32 `json:"qtydecimalplace" xorm:"QTYDECIMALPLACE"` // 成交量小数位
|
|
|
USERINFOTYPE int32 `json:"userinfotype" xorm:"'USERINFOTYPE'"` // 账户类型 1-个人 2-企业
|
|
|
+ MOBILE string `json:"-" xorm:"'MOBILE'"` // 手机号码
|
|
|
MARKETID int32 `json:"marketid" xorm:"'MARKETID'"` // 市场id
|
|
|
TRADEMODE int32 `json:"trademode" xorm:"'TRADEMODE'"` // 交易模式
|
|
|
}
|
|
|
|
|
|
+func (r *QhjTradeEx) dealConvert() {
|
|
|
+ if r.LOGINCODE == "" {
|
|
|
+ r.LOGINCODE = DecryptField(r.MOBILE)
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
// QhjMgrPositionRsp 持仓汇总
|
|
|
type QhjMgrPositionRsp struct {
|
|
|
QhjTradeEx `xorm:"extends"`
|
|
|
@@ -465,7 +475,7 @@ type QhjMgrTradePosition struct {
|
|
|
}
|
|
|
|
|
|
func (r *QhjMgrTradePosition) calc() {
|
|
|
-
|
|
|
+ r.dealConvert()
|
|
|
}
|
|
|
|
|
|
func (r *QhjMgrTradePosition) buildSql() string {
|
|
|
@@ -478,6 +488,7 @@ func (r *QhjMgrTradePosition) buildSql() string {
|
|
|
" k.logincode," +
|
|
|
" u.subarealevelpath," +
|
|
|
" ui.userinfotype," +
|
|
|
+ " ui.mobile," +
|
|
|
" g.goodsname," +
|
|
|
" g.goodscode," +
|
|
|
" g.goodunitid," +
|
|
|
@@ -609,7 +620,7 @@ type QhjMgrTradeDetail struct {
|
|
|
}
|
|
|
|
|
|
func (r *QhjMgrTradeDetail) calc() {
|
|
|
-
|
|
|
+ r.dealConvert()
|
|
|
}
|
|
|
|
|
|
func (r *QhjMgrTradeDetail) buildSql(bQueryHis bool) string {
|
|
|
@@ -622,6 +633,7 @@ func (r *QhjMgrTradeDetail) buildSql(bQueryHis bool) string {
|
|
|
" k.logincode," +
|
|
|
" u.subarealevelpath," +
|
|
|
" ui.userinfotype," +
|
|
|
+ " ui.mobile," +
|
|
|
" g.goodsname," +
|
|
|
" g.goodscode," +
|
|
|
" g.goodunitid," +
|
|
|
@@ -791,7 +803,7 @@ type QhjMgrTradeOrderDetail struct {
|
|
|
}
|
|
|
|
|
|
func (r *QhjMgrTradeOrderDetail) calc() {
|
|
|
-
|
|
|
+ r.dealConvert()
|
|
|
}
|
|
|
|
|
|
func (r *QhjMgrTradeOrderDetail) buildSql(bQueryHis bool) string {
|
|
|
@@ -804,6 +816,7 @@ func (r *QhjMgrTradeOrderDetail) buildSql(bQueryHis bool) string {
|
|
|
" k.logincode," +
|
|
|
" u.subarealevelpath," +
|
|
|
" ui.userinfotype," +
|
|
|
+ " ui.mobile," +
|
|
|
" g.goodsname," +
|
|
|
" g.goodscode," +
|
|
|
" g.goodunitid," +
|
|
|
@@ -920,6 +933,7 @@ type QhjMgrTradePayOrder struct {
|
|
|
func (r *QhjMgrTradePayOrder) calc() {
|
|
|
ZoomByDecimal(int(r.QTYDECIMALPLACE), &r.TRADEQTY)
|
|
|
r.TRADETIME = r.CREATETIME
|
|
|
+ r.dealConvert()
|
|
|
}
|
|
|
|
|
|
func (r *QhjMgrTradePayOrder) buildSql() string {
|
|
|
@@ -932,6 +946,7 @@ func (r *QhjMgrTradePayOrder) buildSql() string {
|
|
|
" k.logincode," +
|
|
|
" u.subarealevelpath," +
|
|
|
" ui.userinfotype," +
|
|
|
+ " ui.mobile," +
|
|
|
" g.goodsname," +
|
|
|
" g.goodscode," +
|
|
|
" g.goodunitid," +
|