xiugai

src/jfw/modules/distribution/src/service/action/capital.go

@@ -62,15 +62,22 @@ func (l *Capital) List() {
 			})
 		}
 	}
-	dis_count := Mysql.SelectBySql(`select count_cash,auth_cash,tax_cash,createtime from dis_count where uid=?`, userId)
+	dis_count := Mysql.SelectBySql(`select commission,count_cash,auth_cash,tax_cash,count_status,createtime from dis_count where uid=?`, userId)
 	if dis_count != nil {
 		for _, v := range *dis_count {
 			cl := &CapitalList{
 				Type: "上月结算",
 				Date: util.ObjToString(v["createtime"]),
 			}
-			if count_cash := util.Float64All(v["count_cash"]); count_cash > 0 {
-				cl.Money = fmt.Sprintf("￥%.2f", count_cash/100)
+			if util.IntAll(v["count_status"]) == 2 {
+				if commission := util.Float64All(v["commission"]); commission > 0 {
+					cl.Money = fmt.Sprintf("￥%.2f", commission/100)
+				}
+				cl.Status = "未结算"
+			} else {
+				if count_cash := util.Float64All(v["count_cash"]); count_cash > 0 {
+					cl.Money = fmt.Sprintf("￥%.2f", count_cash/100)
+				}
 			}
 			if tax_cash := util.Float64All(v["tax_cash"]); tax_cash > 0 {
 				cl.TaxCash = fmt.Sprintf("-%.2f", tax_cash/100)

src/jfw/modules/distribution/src/timetask/timetask.go

@@ -108,8 +108,7 @@ func settlement() {
 				log.Println(uid, "佣金异常不进行结算", "佣金", commission)
 				continue
 			}
-			count_code := VarOrderCode.Get() //结算单号
-			var can_cash int64               //可提现金额
+			var can_cash int64 //可提现金额
 			account := Mysql.SelectBySql(`select money from account where uid=?`, uid)
 			if account != nil && len(*account) > 0 {
 				can_cash, _ = (*account)[0]["money"].(int64)
@@ -118,16 +117,20 @@ func settlement() {
 				continue
 			}
 			var sFx *settlementFx
-			var partner_auth_cash int64 //认证费用
+			var partner_auth_cash int64      //认证费用
+			count_code := VarOrderCode.Get() //结算单号
+			nowFormat := util.NowFormat(util.Date_Full_Layout)
 			partner := Mysql.SelectBySql(`select a.name,a.type,a.auth_cost,a.auth_status,b.legal_idcard from dis_partner a left join dis_auth b on (b.auth_status=1 and a.id=b.partner_id) where a.uid=?`, uid)
 			if partner != nil && len(*partner) > 0 {
-				auth_status, _ := (*partner)[0]["auth_status"].(int64)
-				if auth_status == 0 {
-					log.Println(uid, "没有认证，不进行结算")
-					continue
-				}
 				partner_type, _ := (*partner)[0]["type"].(int64)
 				if partner_type == 1 {
+					auth_status, _ := (*partner)[0]["auth_status"].(int64)
+					if auth_status == 0 {
+						Mysql.InsertBySql(`insert into dis_count (uid,code,commission,sale_cash,count_cash,can_cash,auth_cash,tax_cash,count_status,createtime,timestamp) values (?,?,?,?,?,?,?,?,?,?,?)`,
+							uid, count_code, commission, sale_money, 0, can_cash, 0, 0, 2, nowFormat, nowFormat)
+						log.Println(uid, "还没有认证，不进行实际结算，但记录资金流水")
+						continue
+					}
 					sFx = &settlementFx{}
 					sFx.name, _ = (*partner)[0]["name"].(string)           //姓名
 					sFx.idcard, _ = (*partner)[0]["legal_idcard"].(string) //身份证号
@@ -153,7 +156,6 @@ func settlement() {
 				log.Println(uid, "结算金额异常，不进行结算")
 				continue
 			}
-			nowFormat := util.NowFormat(util.Date_Full_Layout)
 			if Mysql.ExecTx("结算定时任务", func(tx *sql.Tx) bool {
 				ok_1 := Mysql.InsertBySqlByTx(tx, `insert into dis_count (uid,code,commission,sale_cash,count_cash,can_cash,auth_cash,tax_cash,count_status,createtime,timestamp) values (?,?,?,?,?,?,?,?,?,?,?)`,
 					uid, count_code, commission, sale_money, count_cash, can_cash, partner_auth_cash, tax_cash, 0, nowFormat, nowFormat)