Browse Source

缴费管理

lining 6 years ago
parent
commit
99a32f967f

+ 11 - 1
src/dashoo.cn/backend/api/controllers/oilsupplier/annualaudit.go

@@ -645,7 +645,17 @@ func (this *AnnualAuditController) AnnualAudit() {
 			} else if list.SupplierTypeName == "03" {
 			} else if list.SupplierTypeName == "03" {
 				Amount = 8000
 				Amount = 8000
 			}
 			}
-			paysvc.AddPaymentinfo(list.SupplierId, list.Id, Amount, "2")
+			var payinfo paymentinfo.OilPaymentInfo
+			payinfo.SupplierId = list.SupplierId
+			payinfo.SupplierCertId = list.CerId
+			payinfo.PayType = "2"
+			payinfo.IsPay = "1"
+			payinfo.Amount = strconv.FormatFloat(Amount,'E',-1,64)
+			payinfo.CreateUserId = list.CreateUserId
+			payinfo.CreateBy = list.CreateBy
+			payinfo.CreateOn = time.Now()
+			paysvc.InsertEntity(&payinfo)
+			//paysvc.AddPaymentinfo(list.SupplierId, list.Id, Amount, "2")
 			errinfo.Message = "提交成功!"
 			errinfo.Message = "提交成功!"
 			errinfo.Code = 0
 			errinfo.Code = 0
 			this.Data["json"] = &errinfo
 			this.Data["json"] = &errinfo

+ 1 - 1
src/dashoo.cn/backend/api/controllers/oilsupplier/paymentinfo.go

@@ -47,7 +47,7 @@ func (this *PaymentInfoController) GetEntityList() {
 	svcPerm := permission.GetPermissionService(utils.DBE)
 	svcPerm := permission.GetPermissionService(utils.DBE)
 	isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.marketAccess.AllRecord")
 	isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.marketAccess.AllRecord")
 	if !svcPerm.IsAdmin(this.User.Id) && !isauth {
 	if !svcPerm.IsAdmin(this.User.Id) && !isauth {
-		where = where + " and c.CreateUserId = '" + this.User.Id + "'"
+		where = where + " and p.CreateUserId = '" + this.User.Id + "'"
 	}
 	}
 
 
 	var paylist []paymentinfo.PaymentinfoList
 	var paylist []paymentinfo.PaymentinfoList

+ 11 - 9
src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercert.go

@@ -921,15 +921,17 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 					} else if supplierCertEntity.SupplierTypeCode == suppliercert.TECH_TYPECODE {
 					} else if supplierCertEntity.SupplierTypeCode == suppliercert.TECH_TYPECODE {
 						Amount = 8000
 						Amount = 8000
 					}
 					}
-					//var payinfo paymentinfo.OilPaymentInfo
-					//payinfo.SupplierId = supplierCertEntity.SupplierId
-					//payinfo.SupplierCertId = supplierCertEntity.Id
-					//payinfo.PayType = "1"
-					//payinfo.Amount = strconv.FormatFloat(Amount,'E',-1,64)
-					//payinfo.CreateUserId = supplierCertEntity.CreateUserId
-					//payinfo.CreateBy = supplierCertEntity.CreateBy
-					//paysvc.InsertEntity(&payinfo)
-					paysvc.AddPaymentinfo(supplierCertEntity.SupplierId, supplierCertEntity.Id, Amount, "1")
+					var payinfo paymentinfo.OilPaymentInfo
+					payinfo.SupplierId = supplierCertEntity.SupplierId
+					payinfo.SupplierCertId = supplierCertEntity.Id
+					payinfo.PayType = "1"
+					payinfo.Amount = strconv.FormatFloat(Amount,'E',-1,64)
+					payinfo.IsPay = "1"
+					payinfo.CreateUserId = supplierCertEntity.CreateUserId
+					payinfo.CreateBy = supplierCertEntity.CreateBy
+					payinfo.CreateOn = time.Now()
+					paysvc.InsertEntity(&payinfo)
+					//paysvc.AddPaymentinfo(supplierCertEntity.SupplierId, supplierCertEntity.Id, Amount, "1")
 					supplierCertEntity.Status = status
 					supplierCertEntity.Status = status
 					supplierCertEntity.Step = step
 					supplierCertEntity.Step = step
 					cols := []string{
 					cols := []string{

+ 11 - 1
src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercertappend.go

@@ -682,7 +682,17 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 					} else if supplierCertAppendEntity.AppendType == "03" {
 					} else if supplierCertAppendEntity.AppendType == "03" {
 						Amount = 8000
 						Amount = 8000
 					}
 					}
-					paysvc.AddPaymentinfo(supplierCertAppendEntity.SupplierId, supplierCertAppendEntity.Id, Amount, "3")
+					var payinfo paymentinfo.OilPaymentInfo
+					payinfo.SupplierId = supplierCertAppendEntity.SupplierId
+					payinfo.SupplierCertId = supplierCertAppendEntity.SupplierCertId
+					payinfo.PayType = "3"
+					payinfo.IsPay = "1"
+					payinfo.Amount = strconv.FormatFloat(Amount,'E',-1,64)
+					payinfo.CreateUserId = supplierCertAppendEntity.CreateUserId
+					payinfo.CreateBy = supplierCertAppendEntity.CreateBy
+					payinfo.CreateOn = time.Now()
+					paysvc.InsertEntity(&payinfo)
+					//paysvc.AddPaymentinfo(supplierCertAppendEntity.SupplierId, supplierCertAppendEntity.Id, Amount, "3")
 				}
 				}
 			}
 			}
 			errinfo.Message = "提交成功!"
 			errinfo.Message = "提交成功!"