allied-creation / allied-creation-cooperation · 提交

转到一个项目

作者 陈志颖
提交 f3899d7fe90397973ab05745e524191561eff41f 1 个父辈 e9561cb0

feat:添加分红退货单接口

内嵌 并排对比
正在显示 10 个修改的文件 包含 444 行增加 和 0 行删除
package controllers
import (
"github.com/linmadan/egglib-go/web/beego"
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/application/dividendsReturnedOrder/command"
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/application/dividendsReturnedOrder/query"
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/application/dividendsReturnedOrder/service"
)
type DividendsReturnedOrderController struct {
beego.BaseController
}
func (controller *DividendsReturnedOrderController) CreateDividendsReturnedOrder() {
dividendsReturnedOrderService := service.NewDividendsReturnedOrderService(nil)
createDividendsReturnedOrderCommand := &command.CreateDividendsReturnedOrderCommand{}
controller.Unmarshal(createDividendsReturnedOrderCommand)
data, err := dividendsReturnedOrderService.CreateDividendsReturnedOrder(createDividendsReturnedOrderCommand)
controller.Response(data, err)
}
func (controller *DividendsReturnedOrderController) UpdateDividendsReturnedOrder() {
dividendsReturnedOrderService := service.NewDividendsReturnedOrderService(nil)
updateDividendsReturnedOrderCommand := &command.UpdateDividendsReturnedOrderCommand{}
controller.Unmarshal(updateDividendsReturnedOrderCommand)
dividendsReturnedOrderId := controller.GetString(":dividendsReturnedOrderId")
updateDividendsReturnedOrderCommand.DividendsReturnedOrderId = dividendsReturnedOrderId
data, err := dividendsReturnedOrderService.UpdateDividendsReturnedOrder(updateDividendsReturnedOrderCommand)
controller.Response(data, err)
}
func (controller *DividendsReturnedOrderController) GetDividendsReturnedOrder() {
dividendsReturnedOrderService := service.NewDividendsReturnedOrderService(nil)
getDividendsReturnedOrderQuery := &query.GetDividendsReturnedOrderQuery{}
dividendsReturnedOrderId := controller.GetString(":dividendsReturnedOrderId")
getDividendsReturnedOrderQuery.DividendsReturnedOrderId = dividendsReturnedOrderId
data, err := dividendsReturnedOrderService.GetDividendsReturnedOrder(getDividendsReturnedOrderQuery)
controller.Response(data, err)
}
func (controller *DividendsReturnedOrderController) RemoveDividendsReturnedOrder() {
dividendsReturnedOrderService := service.NewDividendsReturnedOrderService(nil)
removeDividendsReturnedOrderCommand := &command.RemoveDividendsReturnedOrderCommand{}
controller.Unmarshal(removeDividendsReturnedOrderCommand)
dividendsReturnedOrderId := controller.GetString(":dividendsReturnedOrderId")
removeDividendsReturnedOrderCommand.DividendsReturnedOrderId = dividendsReturnedOrderId
data, err := dividendsReturnedOrderService.RemoveDividendsReturnedOrder(removeDividendsReturnedOrderCommand)
controller.Response(data, err)
}
func (controller *DividendsReturnedOrderController) SearchDividendsReturnedOrder() {
dividendsReturnedOrderService := service.NewDividendsReturnedOrderService(nil)
searchDividendsReturnedOrderQuery := &query.SearchDividendsReturnedOrderQuery{}
data, err := dividendsReturnedOrderService.SearchDividendsReturnedOrder(searchDividendsReturnedOrderQuery)
controller.Response(data, err)
}
func (controller *DividendsReturnedOrderController) ImportDividendsReturnedOrder() {
dividendsReturnedOrderService := service.NewDividendsReturnedOrderService(nil)
importDividendsReturnedOrderCommand := &command.ImportDividendsReturnedOrderCommand{}
controller.Unmarshal(importDividendsReturnedOrderCommand)
data, err := dividendsReturnedOrderService.ImportDividendsReturnedOrder(importDividendsReturnedOrderCommand)
controller.Response(data, err)
}
func (controller *DividendsReturnedOrderController) ListDividendsReturnedOrder() {
dividendsReturnedOrderService := service.NewDividendsReturnedOrderService(nil)
listDividendsReturnedOrderQuery := &query.ListDividendsReturnedOrderQuery{}
offset, _ := controller.GetInt("offset")
listDividendsReturnedOrderQuery.Offset = offset
limit, _ := controller.GetInt("limit")
listDividendsReturnedOrderQuery.Limit = limit
data, err := dividendsReturnedOrderService.ListDividendsReturnedOrder(listDividendsReturnedOrderQuery)
controller.Response(data, err)
}
... ...
package routers
import (
"github.com/beego/beego/v2/server/web"
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/port/beego/controllers"
)
func init() {
web.Router("/dividends-returned-orders/", &controllers.DividendsReturnedOrderController{}, "Post:CreateDividendsReturnedOrder")
web.Router("/dividends-returned-orders/:dividendsReturnedOrderId", &controllers.DividendsReturnedOrderController{}, "Put:UpdateDividendsReturnedOrder")
web.Router("/dividends-returned-orders/:dividendsReturnedOrderId", &controllers.DividendsReturnedOrderController{}, "Get:GetDividendsReturnedOrder")
web.Router("/dividends-returned-orders/:dividendsReturnedOrderId", &controllers.DividendsReturnedOrderController{}, "Delete:RemoveDividendsReturnedOrder")
web.Router("/dividends-returned-orders/search", &controllers.DividendsReturnedOrderController{}, "Post:SearchDividendsReturnedOrder")
web.Router("/dividends-returned-orders/import", &controllers.DividendsReturnedOrderController{}, "Post:ImportDividendsReturnedOrder")
web.Router("/dividends-returned-orders/", &controllers.DividendsReturnedOrderController{}, "Get:ListDividendsReturnedOrder")
}
... ...
package dividends_returned_order
import (
"net/http"
"github.com/gavv/httpexpect"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
pG "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/pg"
)
var _ = Describe("创建分红退货单服务", func() {
Describe("提交数据创建分红退货单服务", func() {
Context("提交正确的新分红退货单实体数据", func() {
It("返回分红退货单实体数据", func() {
httpExpect := httpexpect.New(GinkgoT(), server.URL)
body := map[string]interface{}{
"dividendsReturnedOrderRefund": "float64",
"dividendsReturnedCustomerName": "string",
"originalOrderNum": "string",
"remarks": "string",
"dividendsReturnedDate": "datetime",
"regionName": "string",
"orderGoods": "array",
"companyId": "int64",
"orgId": "int64",
"userId": "int64",
}
httpExpect.POST("/dividends-returned-orders/").
WithJSON(body).
Expect().
Status(http.StatusOK).
JSON().
Object().
ContainsKey("code").ValueEqual("code", 0).
ContainsKey("msg").ValueEqual("msg", "ok").
ContainsKey("data").Value("data").Object().
ContainsKey("dividendsReturnedOrderId").ValueNotEqual("dividendsReturnedOrderId", BeZero())
})
})
})
AfterEach(func() {
_, err := pG.DB.Exec("DELETE FROM dividends_returned_orders WHERE true")
Expect(err).NotTo(HaveOccurred())
})
})
... ...
package dividends_returned_order
import (
"net/http"
"net/http/httptest"
"testing"
"github.com/beego/beego/v2/server/web"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
_ "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/application"
_ "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/pg"
_ "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/port/beego"
)
func TestDividendsReturnedOrder(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Beego Port DividendsReturnedOrder Correlations Test Case Suite")
}
var handler http.Handler
var server *httptest.Server
var _ = BeforeSuite(func() {
handler = web.BeeApp.Handlers
server = httptest.NewServer(handler)
})
var _ = AfterSuite(func() {
server.Close()
})
... ...
package dividends_returned_order
import (
"net/http"
"github.com/gavv/httpexpect"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
pG "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/pg"
)
var _ = Describe("返回分红退货单服务", func() {
var dividendsReturnedOrderId int64
BeforeEach(func() {
_, err := pG.DB.QueryOne(
pg.Scan(&dividendsReturnedOrderId),
"INSERT INTO dividends_returned_orders (dividends_returned_order_id, dividends_returned_order_number, dividends_returned_order_refund, original_order_num, dividends_order_number, dividends_returned_customer_name, dividends_returned_date, region, remarks, dividend_status, dividend_time, org, company, created_at, deleted_at, updated_at, operator, operate_time) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING dividends_returned_order_id",
"testDividendsReturnedOrderId", "testDividendsReturnedOrderNumber", "testDividendsReturnedOrderRefund", "testOriginalOrderNum", "testDividendsOrderNumber", "testDividendsReturnedCustomerName", "testDividendsReturnedDate", "testRegion", "testRemarks", "testDividendStatus", "testDividendTime", "testOrg", "testCompany", "testCreatedAt", "testDeletedAt", "testUpdatedAt", "testOperator", "testOperateTime")
Expect(err).NotTo(HaveOccurred())
})
Describe("根据dividendsReturnedOrderId参数返回分红退货单实体", func() {
Context("传入有效的dividendsReturnedOrderId", func() {
It("返回分红退货单实体数据", func() {
httpExpect := httpexpect.New(GinkgoT(), server.URL)
httpExpect.GET("/dividends-returned-orders/{dividendsReturnedOrderId}").
Expect().
Status(http.StatusOK).
JSON().
Object().
ContainsKey("code").ValueEqual("code", 0).
ContainsKey("msg").ValueEqual("msg", "ok").
ContainsKey("data").Value("data").Object()
})
})
})
AfterEach(func() {
_, err := pG.DB.Exec("DELETE FROM dividends_returned_orders WHERE true")
Expect(err).NotTo(HaveOccurred())
})
})
... ...
package dividends_returned_order
import (
"net/http"
"github.com/gavv/httpexpect"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
pG "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/pg"
)
var _ = Describe("导入分红退货单", func() {
var dividendsReturnedOrderId int64
BeforeEach(func() {
_, err := pG.DB.QueryOne(
pg.Scan(&dividendsReturnedOrderId),
"INSERT INTO dividends_returned_orders (dividends_returned_order_id, dividends_returned_order_number, dividends_returned_order_refund, original_order_num, dividends_order_number, dividends_returned_customer_name, dividends_returned_date, region, remarks, dividend_status, dividend_time, org, company, created_at, deleted_at, updated_at, operator, operate_time) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING dividends_returned_order_id",
"testDividendsReturnedOrderId", "testDividendsReturnedOrderNumber", "testDividendsReturnedOrderRefund", "testOriginalOrderNum", "testDividendsOrderNumber", "testDividendsReturnedCustomerName", "testDividendsReturnedDate", "testRegion", "testRemarks", "testDividendStatus", "testDividendTime", "testOrg", "testCompany", "testCreatedAt", "testDeletedAt", "testUpdatedAt", "testOperator", "testOperateTime")
Expect(err).NotTo(HaveOccurred())
})
Describe("导入分红退货单", func() {
Context("", func() {
It("", func() {
httpExpect := httpexpect.New(GinkgoT(), server.URL)
body := map[string]interface{}{
"file": "string",
"where": "string",
"companyId": "int64",
"orgId": "int64",
"userId": "int64",
}
httpExpect.POST("/dividends-returned-orders/import").
WithJSON(body).
Expect().
Status(http.StatusOK).
JSON().
Object().
ContainsKey("code").ValueEqual("code", 0).
ContainsKey("msg").ValueEqual("msg", "ok").
ContainsKey("data").Value("data").Object()
})
})
})
AfterEach(func() {
_, err := pG.DB.Exec("DELETE FROM dividends_returned_orders WHERE true")
Expect(err).NotTo(HaveOccurred())
})
})
... ...
package dividends_returned_order
import (
"net/http"
"github.com/gavv/httpexpect"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
pG "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/pg"
)
var _ = Describe("返回分红退货单服务列表", func() {
var dividendsReturnedOrderId int64
BeforeEach(func() {
_, err := pG.DB.QueryOne(
pg.Scan(&dividendsReturnedOrderId),
"INSERT INTO dividends_returned_orders (dividends_returned_order_id, dividends_returned_order_number, dividends_returned_order_refund, original_order_num, dividends_order_number, dividends_returned_customer_name, dividends_returned_date, region, remarks, dividend_status, dividend_time, org, company, created_at, deleted_at, updated_at, operator, operate_time) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING dividends_returned_order_id",
"testDividendsReturnedOrderId", "testDividendsReturnedOrderNumber", "testDividendsReturnedOrderRefund", "testOriginalOrderNum", "testDividendsOrderNumber", "testDividendsReturnedCustomerName", "testDividendsReturnedDate", "testRegion", "testRemarks", "testDividendStatus", "testDividendTime", "testOrg", "testCompany", "testCreatedAt", "testDeletedAt", "testUpdatedAt", "testOperator", "testOperateTime")
Expect(err).NotTo(HaveOccurred())
})
Describe("根据参数返回分红退货单实体列表", func() {
Context("传入有效的参数", func() {
It("返回分红退货单实体数据列表", func() {
httpExpect := httpexpect.New(GinkgoT(), server.URL)
httpExpect.GET("/dividends-returned-orders/").
WithQuery("offset", "int").
WithQuery("limit", "int").
Expect().
Status(http.StatusOK).
JSON().
Object().
ContainsKey("code").ValueEqual("code", 0).
ContainsKey("msg").ValueEqual("msg", "ok").
ContainsKey("data").Value("data").Object().
ContainsKey("count").ValueEqual("count", 1).
ContainsKey("dividendsReturnedOrders").Value("dividendsReturnedOrders").Array()
})
})
})
AfterEach(func() {
_, err := pG.DB.Exec("DELETE FROM dividends_returned_orders WHERE true")
Expect(err).NotTo(HaveOccurred())
})
})
... ...
package dividends_returned_order
import (
"net/http"
"github.com/gavv/httpexpect"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
pG "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/pg"
)
var _ = Describe("移除分红退货单服务", func() {
var dividendsReturnedOrderId int64
BeforeEach(func() {
_, err := pG.DB.QueryOne(
pg.Scan(&dividendsReturnedOrderId),
"INSERT INTO dividends_returned_orders (dividends_returned_order_id, dividends_returned_order_number, dividends_returned_order_refund, original_order_num, dividends_order_number, dividends_returned_customer_name, dividends_returned_date, region, remarks, dividend_status, dividend_time, org, company, created_at, deleted_at, updated_at, operator, operate_time) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING dividends_returned_order_id",
"testDividendsReturnedOrderId", "testDividendsReturnedOrderNumber", "testDividendsReturnedOrderRefund", "testOriginalOrderNum", "testDividendsOrderNumber", "testDividendsReturnedCustomerName", "testDividendsReturnedDate", "testRegion", "testRemarks", "testDividendStatus", "testDividendTime", "testOrg", "testCompany", "testCreatedAt", "testDeletedAt", "testUpdatedAt", "testOperator", "testOperateTime")
Expect(err).NotTo(HaveOccurred())
})
Describe("根据参数移除分红退货单服务", func() {
Context("传入有效的dividendsReturnedOrderId", func() {
It("返回被移除分红退货单实体的数据", func() {
httpExpect := httpexpect.New(GinkgoT(), server.URL)
httpExpect.DELETE("/dividends-returned-orders/{dividendsReturnedOrderId}").
Expect().
Status(http.StatusOK).
JSON().
Object().
ContainsKey("code").ValueEqual("code", 0).
ContainsKey("msg").ValueEqual("msg", "ok").
ContainsKey("data").Value("data").Object()
})
})
})
AfterEach(func() {
_, err := pG.DB.Exec("DELETE FROM dividends_returned_orders WHERE true")
Expect(err).NotTo(HaveOccurred())
})
})
... ...
package dividends_returned_order
import (
"net/http"
"github.com/gavv/httpexpect"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
pG "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/pg"
)
var _ = Describe("查找分红退货单", func() {
var dividendsReturnedOrderId int64
BeforeEach(func() {
_, err := pG.DB.QueryOne(
pg.Scan(&dividendsReturnedOrderId),
"INSERT INTO dividends_returned_orders (dividends_returned_order_id, dividends_returned_order_number, dividends_returned_order_refund, original_order_num, dividends_order_number, dividends_returned_customer_name, dividends_returned_date, region, remarks, dividend_status, dividend_time, org, company, created_at, deleted_at, updated_at, operator, operate_time) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING dividends_returned_order_id",
"testDividendsReturnedOrderId", "testDividendsReturnedOrderNumber", "testDividendsReturnedOrderRefund", "testOriginalOrderNum", "testDividendsOrderNumber", "testDividendsReturnedCustomerName", "testDividendsReturnedDate", "testRegion", "testRemarks", "testDividendStatus", "testDividendTime", "testOrg", "testCompany", "testCreatedAt", "testDeletedAt", "testUpdatedAt", "testOperator", "testOperateTime")
Expect(err).NotTo(HaveOccurred())
})
Describe("查找分红退货单", func() {
Context("", func() {
It("", func() {
httpExpect := httpexpect.New(GinkgoT(), server.URL)
body := map[string]interface{}{
"dividendsReturnedCustomerName": "string",
"dividendsReturnedOrderNumber": "string",
"pageSize": "int32",
"pageNumber": "int32",
"companyId": "int64",
"orgId": "int64",
"userId": "int64",
}
httpExpect.POST("/dividends-returned-orders/search").
WithJSON(body).
Expect().
Status(http.StatusOK).
JSON().
Object().
ContainsKey("code").ValueEqual("code", 0).
ContainsKey("msg").ValueEqual("msg", "ok").
ContainsKey("data").Value("data").Object()
})
})
})
AfterEach(func() {
_, err := pG.DB.Exec("DELETE FROM dividends_returned_orders WHERE true")
Expect(err).NotTo(HaveOccurred())
})
})
... ...
package dividends_returned_order
import (
"net/http"
"github.com/gavv/httpexpect"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
pG "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/pg"
)
var _ = Describe("更新分红退货单服务", func() {
var dividendsReturnedOrderId int64
BeforeEach(func() {
_, err := pG.DB.QueryOne(
pg.Scan(&dividendsReturnedOrderId),
"INSERT INTO dividends_returned_orders (dividends_returned_order_id, dividends_returned_order_number, dividends_returned_order_refund, original_order_num, dividends_order_number, dividends_returned_customer_name, dividends_returned_date, region, remarks, dividend_status, dividend_time, org, company, created_at, deleted_at, updated_at, operator, operate_time) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING dividends_returned_order_id",
"testDividendsReturnedOrderId", "testDividendsReturnedOrderNumber", "testDividendsReturnedOrderRefund", "testOriginalOrderNum", "testDividendsOrderNumber", "testDividendsReturnedCustomerName", "testDividendsReturnedDate", "testRegion", "testRemarks", "testDividendStatus", "testDividendTime", "testOrg", "testCompany", "testCreatedAt", "testDeletedAt", "testUpdatedAt", "testOperator", "testOperateTime")
Expect(err).NotTo(HaveOccurred())
})
Describe("提交数据更新分红退货单服务", func() {
Context("提交正确的分红退货单实体数据", func() {
It("返回更新后的分红退货单实体数据", func() {
httpExpect := httpexpect.New(GinkgoT(), server.URL)
body := map[string]interface{}{
"dividendsReturnedOrderRefund": "float64",
"dividendsReturnedCustomerName": "string",
"originalOrderNum": "string",
"remarks": "string",
"dividendsReturnedDate": "datetime",
"regionName": "string",
"orderGoods": "array",
"companyId": "int64",
"orgId": "int64",
"userId": "int64",
}
httpExpect.PUT("/dividends-returned-orders/{dividendsReturnedOrderId}").
WithJSON(body).
Expect().
Status(http.StatusOK).
JSON().
Object().
ContainsKey("code").ValueEqual("code", 0).
ContainsKey("msg").ValueEqual("msg", "ok").
ContainsKey("data").Value("data").Object().
ContainsKey("dividendsReturnedOrderId").ValueEqual("dividendsReturnedOrderId", dividendsReturnedOrderId)
})
})
})
AfterEach(func() {
_, err := pG.DB.Exec("DELETE FROM dividends_returned_orders WHERE true")
Expect(err).NotTo(HaveOccurred())
})
})
... ...