bug

src/dashoo.cn/backend/api/controllers/bankapi/icbc.go

@@ -143,8 +143,9 @@ func (this *ICBCController) CheckBillList() {
 		Oilverifybill[idx].BillIds = item.BillIds
 		Oilverifybill[idx].BankSerialNum = item.BankSerialNum
 		Oilverifybill[idx].ReceiveAmount,_ = strconv.ParseFloat(item.ReceiveAmount, 64)
-		Oilverifybill[idx].PayDate,_ = time.Parse("2006-01-02 15:04:05", item.PayDate)
-		Oilverifybill[idx].VerifyDate,_ = time.Parse("2006-01-02 15:04:05", item.VerifyDate)
+		loc,_ := time.LoadLocation("Local")
+		Oilverifybill[idx].PayDate,_ = time.ParseInLocation("2006-01-02 15:04:05", item.PayDate, loc)
+		Oilverifybill[idx].VerifyDate,_ = time.ParseInLocation("2006-01-02 15:04:05", item.VerifyDate, loc)
 	}
 
 	svc := bankapi.GetICBCService(utils.DBE)

src/dashoo.cn/backend/api/controllers/oilsupplier/paymentinfo.go

@@ -820,7 +820,7 @@ func (this *PaymentInfoController) ReceiveVerifyBillList() {
 			payinfo.IsPay = "2"
 			payinfo.IsVerify = "1"
 			payinfo.BankSerialNum = item.BankSerialNum
-			payinfo.VerifyDate = item.PayDate
+			payinfo.VerifyDate = item.VerifyDate
 			svc.UpdateEntityByIdCols(id, &payinfo, cols)
 		}
 	}

src/dashoo.cn/backend/api/controllers/oilsupplier/supplier.go

@@ -1405,7 +1405,7 @@ func (this *OilSupplierController) GetDictListByStatus() {
 
 	// 所有二级单位
 	var allunitorglist []organize.Base_Organize
-	where = "Category='Unit' and ParentId = '100000001'"
+	where = "Category='Unit' and ParentId in (100000001, 100000128)"
 	orgsvc.GetEntities(&allunitorglist, where)
 	dictList["Allunitorglist"] = allunitorglist
 
@@ -1677,15 +1677,15 @@ func (this *OilSupplierController) UpdateEntity() {
 	updateCols := svc.GetUpdateCols(OilSupplierCertName, typeCode, model.Id)
 	err := svc.UpdateEntityBytbl(OilSupplierName, id, &model, updateCols)
 
-	isPay := "0"
-	if instyle == suppliercert.PINGSHEN {
-		isPay = "0"
-	} else {
-		isPay = "2"
-	}
+	//isPay := "0"
+	//if instyle == suppliercert.PINGSHEN {
+	//	isPay = "0"
+	//} else {
+	//	isPay = "2"
+	//}
 
 	if err == nil {
-		svc.DBE.Exec("update OilSupplierCert set InStyle='" + instyle + "', IsPay= " + isPay + " where SupplierId=" + id + " and SupplierTypeCode='" + typeCode + "'")
+		svc.DBE.Exec("update OilSupplierCert set InStyle='" + instyle +  " where SupplierId=" + id + " and SupplierTypeCode='" + typeCode + "'") // "', IsPay= " + isPay +
 		errinfo.Message = "修改成功！"
 		errinfo.Code = 0
 		this.Data["json"] = &errinfo