|
|
@@ -11,6 +11,7 @@ import (
|
|
|
"mtp2_if/db"
|
|
|
"mtp2_if/mtpcache"
|
|
|
"mtp2_if/utils"
|
|
|
+ "strconv"
|
|
|
)
|
|
|
|
|
|
// 大连千海金
|
|
|
@@ -427,7 +428,8 @@ type QhjTradeGoodsPickup struct {
|
|
|
TAKEREMARK string `json:"takeremark" xorm:"TAKEREMARK"` // 提货备注
|
|
|
TAKEORDERSTATUS int32 `json:"takeorderstatus" xorm:"TAKEORDERSTATUS"` // 提货状态 - 1:备货中 2:待取货(自提) 3:已取货(自提) 4:待收货(邮寄) 5:已收货(邮寄) 6:自动收货(邮寄) 7:已拒绝 8:已撤销
|
|
|
AUDITER int32 `json:"auditer" xorm:"AUDITER"` // 审核人
|
|
|
- AUDITTIME string `json:"audittime" xorm:"AUDITTIME"` // 审核时间(发货时间)
|
|
|
+ AUDITTIME string `json:"audittime" xorm:"AUDITTIME"` // 审核时间(发货时间 | 备货完成时间 都是这个字段)
|
|
|
+ CONFIRMTIME string `json:"confirmtime" xorm:"'CONFIRMTIME'"` // 取货时间 或 收货时间
|
|
|
CHECKREMARK string `json:"checkremark" xorm:"CHECKREMARK"` // 审核备注
|
|
|
TRADEDATE string `json:"tradedate" xorm:"TRADEDATE"` // 交易日(yyyyMMdd)
|
|
|
MARKETID int32 `json:"marketid" xorm:"MARKETID"` // 市场ID
|
|
|
@@ -487,20 +489,21 @@ func (r *QhjTradeGoodsPickup) buildSql() string {
|
|
|
" t.CARDNUM," +
|
|
|
" t.PHONENUM," +
|
|
|
" t.TAKEMODE," +
|
|
|
- " t.ADDRESS," +
|
|
|
+ " decode(t.takemode, 3, t.address, u.address) address," +
|
|
|
" t.TAKEREMARK," +
|
|
|
" t.TAKEORDERSTATUS," +
|
|
|
" t.AUDITER," +
|
|
|
" to_char(t.AUDITTIME, 'yyyy-mm-dd hh24:mi:ss') AUDITTIME," +
|
|
|
+ " to_char(t.CONFIRMTIME, 'yyyy-mm-dd hh24:mi:ss') CONFIRMTIME," +
|
|
|
" t.CHECKREMARK," +
|
|
|
" t.TRADEDATE," +
|
|
|
" t.MARKETID," +
|
|
|
" t.HANDLESTATUS," +
|
|
|
" t.AMOUNT," +
|
|
|
- " t.COUNTRYID," +
|
|
|
- " t.PROVINCEID," +
|
|
|
- " t.CITYID," +
|
|
|
- " t.DISTRICTID," +
|
|
|
+ " decode(t.takemode, 3, t.COUNTRYID, u.countryid) COUNTRYID," +
|
|
|
+ " decode(t.takemode, 3, t.PROVINCEID, u.provinceid) PROVINCEID," +
|
|
|
+ " decode(t.takemode, 3, t.CITYID, u.cityid) CITYID," +
|
|
|
+ " decode(t.takemode, 3, t.DISTRICTID, u.districtid) DISTRICTID," +
|
|
|
" k.PICKUPGOODSID," +
|
|
|
" k.GOODSAGREEUNIT," +
|
|
|
" k.PICKUPGOODSAGREEUNIT," +
|
|
|
@@ -517,7 +520,10 @@ func (r *QhjTradeGoodsPickup) buildSql() string {
|
|
|
" on t.takeorderid = k.takeorderid" +
|
|
|
" LEFT JOIN PICKUPGOODS g" +
|
|
|
" on k.pickupgoodsid = g.pickupgoodsid" +
|
|
|
- " LEFT JOIN GOODS g2 on t.goodsid=g2.goodsid" +
|
|
|
+ " LEFT JOIN GOODS g2" +
|
|
|
+ " on t.goodsid = g2.goodsid" +
|
|
|
+ " LEFT JOIN USERINFO u" +
|
|
|
+ " on t.storeuserid = u.userid" +
|
|
|
" WHERE 1 = 1"
|
|
|
sqlId.And("t.USERID", r.USERID)
|
|
|
return sqlId.String()
|
|
|
@@ -617,6 +623,7 @@ type QhjPickArea struct {
|
|
|
PROVINCEID int32 `json:"provinceid" xorm:"PROVINCEID"` // 省
|
|
|
CITYID int32 `json:"cityid" xorm:"CITYID"` // 市
|
|
|
DISTRICTID int32 `json:"districtid" xorm:"DISTRICTID"` // 地区
|
|
|
+ ADDRESS string `json:"address" xorm:"'ADDRESS'"` // 详细地址
|
|
|
|
|
|
USERNAME string `json:"username"` // 机构用户名称(门店门称)
|
|
|
FROMUSERNAME string `json:"fromusername"` // 所属机构名称
|
|
|
@@ -709,7 +716,11 @@ type QhjBankAccountSign struct {
|
|
|
}
|
|
|
|
|
|
func (r *QhjBankAccountSign) calc() {
|
|
|
-
|
|
|
+ r.ACCOUNTNAME = DecryptField(r.ACCOUNTNAME)
|
|
|
+ r.BANKACCOUNTNAME = DecryptField(r.BANKACCOUNTNAME)
|
|
|
+ r.CARDNO = DecryptField(r.CARDNO)
|
|
|
+ r.BANKACCOUNTNO = DecryptField(r.BANKACCOUNTNO)
|
|
|
+ r.MOBILEPHONE = DecryptField(r.MOBILEPHONE)
|
|
|
}
|
|
|
|
|
|
func (r *QhjBankAccountSign) buildSql() string {
|
|
|
@@ -1370,6 +1381,21 @@ func (r *QhjAccountOutInApply) GetDataEx() (interface{}, error) {
|
|
|
return sData, err
|
|
|
}
|
|
|
|
|
|
+type DBINT64 int64
|
|
|
+
|
|
|
+func (r *DBINT64) FromDB(bytes []byte) error {
|
|
|
+ d, err := strconv.ParseInt(string(bytes), 10, 64)
|
|
|
+ if err == nil {
|
|
|
+ *r = DBINT64(d)
|
|
|
+ }
|
|
|
+ return err
|
|
|
+}
|
|
|
+
|
|
|
+func (r *DBINT64) ToDB() ([]byte, error) {
|
|
|
+ d := strconv.FormatInt(int64(*r), 10)
|
|
|
+ return []byte(d), nil
|
|
|
+}
|
|
|
+
|
|
|
// QhjPayOrder 待付款单据
|
|
|
type QhjPayOrder struct {
|
|
|
OPERATETYPE int32 `json:"operatetype" xorm:"OPERATETYPE"` // 买委托操作类型 - 1:正常下单 16:融资买入
|
zou.yingbin