From 4af9a94256e5109a6b09a6e3e61f72c43e80db50 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 28 八月 2023 11:48:07 +0800
Subject: [PATCH] update
---
api/v1/purchase/purchase.go | 34 ++++++++++++++++-
.gitignore | 3 +
model/purchase/purchase.go | 10 +++++
.idea/srm.iml | 7 ---
config.yaml | 2
service/purchase/purchase.go | 26 ++++++++++--
6 files changed, 67 insertions(+), 15 deletions(-)
diff --git a/.gitignore b/.gitignore
index 4cfec98..1ed3e86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,4 +22,5 @@
*.exe
*.test
/log/*
-
+srm
+.idea
diff --git a/.idea/srm.iml b/.idea/srm.iml
index 5e764c4..7ee078d 100644
--- a/.idea/srm.iml
+++ b/.idea/srm.iml
@@ -1,9 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
+<module version="4">
<component name="Go" enabled="true" />
- <component name="NewModuleRootManager">
- <content url="file://$MODULE_DIR$" />
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
</module>
\ No newline at end of file
diff --git a/api/v1/purchase/purchase.go b/api/v1/purchase/purchase.go
index 4151621..d68781c 100644
--- a/api/v1/purchase/purchase.go
+++ b/api/v1/purchase/purchase.go
@@ -130,12 +130,12 @@
// GetPurchaseList
// @Tags Purchase
-// @Summary 鍒嗛〉鑾峰彇鏉冮檺閲囪喘鍗曞垪琛�
+// @Summary 鍒嗛〉鑾峰彇閲囪喘鍗曞垪琛�
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data query request.PageInfo true "椤电爜, 姣忛〉澶у皬"
-// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "鍒嗛〉鑾峰彇鏉冮檺閲囪喘鍗曞垪琛�,杩斿洖鍖呮嫭鍒楄〃,鎬绘暟,椤电爜,姣忛〉鏁伴噺"
+// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "鍒嗛〉鑾峰彇閲囪喘鍗曞垪琛�,杩斿洖鍖呮嫭鍒楄〃,鎬绘暟,椤电爜,姣忛〉鏁伴噺"
// @Router /purchase/purchaseList [get]
func (e *PurchaseApi) GetPurchaseList(c *gin.Context) {
var pageInfo request.PageInfo
@@ -162,3 +162,33 @@
PageSize: pageInfo.PageSize,
}, "鑾峰彇鎴愬姛", c)
}
+
+// Submit
+// @Tags Purchase
+// @Summary 鎻愪氦閲囪喘鍗�
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param id path int true "閲囪喘鍗旾D"
+// @Success 200 {object} response.Response{msg=string} "鎻愪氦閲囪喘鍗�"
+// @Router /purchase/submit/{id} [post]
+func (e *PurchaseApi) Submit(c *gin.Context) {
+ var params purchaserequest.AddPurchase
+ err := c.ShouldBindJSON(¶ms)
+ if err != nil {
+ response.FailWithMessage(err.Error(), c)
+ return
+ }
+ err = utils.Verify(params.Purchase.GVA_MODEL, utils.IdVerify)
+ if err != nil {
+ response.FailWithMessage(err.Error(), c)
+ return
+ }
+ err = service.NewPurchaseService().UpdatePurchase(¶ms)
+ if err != nil {
+ global.GVA_LOG.Error("鏇存柊澶辫触!", zap.Error(err))
+ response.FailWithMessage("鏇存柊澶辫触", c)
+ return
+ }
+ response.OkWithMessage("鏇存柊鎴愬姛", c)
+}
diff --git a/config.yaml b/config.yaml
index 2a23c43..d1b7fd9 100644
--- a/config.yaml
+++ b/config.yaml
@@ -177,7 +177,7 @@
db-type: mysql
oss-type: local
router-prefix: "/api"
- addr: 8889
+ addr: 8004
iplimit-count: 15000
iplimit-time: 3600
use-multipoint: false
diff --git a/model/purchase/purchase.go b/model/purchase/purchase.go
index fb16d80..2c08f7f 100644
--- a/model/purchase/purchase.go
+++ b/model/purchase/purchase.go
@@ -14,4 +14,14 @@
SigningDate string `json:"signingDate" form:"signingDate" gorm:"type:varchar(255);not null;default '';comment:绛剧害鏃ユ湡"` // 绛剧害鏃ユ湡
DeliveryDate string `json:"deliveryDate" form:"deliveryDate" gorm:"type:varchar(255);not null;default '';comment:浜や粯鏃ユ湡"` //浜や粯鏃ユ湡
Remark string `json:"remark" form:"remark" gorm:"type:varchar(1000);not null;default '';comment:澶囨敞"` //澶囨敞
+ Status string `json:"remark" form:"remark" gorm:"type:varchar(1000);not null;default '';comment:澶囨敞"` //澶囨敞
}
+
+type OrderStatus int
+
+const (
+// PurchaseOrderStatusConfirmed OrderStatus = 1 //宸蹭笅鍗�
+// PurchaseOrderStatusReceived OrderStatus = 2 //宸插埌璐�
+// PurchaseOrderStatus OrderStatus = 3 //宸插叆搴�
+// PurchaseOrderStatusReceived OrderStatus = 4 //宸插畬鎴�
+)
diff --git a/service/purchase/purchase.go b/service/purchase/purchase.go
index b643f2f..6267575 100644
--- a/service/purchase/purchase.go
+++ b/service/purchase/purchase.go
@@ -17,7 +17,7 @@
//@function: CreatePurchase
//@description: 鍒涘缓閲囪喘鍗�
-//@param: e model.Purchase
+//@param: params *purchaserequest.AddPurchase
//@return: err error
func (exa *PurchaseService) CreatePurchase(params purchaserequest.AddPurchase) (err error) {
@@ -35,9 +35,9 @@
return err
}
-//@function: DeleteFileChunk
+//@function: DeletePurchase
//@description: 鍒犻櫎閲囪喘鍗�
-//@param: e model.Purchase
+//@param: id uint
//@return: err error
func (exa *PurchaseService) DeletePurchase(id uint) (err error) {
@@ -53,7 +53,7 @@
//@function: UpdatePurchase
//@description: 鏇存柊閲囪喘鍗�
-//@param: e *model.Purchase
+//@param: params *purchaserequest.AddPurchase
//@return: err error
func (exa *PurchaseService) UpdatePurchase(params *purchaserequest.AddPurchase) (err error) {
@@ -113,7 +113,7 @@
//@function: GetPurchaseProductList
//@description: 鍒嗛〉鑾峰彇閲囪喘鍗曚骇鍝佸垪琛�
-//@param: sysUserAuthorityID string
+//@param: purchaseId int
//@return: list interface{}, err error
func (exa *PurchaseService) GetPurchaseProductList(purchaseId uint) (list []*purchase.PurchaseProducts, err error) {
@@ -122,3 +122,19 @@
err = db.Where("purchase_id = ?", purchaseId).Find(&list).Error
return list, err
}
+
+//@function: Submit
+//@description: 鎻愪氦閲囪喘鍗�
+//@param: id uint
+//@return: err error
+
+func (exa *PurchaseService) Submit(id uint) (err error) {
+ err = global.GVA_DB.Transaction(func(tx *gorm.DB) error {
+ err = global.GVA_DB.Where("id = ?", id).Model(&purchase.Purchase{}).Updates(map[string]interface{}{"status": 1}).Error
+ if err != nil {
+ return err
+ }
+ return global.GVA_DB.Where("purchase_id = ?", id).Delete(&purchase.PurchaseProducts{}).Error
+ })
+ return err
+}
--
Gitblit v1.8.0