diff --git a/internal/api/manage/excel/create.go b/internal/api/manage/excel/create.go
index cadcaac..5339b88 100755
--- a/internal/api/manage/excel/create.go
+++ b/internal/api/manage/excel/create.go
@@ -77,7 +77,7 @@ func newExcelFile() *excelize.File {
_ = f.SetRowHeight(SheetName, 1, 40) // 设置行高度
_ = f.MergeCell(SheetName, "A1", "Z1")
_ = f.SetCellStyle(SheetName, "A1", "R1", tableHeaderStyle(f))
- _ = f.SetCellValue(SheetName, "A1", "左家右厨-未发货订单汇总")
+ _ = f.SetCellValue(SheetName, "A1", "瑞库客-未发货订单汇总")
_ = f.SetRowHeight(SheetName, 2, 90)
_ = f.MergeCell(SheetName, "A2", "Z2")
diff --git a/internal/api/manage/gys/enterprise.go b/internal/api/manage/gys/enterprise.go
index 788d710..de2101f 100644
--- a/internal/api/manage/gys/enterprise.go
+++ b/internal/api/manage/gys/enterprise.go
@@ -57,8 +57,8 @@ func (e *Enterprise) Status(c *gin.Context) {
sector := vend.GysEnterpriseSector{}
dbc.DB.First(§or, "enterprise_id = ? and `type` = ?", state.ID, vend.Sector_Type_Sales)
email = sector.Email
- if tools.FileExist(filepath.Join(static_path.Dir.Root, "/contract/pdf/左家右厨平台合作协议_"+state.ContractNo+".pdf")) {
- Contract = "/contract/pdf/左家右厨平台合作协议_" + state.ContractNo + ".pdf"
+ if tools.FileExist(filepath.Join(static_path.Dir.Root, "/contract/pdf/瑞库客平台合作协议_"+state.ContractNo+".pdf")) {
+ Contract = "/contract/pdf/瑞库客平台合作协议_" + state.ContractNo + ".pdf"
}
}
back.Suc(c, "操作成功", replyStatus{Status: state.State, StateInfo: state.StateInfo, Name: state.EnterpriseName, Email: email, Contract: Contract})
diff --git a/internal/api/manage/gys/logic/enterprise.go b/internal/api/manage/gys/logic/enterprise.go
index 5daf2d3..4553e29 100644
--- a/internal/api/manage/gys/logic/enterprise.go
+++ b/internal/api/manage/gys/logic/enterprise.go
@@ -228,7 +228,7 @@ func (e *enterprise) SendEmail(email string, userId uint) error {
m := gomail.NewMessage()
m.SetHeader("From", configs.Config_Gys_Email_Setting_Mail)
m.SetHeader("To", email)
- m.SetHeader("Subject", "左家右厨平台消息通知--【审核通知】!")
+ m.SetHeader("Subject", "瑞库客平台消息通知--【审核通知】!")
state := vend.GysEnterpriseState{}
dbc.DB.First(&state, "user_id = ?", userId)
@@ -242,9 +242,9 @@ func (e *enterprise) SendEmail(email string, userId uint) error {
您好!
-恭喜您通过左家右厨供应商资质审核,请下载附件签署纸质协议,盖章后请寄送至浙江省宁波市高新区菁华路108号德邦大厦4楼,收件人:左家右厨招商部 400-889-4489
+恭喜您通过瑞库客供应商资质审核,请下载附件签署纸质协议,盖章后请寄送至浙江省宁波市高新区菁华路108号德邦大厦4楼,收件人:瑞库客招商部 400-889-4489
-左家右厨供应商后台地址:%s
+瑞库客供应商后台地址:%s
账号:%s
密码:%s
系统邮件,请勿回复!`, state.EnterpriseName, configs.GYS_Login_Url, configs.GYS_Login_Url, gysUser.Username, gysUser.Password))
@@ -260,11 +260,11 @@ func (e *enterprise) SendEmail(email string, userId uint) error {
}
req := gotenberg.NewOfficeRequest(docx)
req.WaitTimeout(30)
- filename := static_path.Dir.Root + "/contract/pdf/左家右厨平台合作协议_" + state.ContractNo + ".pdf"
+ filename := static_path.Dir.Root + "/contract/pdf/瑞库客平台合作协议_" + state.ContractNo + ".pdf"
if err := c.Store(req, filename); err != nil {
return err
}
- m.Attach(filename, gomail.Rename("=?utf-8?B?"+base64.StdEncoding.EncodeToString([]byte("左家右厨平台合作协议_"+state.ContractNo+".pdf"))+"?="))
+ m.Attach(filename, gomail.Rename("=?utf-8?B?"+base64.StdEncoding.EncodeToString([]byte("瑞库客平台合作协议_"+state.ContractNo+".pdf"))+"?="))
d := gomail.NewDialer(configs.Config_Gys_Email_Setting_Smtp, configs.Config_Gys_Email_Setting_Port, configs.Config_Gys_Email_Setting_User, configs.Config_Gys_Email_Setting_Pass)
if err := d.DialAndSend(m); err != nil {
@@ -521,7 +521,7 @@ func (e *enterprise) GetContractDoc(state vend.GysEnterpriseState) (string, erro
}
docx1.Replace("ContractStart", state.ContractStart.Time.Format(" 2006 年 01 月 02 日"), -1)
docx1.Replace("ContractEnd", state.ContractEnd.Time.Format(" 2006 年 01 月 02 日"), -1)
- filename := static_path.Dir.Root + "/contract/左家右厨平台合作协议_" + state.ContractNo + ".docx"
+ filename := static_path.Dir.Root + "/contract/瑞库客平台合作协议_" + state.ContractNo + ".docx"
err = docx1.WriteToFile(filename)
if err != nil {
return "", err
diff --git a/internal/api/manage/role/rule.go b/internal/api/manage/role/rule.go
index 1a79f0b..4f79c5f 100644
--- a/internal/api/manage/role/rule.go
+++ b/internal/api/manage/role/rule.go
@@ -1,21 +1,21 @@
package role
const TopRule = `
-1.您可以推荐好友入驻到左家右厨平台,好友入驻成功后,您可以获得一个升级码
+1.您可以推荐好友入驻到瑞库客平台,好友入驻成功后,您可以获得一个升级码
2.TA不会成为您邀请的用户,而是直接成为钻石店铺
3.升级码可用于店铺升级,将会员或店主升级为白银店铺,白银店铺升级为黄金店铺;若已经是黄金店铺,则无法使用
4.升级码长期有效,使用后立即生效并作废
5.升级码可给您邀请的用户使用`
const FirstRule = `
-1.您可以推荐好友入驻到左家右厨平台,好友入驻成功后,您可以获得一个升级码
+1.您可以推荐好友入驻到瑞库客平台,好友入驻成功后,您可以获得一个升级码
2.TA不会成为您邀请的用户,而是直接成为钻石店铺
3.升级码可用于店铺升级,将会员或店主升级为白银店铺,白银店铺升级为黄金店铺;若已经是黄金店铺,则无法使用
4.升级码长期有效,使用后立即生效并作废
5.升级码可给自己或您邀请的用户使用`
const SecondRule = `
-1.您可以推荐好友入驻到左家右厨平台,好友入驻成功后,您可以获得一个升级码
+1.您可以推荐好友入驻到瑞库客平台,好友入驻成功后,您可以获得一个升级码
2.TA不会成为您邀请的用户,而是直接成为钻石店铺
3.升级码可用于店铺升级,将会员或店主升级为白银店铺,白银店铺升级为黄金店铺;若已经是黄金店铺,则无法使用
4.升级码长期有效,使用后立即生效并作废
diff --git a/internal/api/manage/withdrawals/excel.go b/internal/api/manage/withdrawals/excel.go
index 436de86..44ca959 100755
--- a/internal/api/manage/withdrawals/excel.go
+++ b/internal/api/manage/withdrawals/excel.go
@@ -121,7 +121,7 @@ func newExcelFile() *excelize.File {
f.SetRowHeight(SheetName, 1, 40) // 设置行高度
f.MergeCell(SheetName, "A1", "Z1")
f.SetCellStyle(SheetName, "A1", "R1", tableHeaderStyle(f))
- f.SetCellValue(SheetName, "A1", "左家右厨---用户提现记录表")
+ f.SetCellValue(SheetName, "A1", "瑞库客---用户提现记录表")
f.SetRowHeight(SheetName, 2, 90)
f.MergeCell(SheetName, "A2", "Z2")
diff --git a/internal/api/mobile/bill/create.go b/internal/api/mobile/bill/create.go
index 05df85a..de570a2 100644
--- a/internal/api/mobile/bill/create.go
+++ b/internal/api/mobile/bill/create.go
@@ -122,7 +122,7 @@ func ActionToBill(c *gin.Context) {
order = order + "\"clerkid\":\"\","
order = order + "\"invoiceLine\":\"p\","
order = order + "\"cpybz\":\"\","
- order = order + "\"detail\":[{\"goodsname\":\"左家右厨购物 \","
+ order = order + "\"detail\":[{\"goodsname\":\"瑞库客购物 \","
order = order + "\"num\":\"1\","
order = order + "\"price\":\"" + mypriceUid.Price.String() + "\","
order = order + "\"hsbz\":\"1\","
diff --git a/internal/api/mobile/users/wx-binding.go b/internal/api/mobile/users/wx-binding.go
index d6e2c1a..6d38f12 100644
--- a/internal/api/mobile/users/wx-binding.go
+++ b/internal/api/mobile/users/wx-binding.go
@@ -58,10 +58,10 @@ func WxBinding(c *gin.Context) {
}
beego.Info(sql, is_count)
- reg := regexp.MustCompile(`左家右厨\d+`)
+ reg := regexp.MustCompile(`瑞库客\d+`)
res := reg.FindAllString(userInfo.Nickname, -1)
if len(res) >= 0 {
- wxUserInfo.Nickname = userInfo.Nickname // 昵称 前缀是左家右厨的是系统自动生成的,会更新
+ wxUserInfo.Nickname = userInfo.Nickname // 昵称 前缀是瑞库客的是系统自动生成的,会更新
}
if userInfo.HeadImgUrl != define.DefaultHeadImage {
wxUserInfo.HeadImgUrl = userInfo.HeadImgUrl
diff --git a/internal/define/constant.go b/internal/define/constant.go
index eb491e4..037e1e9 100755
--- a/internal/define/constant.go
+++ b/internal/define/constant.go
@@ -18,7 +18,7 @@ type wxConfig struct {
var (
DefaultBirthday = time.Date(1980, 01, 1, 00, 00, 00, 0, time.Local)
DefaultOfficialLogoURL = "/default/officaillogo-1.png"
- DefaultOfficialNickname = "左家右厨官方"
+ DefaultOfficialNickname = "瑞库客官方"
DefaultHeadImage = "/default/officaillogo-1.png"
WxConfig = map[string]wxConfig{
diff --git a/internal/model/order/goods_detail.go b/internal/model/order/goods_detail.go
index e5853ef..84fff40 100755
--- a/internal/model/order/goods_detail.go
+++ b/internal/model/order/goods_detail.go
@@ -80,6 +80,8 @@ type GoodsDetail struct {
MakeUpStatus uint `json:"make_up_status"`
ExtraPrice decimal.Decimal `json:"-"`
Sku goods.RecookGoodsSkuModel `json:"-" gorm:"foreignKey:sku_id"`
+ Income decimal.Decimal `json:"income"`
+ Tax decimal.Decimal `json:"tax"`
}
// TableName sets the insert table name for this struct type
diff --git a/internal/service/app/register.go b/internal/service/app/register.go
index dac3514..0e1c4bd 100644
--- a/internal/service/app/register.go
+++ b/internal/service/app/register.go
@@ -61,7 +61,7 @@ func (r *registerUser) UserAdd(c *gin.Context, login *user.Login, info *user.Inf
*info = user.Information{
ID: lastId,
AncestorID: 1,
- Nickname: "左家右厨" + mobile[7:],
+ Nickname: "瑞库客" + mobile[7:],
Mobile: mobile,
Birthday: formatime.NewSecondFrom(define.DefaultBirthday),
HeadImgUrl: define.DefaultHeadImage,
diff --git a/internal/v2/controller/app/message/utils.go b/internal/v2/controller/app/message/utils.go
index 64b5582..349b8c6 100644
--- a/internal/v2/controller/app/message/utils.go
+++ b/internal/v2/controller/app/message/utils.go
@@ -42,7 +42,7 @@ func ReturnRequest(mobile string, code string) *requests.CommonRequest {
request.Version = "2017-05-25"
request.ApiName = "SendSms"
request.QueryParams["RegionId"] = regionId
- request.QueryParams["SignName"] = "左家右厨"
+ request.QueryParams["SignName"] = "瑞库客"
request.QueryParams["TemplateCode"] = loginTemplateCode
request.QueryParams["TemplateParam"] = fmt.Sprintf("{\"code\":\"%v\"}", code)
request.QueryParams["PhoneNumbers"] = mobile
diff --git a/internal/v2/lib/jpush/jpush.go b/internal/v2/lib/jpush/jpush.go
index 5f7ddfd..2bf9e56 100644
--- a/internal/v2/lib/jpush/jpush.go
+++ b/internal/v2/lib/jpush/jpush.go
@@ -32,9 +32,9 @@ func main() {
//Notice
var notice jpushclient.Notice
notice.SetAlert("alert_test")
- notice.SetAndroidNotice(&jpushclient.AndroidNotice{Alert: "左家右厨大酬宾全场一折起"})
- //notice.SetIOSNotice(&jpushclient.IOSNotice{Alert: "左家右厨大酬宾全场一折起"})
- //notice.SetWinPhoneNotice(&jpushclient.WinPhoneNotice{Alert: "左家右厨大酬宾全场一折起"})
+ notice.SetAndroidNotice(&jpushclient.AndroidNotice{Alert: "瑞库客大酬宾全场一折起"})
+ //notice.SetIOSNotice(&jpushclient.IOSNotice{Alert: "瑞库客大酬宾全场一折起"})
+ //notice.SetWinPhoneNotice(&jpushclient.WinPhoneNotice{Alert: "瑞库客大酬宾全场一折起"})
////jpushclient.Message
//var msg jpushclient.Message
//msg.Title = "火影忍者"
diff --git a/internal/v2/logic/app/upgrade/upgrade.go b/internal/v2/logic/app/upgrade/upgrade.go
index 4dc003d..bca04c6 100644
--- a/internal/v2/logic/app/upgrade/upgrade.go
+++ b/internal/v2/logic/app/upgrade/upgrade.go
@@ -127,7 +127,7 @@ func (o logic) Create(args ApplyCreate) error {
// }
// info := user.RecookUserInfoModel{
// Id: uint(lastId),
- // Nickname: "左家右厨" + mobile[7:],
+ // Nickname: "瑞库客" + mobile[7:],
// Mobile: mobile,
// Birthday: formatime.NewSecondFrom(define.DefaultBirthday),
// HeadImgUrl: "",
diff --git a/internal/v2/logic/manage/jyy/app.go b/internal/v2/logic/manage/jyy/app.go
index cb7cd73..58791b1 100644
--- a/internal/v2/logic/manage/jyy/app.go
+++ b/internal/v2/logic/manage/jyy/app.go
@@ -100,7 +100,7 @@ func (o logic) Vip(args AppUserReq) error {
}
info := user.RecookUserInfoModel{
Id: uint(lastId),
- Nickname: "左家右厨" + mobile[7:],
+ Nickname: "瑞库客" + mobile[7:],
Mobile: mobile,
Birthday: formatime.NewSecondFrom(define.DefaultBirthday),
HeadImgUrl: "",
diff --git a/internal/v2/logic/manage/upgrade/upgrade.go b/internal/v2/logic/manage/upgrade/upgrade.go
index b208cf7..4330778 100644
--- a/internal/v2/logic/manage/upgrade/upgrade.go
+++ b/internal/v2/logic/manage/upgrade/upgrade.go
@@ -91,7 +91,7 @@ func (o logic) Sure(args ApplySure) error {
}
info := user.RecookUserInfoModel{
Id: uint(lastId),
- Nickname: "左家右厨" + mobile[7:],
+ Nickname: "瑞库客" + mobile[7:],
Mobile: mobile,
Birthday: formatime.NewSecondFrom(define.DefaultBirthday),
HeadImgUrl: "",
diff --git a/internal/v2/logic/supplier/thirdmanage/wangdian/wangdiantong.go b/internal/v2/logic/supplier/thirdmanage/wangdian/wangdiantong.go
index cc08c4f..ec3ee4a 100644
--- a/internal/v2/logic/supplier/thirdmanage/wangdian/wangdiantong.go
+++ b/internal/v2/logic/supplier/thirdmanage/wangdian/wangdiantong.go
@@ -105,7 +105,7 @@ func (w *wangdiantongLogic) RawTradePushSelf(orderId uint) (resp.OrderPush, erro
TradeTime: order.CreatedAt.Time.Format("2006-01-02 15:04:05"),
PayTime: order.PayTime.Time.Format("2006-01-02 15:04:05"),
EndTime: "",
- BuyerNick: "左家右厨买家",
+ BuyerNick: "瑞库客买家",
BuyerMessage: order.BuyerMessage,
BuyerEmail: "",
BuyerArea: "",
@@ -243,7 +243,7 @@ func (w *wangdiantongLogic) SuccessOrder(orderId uint) (resp.OrderPush, error) {
TradeTime: order.CreatedAt.Time.Format("2006-01-02 15:04:05"),
PayTime: order.PayTime.Time.Format("2006-01-02 15:04:05"),
EndTime: "",
- BuyerNick: "左家右厨买家",
+ BuyerNick: "瑞库客买家",
BuyerMessage: order.BuyerMessage,
BuyerEmail: "",
BuyerArea: "",