Merge branch 'develop' of k.zhang/duoduo into master

apis/shanghu/client.trans.go

@@ -166,6 +166,12 @@ func GetMerchantPayTransList(c *gin.Context) {
 		data.MerchantAmount = data.TotalAmount.Sub(data.SaleAmount)
 		data.MerchantCardID = payInfo[i].MerchantCardID
 		data.PayTime = payInfo[i].PayTime.Format(time.DateTime)
+		if payInfo[i].InvitationCode == app.LIANMENGKA_YUAN_SHI_MA {
+			data.SaleId = "原始码"
+		} else {
+			data.SaleId = payInfo[i].InvitationCode
+		}
+
 		outData = append(outData, data)
 	}
 	app.PageOK(c, outData, count, pageIndex, pageSize, app.Success)

apis/shanghu/models/client.trans.go

@@ -52,4 +52,5 @@ type MerchantTransReply struct {
 	MerchantCardName string          `json:"merchant_card_name"` // 商户卡名称
 	MerchantCardTime string          `json:"merchant_card_time"` // 商户卡有效期
 	TransId          int64           `json:"trans_id"`           // 交易id
+	SaleId           string          `json:"sale_id"`            //销售ID
 }

report/cash.out.go

@@ -116,7 +116,7 @@ func CashOutAccount() {
 
 			client.Code = "7jb6"
 			clientInfo, _ := client.GetUserInfoByCode()
-			if clientInfo.ClientOpenID == account.ClientOpenID { //超级管理员钱已经有了不需要收服务费
+			if clientInfo.ClientOpenID == account.ClientOpenID { //超级管理员钱已经有了不需要收服务费  暂时无效
 				continue
 			} else { //服务费加到超级管理员账户
 				var accountClient shanghu.ClientPayTrans