tags2

common/model/staff_salary.go

@@ -11,6 +11,7 @@ import (
 var (
 	StaffSalaryStatusWait  = 1
 	StaffSalaryStatusPayed = 2
+	StaffSalaryStatusPause = 3
 )
 
 type SalaryBillLine struct {

server/api/base.go

@@ -0,0 +1,6 @@
+package api
+
+type Tag struct {
+	Name string `json:"name"`
+	Type string `json:"type"`
+}

server/api/salary.go

@@ -7,29 +7,29 @@ import (
 )
 
 type Salary struct {
-	Id             string `json:"id,omitempty"`
+	Id             string `json:"id"`
-	Month          string `json:"month,omitempty"`
+	Month          string `json:"month"`
-	Username       string `json:"username,omitempty"`
+	Username       string `json:"username"`
-	Realname       string `json:"realname,omitempty"`
+	Realname       string `json:"realname"`
-	BaseSalary     string `json:"base_salary,omitempty"`
+	BaseSalary     string `json:"base_salary"`
-	TargetSalary   string `json:"target_salary,omitempty"`
+	TargetSalary   string `json:"target_salary"`
-	RealSalary     string `json:"real_salary,omitempty"`
+	RealSalary     string `json:"real_salary"`
-	AttendIncome   string `json:"attend_income,omitempty"`
+	AttendIncome   string `json:"attend_income"`
-	TargetIncome   string `json:"target_income,omitempty"`
+	TargetIncome   string `json:"target_income"`
-	AwardIncome    string `json:"award_income,omitempty"`
+	AwardIncome    string `json:"award_income"`
-	OtherIncome    string `json:"other_income,omitempty"`
+	OtherIncome    string `json:"other_income"`
-	ShouldDay      string `json:"should_day,omitempty"`
+	ShouldDay      string `json:"should_day"`
-	AttendDay      string `json:"attend_day,omitempty"`
+	AttendDay      string `json:"attend_day"`
-	HolidayDay     string `json:"holiday_day,omitempty"`
+	HolidayDay     string `json:"holiday_day"`
-	SocialDeduct   string `json:"social_deduct,omitempty"`
+	LackDay        string `json:"lack_day"`
-	HouseDeduct    string `json:"house_deduct,omitempty"`
+	SocialDeduct   string `json:"social_deduct"`
-	PersonalDeduct string `json:"personal_deduct,omitempty"`
+	HouseDeduct    string `json:"house_deduct"`
-	OtherDeduct    string `json:"other_deduct,omitempty"`
+	PersonalDeduct string `json:"personal_deduct"`
-	CreateTime     string `json:"create_time,omitempty"`
+	OtherDeduct    string `json:"other_deduct"`
-	UpdateTime     string `json:"update_time,omitempty"`
+	CreateTime     string `json:"create_time"`
-	Extra          string `json:"extra,omitempty"`
+	UpdateTime     string `json:"update_time"`
-	Status         string `json:"status,omitempty"`
+	Extra          string `json:"extra"`
-	AttendStatus   string `json:"attend_status,omitempty"`
+	Status         string `json:"status"`
 }
 
 type CreateSalaryReq struct {
@@ -78,12 +78,8 @@ func (s *Salary) From(m *model.StaffSalary) {
 	s.UpdateTime = goutil.TimeToDateTime(m.UpdateTime)
 	s.Extra = m.Extra
 	s.Status = cast.ToString(m.Status)
+	s.LackDay = goutil.FormatFloat(float64(m.ShouldDay) - m.AttendDay - m.HolidayDay)
 
-	if s.AttendDay+s.HolidayDay != s.ShouldDay {
-		s.AttendStatus = "2"
-	} else {
-		s.AttendStatus = "1"
-	}
 }
 
 func (s *Salary) Add(o *Salary) {

server/api/staff.go

@@ -37,6 +37,7 @@ type StaffUser struct {
 	PayeeAlipayAuthQrcode string `json:"payee_alipay_auth_qrcode"`
 
 	Config interface{} `json:"config"`
+	Tags   []*Tag      `json:"tags"`
 }
 
 type StaffListReq struct {
@@ -97,4 +98,20 @@ func (s *StaffUser) From(m *model.StaffUser) {
 	//s.PayeeAlipayAuthUrl = fmt.Sprintf("https://openauth.alipay.com/oauth2/publicAppAuthorize.htm?app_id=2021004108682468&scope=auth_base&state=%d&redirect_uri=https://e.batiao8.com/api/payment/auth/alipay", m.Id)
 	s.PayeeAlipayAuthUrl = fmt.Sprintf("https://openauth.alipay.com/oauth2/publicAppAuthorize.htm?app_id=2021004108682468&scope=auth_user&state=%d&redirect_uri=https://e.batiao8.com/api/payment/auth/alipay", m.Id)
 	s.PayeeAlipayAuthQrcode, _ = butil.CreateQrcodeBase64V2(s.PayeeAlipayAuthUrl, qrcode.Low, 300)
+
+	tags := make([]*Tag, 0)
+	if payee.BankName != "" && payee.BankCard != "" {
+		tags = append(tags, &Tag{Name: "银行卡", Type: "success"})
+	}
+	if payee.AlipayUid != "" {
+		tags = append(tags, &Tag{Name: "支付宝", Type: "success"})
+	}
+	if m.Phone != "" {
+		tags = append(tags, &Tag{Name: "未填手机号", Type: "warning"})
+	}
+	if m.Idno != "" {
+		tags = append(tags, &Tag{Name: "未填身份证号", Type: "warning"})
+	}
+
+	s.Tags = tags
 }

server/service/staff_salary.go

@@ -444,7 +444,7 @@ func (s *StaffSalary) Bill(id int64, ctx *gin.Context) {
 	baseDetail := make([]*model.SalaryBillLine, 0)
 	baseDetail = append(baseDetail, &model.SalaryBillLine{Label: "员工姓名", Value: fmt.Sprintf("%s", user.Realname)})
 	baseDetail = append(baseDetail, &model.SalaryBillLine{Label: "基本工资", Value: fmt.Sprintf("%s", user.GetSalary().Base)})
-	baseDetail = append(baseDetail, &model.SalaryBillLine{Label: "出勤工资", Value: fmt.Sprintf("%s", user.GetSalary().Target)})
+	baseDetail = append(baseDetail, &model.SalaryBillLine{Label: "绩效工资", Value: fmt.Sprintf("%s", user.GetSalary().Target)})
 	datas = append(datas, &model.SalaryBillSection{
 		Name: "基本信息",
 		Line: baseDetail,

worker/staff.go

@@ -89,7 +89,7 @@ func (s *Staff) SendStaffSalaryBill(corpId int64, month string) {
 			continue
 		}
 		encId := goutil.EncryptID(staffSalary.Id, "@@salary@@")
-		billUrl := fmt.Sprintf("https://e.batiao8.com/api/staff/salary/bill?id=%s", encId)
+		billUrl := fmt.Sprintf("https://e.yubanqy.com/api/staff/salary/bill?id=%s", encId)
 
 		message := make([]string, 0)
 		message = append(message, fmt.Sprintf("【工资单】[%s][%s]", staffUser.Username, month))

worker/worker.go

@@ -49,7 +49,7 @@ func InitCorp1002(cron *gocron.Scheduler) {
 	})
 
 	//10号晚上8点发送工资单
-	cron.Every(1).Month(2).At("23:00").Do(func() {
+	cron.Every(1).Month(3).At("22:00").Do(func() {
 		go staff.SendStaffSalaryBill(corpId, time.Now().AddDate(0, -1, 0).Format("200601"))
 		//go staff.SendStaffSalaryBill(1002, time.Now().AddDate(0, -1, 0).Format("200601"))
 	})
@@ -90,7 +90,7 @@ func InitCorp1000(cron *gocron.Scheduler) {
 	})
 
 	//10号晚上8点发送工资单
-	cron.Every(1).Month(2).At("23:00").Do(func() {
+	cron.Every(1).Month(3).At("22:00").Do(func() {
 		go NewStaff().SendStaffSalaryBill(corpId, time.Now().AddDate(0, -1, 0).Format("200601"))
 	})