修改文本

master
kanade 3 years ago
parent 2187780842
commit 91ab54049b

@ -77,7 +77,7 @@ func newExcelFile() *excelize.File {
_ = f.SetRowHeight(SheetName, 1, 40) // 设置行高度 _ = f.SetRowHeight(SheetName, 1, 40) // 设置行高度
_ = f.MergeCell(SheetName, "A1", "Z1") _ = f.MergeCell(SheetName, "A1", "Z1")
_ = f.SetCellStyle(SheetName, "A1", "R1", tableHeaderStyle(f)) _ = f.SetCellStyle(SheetName, "A1", "R1", tableHeaderStyle(f))
_ = f.SetCellValue(SheetName, "A1", "左家右厨-未发货订单汇总") _ = f.SetCellValue(SheetName, "A1", "瑞库客-未发货订单汇总")
_ = f.SetRowHeight(SheetName, 2, 90) _ = f.SetRowHeight(SheetName, 2, 90)
_ = f.MergeCell(SheetName, "A2", "Z2") _ = f.MergeCell(SheetName, "A2", "Z2")

@ -57,8 +57,8 @@ func (e *Enterprise) Status(c *gin.Context) {
sector := vend.GysEnterpriseSector{} sector := vend.GysEnterpriseSector{}
dbc.DB.First(&sector, "enterprise_id = ? and `type` = ?", state.ID, vend.Sector_Type_Sales) dbc.DB.First(&sector, "enterprise_id = ? and `type` = ?", state.ID, vend.Sector_Type_Sales)
email = sector.Email email = sector.Email
if tools.FileExist(filepath.Join(static_path.Dir.Root, "/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" Contract = "/contract/pdf/瑞库客平台合作协议_" + state.ContractNo + ".pdf"
} }
} }
back.Suc(c, "操作成功", replyStatus{Status: state.State, StateInfo: state.StateInfo, Name: state.EnterpriseName, Email: email, Contract: Contract}) back.Suc(c, "操作成功", replyStatus{Status: state.State, StateInfo: state.StateInfo, Name: state.EnterpriseName, Email: email, Contract: Contract})

@ -228,7 +228,7 @@ func (e *enterprise) SendEmail(email string, userId uint) error {
m := gomail.NewMessage() m := gomail.NewMessage()
m.SetHeader("From", configs.Config_Gys_Email_Setting_Mail) m.SetHeader("From", configs.Config_Gys_Email_Setting_Mail)
m.SetHeader("To", email) m.SetHeader("To", email)
m.SetHeader("Subject", "左家右厨平台消息通知--【审核通知】!") m.SetHeader("Subject", "瑞库客平台消息通知--【审核通知】!")
state := vend.GysEnterpriseState{} state := vend.GysEnterpriseState{}
dbc.DB.First(&state, "user_id = ?", userId) dbc.DB.First(&state, "user_id = ?", userId)
@ -242,9 +242,9 @@ func (e *enterprise) SendEmail(email string, userId uint) error {
<br/><br/> <br/><br/>
<br/><br/> <br/><br/>
1084 400-889-4489 1084 400-889-4489
<br/><br/> <br/><br/>
<a href="%s">%s</a><br/> <a href="%s">%s</a><br/>
%s<br/> %s<br/>
%s<br/> %s<br/>
`, state.EnterpriseName, configs.GYS_Login_Url, configs.GYS_Login_Url, gysUser.Username, gysUser.Password)) `, 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 := gotenberg.NewOfficeRequest(docx)
req.WaitTimeout(30) 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 { if err := c.Store(req, filename); err != nil {
return err 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) 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 { 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("ContractStart", state.ContractStart.Time.Format(" 2006 年 01 月 02 日"), -1)
docx1.Replace("ContractEnd", state.ContractEnd.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) err = docx1.WriteToFile(filename)
if err != nil { if err != nil {
return "", err return "", err

@ -1,21 +1,21 @@
package role package role
const TopRule = ` const TopRule = `
1. 1.
2.TA 2.TA
3.使 3.使
4.使 4.使
5.使` 5.使`
const FirstRule = ` const FirstRule = `
1. 1.
2.TA 2.TA
3.使 3.使
4.使 4.使
5.使` 5.使`
const SecondRule = ` const SecondRule = `
1. 1.
2.TA 2.TA
3.使 3.使
4.使 4.使

@ -121,7 +121,7 @@ func newExcelFile() *excelize.File {
f.SetRowHeight(SheetName, 1, 40) // 设置行高度 f.SetRowHeight(SheetName, 1, 40) // 设置行高度
f.MergeCell(SheetName, "A1", "Z1") f.MergeCell(SheetName, "A1", "Z1")
f.SetCellStyle(SheetName, "A1", "R1", tableHeaderStyle(f)) f.SetCellStyle(SheetName, "A1", "R1", tableHeaderStyle(f))
f.SetCellValue(SheetName, "A1", "左家右厨---用户提现记录表") f.SetCellValue(SheetName, "A1", "瑞库客---用户提现记录表")
f.SetRowHeight(SheetName, 2, 90) f.SetRowHeight(SheetName, 2, 90)
f.MergeCell(SheetName, "A2", "Z2") f.MergeCell(SheetName, "A2", "Z2")

@ -122,7 +122,7 @@ func ActionToBill(c *gin.Context) {
order = order + "\"clerkid\":\"\"," order = order + "\"clerkid\":\"\","
order = order + "\"invoiceLine\":\"p\"," order = order + "\"invoiceLine\":\"p\","
order = order + "\"cpybz\":\"\"," order = order + "\"cpybz\":\"\","
order = order + "\"detail\":[{\"goodsname\":\"左家右厨购物 \"," order = order + "\"detail\":[{\"goodsname\":\"瑞库客购物 \","
order = order + "\"num\":\"1\"," order = order + "\"num\":\"1\","
order = order + "\"price\":\"" + mypriceUid.Price.String() + "\"," order = order + "\"price\":\"" + mypriceUid.Price.String() + "\","
order = order + "\"hsbz\":\"1\"," order = order + "\"hsbz\":\"1\","

@ -58,10 +58,10 @@ func WxBinding(c *gin.Context) {
} }
beego.Info(sql, is_count) beego.Info(sql, is_count)
reg := regexp.MustCompile(`左家右厨\d+`) reg := regexp.MustCompile(`瑞库客\d+`)
res := reg.FindAllString(userInfo.Nickname, -1) res := reg.FindAllString(userInfo.Nickname, -1)
if len(res) >= 0 { if len(res) >= 0 {
wxUserInfo.Nickname = userInfo.Nickname // 昵称 前缀是左家右厨的是系统自动生成的,会更新 wxUserInfo.Nickname = userInfo.Nickname // 昵称 前缀是瑞库客的是系统自动生成的,会更新
} }
if userInfo.HeadImgUrl != define.DefaultHeadImage { if userInfo.HeadImgUrl != define.DefaultHeadImage {
wxUserInfo.HeadImgUrl = userInfo.HeadImgUrl wxUserInfo.HeadImgUrl = userInfo.HeadImgUrl

@ -18,7 +18,7 @@ type wxConfig struct {
var ( var (
DefaultBirthday = time.Date(1980, 01, 1, 00, 00, 00, 0, time.Local) DefaultBirthday = time.Date(1980, 01, 1, 00, 00, 00, 0, time.Local)
DefaultOfficialLogoURL = "/default/officaillogo-1.png" DefaultOfficialLogoURL = "/default/officaillogo-1.png"
DefaultOfficialNickname = "左家右厨官方" DefaultOfficialNickname = "瑞库客官方"
DefaultHeadImage = "/default/officaillogo-1.png" DefaultHeadImage = "/default/officaillogo-1.png"
WxConfig = map[string]wxConfig{ WxConfig = map[string]wxConfig{

@ -80,6 +80,8 @@ type GoodsDetail struct {
MakeUpStatus uint `json:"make_up_status"` MakeUpStatus uint `json:"make_up_status"`
ExtraPrice decimal.Decimal `json:"-"` ExtraPrice decimal.Decimal `json:"-"`
Sku goods.RecookGoodsSkuModel `json:"-" gorm:"foreignKey:sku_id"` 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 // TableName sets the insert table name for this struct type

@ -61,7 +61,7 @@ func (r *registerUser) UserAdd(c *gin.Context, login *user.Login, info *user.Inf
*info = user.Information{ *info = user.Information{
ID: lastId, ID: lastId,
AncestorID: 1, AncestorID: 1,
Nickname: "左家右厨" + mobile[7:], Nickname: "瑞库客" + mobile[7:],
Mobile: mobile, Mobile: mobile,
Birthday: formatime.NewSecondFrom(define.DefaultBirthday), Birthday: formatime.NewSecondFrom(define.DefaultBirthday),
HeadImgUrl: define.DefaultHeadImage, HeadImgUrl: define.DefaultHeadImage,

@ -42,7 +42,7 @@ func ReturnRequest(mobile string, code string) *requests.CommonRequest {
request.Version = "2017-05-25" request.Version = "2017-05-25"
request.ApiName = "SendSms" request.ApiName = "SendSms"
request.QueryParams["RegionId"] = regionId request.QueryParams["RegionId"] = regionId
request.QueryParams["SignName"] = "左家右厨" request.QueryParams["SignName"] = "瑞库客"
request.QueryParams["TemplateCode"] = loginTemplateCode request.QueryParams["TemplateCode"] = loginTemplateCode
request.QueryParams["TemplateParam"] = fmt.Sprintf("{\"code\":\"%v\"}", code) request.QueryParams["TemplateParam"] = fmt.Sprintf("{\"code\":\"%v\"}", code)
request.QueryParams["PhoneNumbers"] = mobile request.QueryParams["PhoneNumbers"] = mobile

@ -32,9 +32,9 @@ func main() {
//Notice //Notice
var notice jpushclient.Notice var notice jpushclient.Notice
notice.SetAlert("alert_test") notice.SetAlert("alert_test")
notice.SetAndroidNotice(&jpushclient.AndroidNotice{Alert: "左家右厨大酬宾全场一折起"}) notice.SetAndroidNotice(&jpushclient.AndroidNotice{Alert: "瑞库客大酬宾全场一折起"})
//notice.SetIOSNotice(&jpushclient.IOSNotice{Alert: "左家右厨大酬宾全场一折起"}) //notice.SetIOSNotice(&jpushclient.IOSNotice{Alert: "瑞库客大酬宾全场一折起"})
//notice.SetWinPhoneNotice(&jpushclient.WinPhoneNotice{Alert: "左家右厨大酬宾全场一折起"}) //notice.SetWinPhoneNotice(&jpushclient.WinPhoneNotice{Alert: "瑞库客大酬宾全场一折起"})
////jpushclient.Message ////jpushclient.Message
//var msg jpushclient.Message //var msg jpushclient.Message
//msg.Title = "火影忍者" //msg.Title = "火影忍者"

@ -127,7 +127,7 @@ func (o logic) Create(args ApplyCreate) error {
// } // }
// info := user.RecookUserInfoModel{ // info := user.RecookUserInfoModel{
// Id: uint(lastId), // Id: uint(lastId),
// Nickname: "左家右厨" + mobile[7:], // Nickname: "瑞库客" + mobile[7:],
// Mobile: mobile, // Mobile: mobile,
// Birthday: formatime.NewSecondFrom(define.DefaultBirthday), // Birthday: formatime.NewSecondFrom(define.DefaultBirthday),
// HeadImgUrl: "", // HeadImgUrl: "",

@ -100,7 +100,7 @@ func (o logic) Vip(args AppUserReq) error {
} }
info := user.RecookUserInfoModel{ info := user.RecookUserInfoModel{
Id: uint(lastId), Id: uint(lastId),
Nickname: "左家右厨" + mobile[7:], Nickname: "瑞库客" + mobile[7:],
Mobile: mobile, Mobile: mobile,
Birthday: formatime.NewSecondFrom(define.DefaultBirthday), Birthday: formatime.NewSecondFrom(define.DefaultBirthday),
HeadImgUrl: "", HeadImgUrl: "",

@ -91,7 +91,7 @@ func (o logic) Sure(args ApplySure) error {
} }
info := user.RecookUserInfoModel{ info := user.RecookUserInfoModel{
Id: uint(lastId), Id: uint(lastId),
Nickname: "左家右厨" + mobile[7:], Nickname: "瑞库客" + mobile[7:],
Mobile: mobile, Mobile: mobile,
Birthday: formatime.NewSecondFrom(define.DefaultBirthday), Birthday: formatime.NewSecondFrom(define.DefaultBirthday),
HeadImgUrl: "", HeadImgUrl: "",

@ -105,7 +105,7 @@ func (w *wangdiantongLogic) RawTradePushSelf(orderId uint) (resp.OrderPush, erro
TradeTime: order.CreatedAt.Time.Format("2006-01-02 15:04:05"), TradeTime: order.CreatedAt.Time.Format("2006-01-02 15:04:05"),
PayTime: order.PayTime.Time.Format("2006-01-02 15:04:05"), PayTime: order.PayTime.Time.Format("2006-01-02 15:04:05"),
EndTime: "", EndTime: "",
BuyerNick: "左家右厨买家", BuyerNick: "瑞库客买家",
BuyerMessage: order.BuyerMessage, BuyerMessage: order.BuyerMessage,
BuyerEmail: "", BuyerEmail: "",
BuyerArea: "", 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"), TradeTime: order.CreatedAt.Time.Format("2006-01-02 15:04:05"),
PayTime: order.PayTime.Time.Format("2006-01-02 15:04:05"), PayTime: order.PayTime.Time.Format("2006-01-02 15:04:05"),
EndTime: "", EndTime: "",
BuyerNick: "左家右厨买家", BuyerNick: "瑞库客买家",
BuyerMessage: order.BuyerMessage, BuyerMessage: order.BuyerMessage,
BuyerEmail: "", BuyerEmail: "",
BuyerArea: "", BuyerArea: "",

Loading…
Cancel
Save