正在显示
12 个修改的文件
包含
53 行增加
和
24 行删除
@@ -2,6 +2,7 @@ package service | @@ -2,6 +2,7 @@ package service | ||
2 | 2 | ||
3 | import ( | 3 | import ( |
4 | "fmt" | 4 | "fmt" |
5 | + "strings" | ||
5 | "time" | 6 | "time" |
6 | 7 | ||
7 | "github.com/astaxie/beego/logs" | 8 | "github.com/astaxie/beego/logs" |
@@ -940,6 +941,7 @@ func (service OrderInfoService) buildOrderBestshopInfoData(orderBase *domain.Ord | @@ -940,6 +941,7 @@ func (service OrderInfoService) buildOrderBestshopInfoData(orderBase *domain.Ord | ||
940 | detail["productCodes"] = v.Sn | 941 | detail["productCodes"] = v.Sn |
941 | detail["commodityCode"] = v.Bn | 942 | detail["commodityCode"] = v.Bn |
942 | } | 943 | } |
944 | + productDetail = append(productDetail, detail) | ||
943 | } | 945 | } |
944 | product["detail"] = productDetail | 946 | product["detail"] = productDetail |
945 | modifyLog := []map[string]interface{}{} | 947 | modifyLog := []map[string]interface{}{} |
@@ -955,7 +957,10 @@ func (service OrderInfoService) buildOrderBestshopInfoData(orderBase *domain.Ord | @@ -955,7 +957,10 @@ func (service OrderInfoService) buildOrderBestshopInfoData(orderBase *domain.Ord | ||
955 | d := map[string]string{ | 957 | d := map[string]string{ |
956 | "updateTitle": vv.Title, | 958 | "updateTitle": vv.Title, |
957 | "id": fmt.Sprint(ii), | 959 | "id": fmt.Sprint(ii), |
958 | - "content": fmt.Sprintf("%s:%s;%s", vv.Item, vv.Action, vv.Result), | 960 | + "content": vv.Item, |
961 | + } | ||
962 | + if len(vv.Action) > 0 { | ||
963 | + d["content"] = vv.Item + ":" + strings.Join(vv.Action, ";") | ||
959 | } | 964 | } |
960 | detail = append(detail, d) | 965 | detail = append(detail, d) |
961 | } | 966 | } |
@@ -63,7 +63,7 @@ type OrderBestshopRepository interface { | @@ -63,7 +63,7 @@ type OrderBestshopRepository interface { | ||
63 | type OrderGoodBestShop struct { | 63 | type OrderGoodBestShop struct { |
64 | Id int64 `json:"id"` | 64 | Id int64 `json:"id"` |
65 | //订单id | 65 | //订单id |
66 | - OrdeId int64 `json:"orderId"` | 66 | + OrderId int64 `json:"orderId"` |
67 | //货品编号 | 67 | //货品编号 |
68 | Sn string `json:"sn"` | 68 | Sn string `json:"sn"` |
69 | //商品编号 | 69 | //商品编号 |
@@ -18,18 +18,7 @@ const ( | @@ -18,18 +18,7 @@ const ( | ||
18 | type OrderLogDescript struct { | 18 | type OrderLogDescript struct { |
19 | Title string `json:"title"` //标题 | 19 | Title string `json:"title"` //标题 |
20 | Item string `json:"item"` //修改的项目 | 20 | Item string `json:"item"` //修改的项目 |
21 | - Action string `json:"action"` //执行的操作 | ||
22 | - Result string `json:"result"` //结果 | ||
23 | -} | ||
24 | - | ||
25 | -//OrderLogContentItem 记录订单的相关属性值的修改 | ||
26 | -type OrderLogContent struct { | ||
27 | - OrderId string `json:"orderId"` //订单id | ||
28 | - GoodId string `json:"goodId"` //货品id | ||
29 | - Table string `json:"Table"` //名称标题 | ||
30 | - Item string `json:"item"` //修改的数据字段 | ||
31 | - FormerValue string `json:"formerValue"` //旧值 | ||
32 | - NewValue string `json:"newValue"` //新值 | 21 | + Action []string `json:"action"` //执行的操作 |
33 | } | 22 | } |
34 | 23 | ||
35 | //OrderLog 订单修改记录 | 24 | //OrderLog 订单修改记录 |
@@ -42,7 +31,6 @@ type OrderLog struct { | @@ -42,7 +31,6 @@ type OrderLog struct { | ||
42 | OperatorType string `json:"operatorType"` //操作人员的类型 | 31 | OperatorType string `json:"operatorType"` //操作人员的类型 |
43 | LogAction string `json:"logAction"` //执行动作 | 32 | LogAction string `json:"logAction"` //执行动作 |
44 | Descript []OrderLogDescript `json:"descript"` //描述日志内容 | 33 | Descript []OrderLogDescript `json:"descript"` //描述日志内容 |
45 | - Content []OrderLogContent `json:"content"` //记录订单的操作动作 | ||
46 | DataFrom string `json:"dataFrom"` //修改操作的来源:"web_admin" | 34 | DataFrom string `json:"dataFrom"` //修改操作的来源:"web_admin" |
47 | } | 35 | } |
48 | 36 |
@@ -4,7 +4,7 @@ type OrderGoodBestshop struct { | @@ -4,7 +4,7 @@ type OrderGoodBestshop struct { | ||
4 | tableName struct{} `pg:"order_good_bestshop"` | 4 | tableName struct{} `pg:"order_good_bestshop"` |
5 | Id int64 | 5 | Id int64 |
6 | //订单id | 6 | //订单id |
7 | - OrdeId int64 | 7 | + OrderId int64 |
8 | //货品编号 | 8 | //货品编号 |
9 | Sn string | 9 | Sn string |
10 | //商品编号 | 10 | //商品编号 |
@@ -19,7 +19,6 @@ type OrderLog struct { | @@ -19,7 +19,6 @@ type OrderLog struct { | ||
19 | OperatorType string `` //操作人员的类型 | 19 | OperatorType string `` //操作人员的类型 |
20 | LogAction string `` //执行动作 | 20 | LogAction string `` //执行动作 |
21 | Descript []domain.OrderLogDescript `` //描述日志内容 | 21 | Descript []domain.OrderLogDescript `` //描述日志内容 |
22 | - Content []domain.OrderLogContent `` //记录订单的操作动作 | ||
23 | DataFrom string `` //修改操作的来源:"web_admin" | 22 | DataFrom string `` //修改操作的来源:"web_admin" |
24 | } | 23 | } |
25 | 24 |
@@ -42,6 +42,8 @@ func (reponsitory OrderBaseRepository) transformPgModelToDomainModel(orderModel | @@ -42,6 +42,8 @@ func (reponsitory OrderBaseRepository) transformPgModelToDomainModel(orderModel | ||
42 | }, | 42 | }, |
43 | BonusStatus: orderModel.BonusStatus, | 43 | BonusStatus: orderModel.BonusStatus, |
44 | CompanyId: orderModel.CompanyId, | 44 | CompanyId: orderModel.CompanyId, |
45 | + DataFrom: orderModel.DataFrom, | ||
46 | + Remark: orderModel.Remark, | ||
45 | } | 47 | } |
46 | return order, nil | 48 | return order, nil |
47 | } | 49 | } |
@@ -62,7 +64,8 @@ func (repository OrderBaseRepository) Save(orderInfo *domain.OrderBase) error { | @@ -62,7 +64,8 @@ func (repository OrderBaseRepository) Save(orderInfo *domain.OrderBase) error { | ||
62 | PartnerBonusHas: orderInfo.OrderCompute.PartnerBonusHas, PartnerBonusNot: orderInfo.OrderCompute.PartnerBonusNot, | 64 | PartnerBonusHas: orderInfo.OrderCompute.PartnerBonusHas, PartnerBonusNot: orderInfo.OrderCompute.PartnerBonusNot, |
63 | PartnerBonusExpense: orderInfo.OrderCompute.PartnerBonusExpense, IsDisable: orderInfo.IsDisable, | 65 | PartnerBonusExpense: orderInfo.OrderCompute.PartnerBonusExpense, IsDisable: orderInfo.IsDisable, |
64 | CreateTime: orderInfo.CreateTime, BonusStatus: orderInfo.BonusStatus, | 66 | CreateTime: orderInfo.CreateTime, BonusStatus: orderInfo.BonusStatus, |
65 | - CompanyId: orderInfo.CompanyId, | 67 | + CompanyId: orderInfo.CompanyId, DataFrom: orderInfo.DataFrom, |
68 | + Remark: orderInfo.Remark, | ||
66 | } | 69 | } |
67 | if m.Id == 0 { | 70 | if m.Id == 0 { |
68 | _, err = tx.Model(m). | 71 | _, err = tx.Model(m). |
@@ -26,7 +26,7 @@ func NewOrderGoodBestshopRepository(transactionContext *transaction.TransactionC | @@ -26,7 +26,7 @@ func NewOrderGoodBestshopRepository(transactionContext *transaction.TransactionC | ||
26 | func (respository OrderGoodBestshopRepository) transformPgModelToDomainModel(orderGoodModel *models.OrderGoodBestshop) (orderGood domain.OrderGoodBestShop, err error) { | 26 | func (respository OrderGoodBestshopRepository) transformPgModelToDomainModel(orderGoodModel *models.OrderGoodBestshop) (orderGood domain.OrderGoodBestShop, err error) { |
27 | return domain.OrderGoodBestShop{ | 27 | return domain.OrderGoodBestShop{ |
28 | Id: orderGoodModel.Id, | 28 | Id: orderGoodModel.Id, |
29 | - OrdeId: orderGoodModel.OrdeId, | 29 | + OrderId: orderGoodModel.OrderId, |
30 | Sn: orderGoodModel.Sn, | 30 | Sn: orderGoodModel.Sn, |
31 | Bn: orderGoodModel.Bn, | 31 | Bn: orderGoodModel.Bn, |
32 | Name: orderGoodModel.Name, | 32 | Name: orderGoodModel.Name, |
@@ -40,7 +40,7 @@ func (respository OrderGoodBestshopRepository) Add(good *domain.OrderGoodBestSho | @@ -40,7 +40,7 @@ func (respository OrderGoodBestshopRepository) Add(good *domain.OrderGoodBestSho | ||
40 | tx := respository.transactionContext.GetDB() | 40 | tx := respository.transactionContext.GetDB() |
41 | m := models.OrderGoodBestshop{ | 41 | m := models.OrderGoodBestshop{ |
42 | Id: good.Id, | 42 | Id: good.Id, |
43 | - OrdeId: good.OrdeId, | 43 | + OrderId: good.OrderId, |
44 | Sn: good.Sn, | 44 | Sn: good.Sn, |
45 | Bn: good.Bn, | 45 | Bn: good.Bn, |
46 | Name: good.Name, | 46 | Name: good.Name, |
@@ -40,6 +40,8 @@ func (reponsitory OrderGoodRepository) transformPgModelToDomainModel(orderModel | @@ -40,6 +40,8 @@ func (reponsitory OrderGoodRepository) transformPgModelToDomainModel(orderModel | ||
40 | PartnerBonusExpense: orderModel.PartnerBonusExpense, | 40 | PartnerBonusExpense: orderModel.PartnerBonusExpense, |
41 | }, | 41 | }, |
42 | CompanyId: orderModel.CompanyId, | 42 | CompanyId: orderModel.CompanyId, |
43 | + RemarkReason: orderModel.RemarkReason, | ||
44 | + DataFrom: orderModel.DataFrom, | ||
43 | } | 45 | } |
44 | switch orderModel.BonusStatus { | 46 | switch orderModel.BonusStatus { |
45 | case domain.OrderGoodWaitPay: | 47 | case domain.OrderGoodWaitPay: |
@@ -64,8 +66,9 @@ func (repository OrderGoodRepository) Save(data []domain.OrderGood) error { | @@ -64,8 +66,9 @@ func (repository OrderGoodRepository) Save(data []domain.OrderGood) error { | ||
64 | PlanPartnerBonus: v.GoodCompute.PlanPartnerBonus, UsePartnerBonus: v.GoodCompute.UsePartnerBonus, | 66 | PlanPartnerBonus: v.GoodCompute.PlanPartnerBonus, UsePartnerBonus: v.GoodCompute.UsePartnerBonus, |
65 | PartnerBonusHas: v.GoodCompute.PartnerBonusHas, PartnerBonusNot: v.GoodCompute.PartnerBonusNot, | 67 | PartnerBonusHas: v.GoodCompute.PartnerBonusHas, PartnerBonusNot: v.GoodCompute.PartnerBonusNot, |
66 | PartnerBonusExpense: v.GoodCompute.PartnerBonusExpense, BonusStatus: v.BonusStatus, | 68 | PartnerBonusExpense: v.GoodCompute.PartnerBonusExpense, BonusStatus: v.BonusStatus, |
67 | - Remark: v.Remark, | ||
68 | - CompanyId: v.CompanyId, | 69 | + Remark: v.Remark, CompanyId: v.CompanyId, |
70 | + RemarkReason: v.RemarkReason, | ||
71 | + DataFrom: v.DataFrom, | ||
69 | } | 72 | } |
70 | if v.Id == 0 { | 73 | if v.Id == 0 { |
71 | _, err = tx.Model(m). | 74 | _, err = tx.Model(m). |
@@ -33,7 +33,6 @@ func (repository OrderLogRepository) transformPgModelToDomainModel(m *models.Ord | @@ -33,7 +33,6 @@ func (repository OrderLogRepository) transformPgModelToDomainModel(m *models.Ord | ||
33 | LogAction: m.LogAction, | 33 | LogAction: m.LogAction, |
34 | Descript: m.Descript, | 34 | Descript: m.Descript, |
35 | DataFrom: m.DataFrom, | 35 | DataFrom: m.DataFrom, |
36 | - Content: m.Content, | ||
37 | }, nil | 36 | }, nil |
38 | } | 37 | } |
39 | 38 | ||
@@ -46,7 +45,6 @@ func (repository OrderLogRepository) Add(data *domain.OrderLog) error { | @@ -46,7 +45,6 @@ func (repository OrderLogRepository) Add(data *domain.OrderLog) error { | ||
46 | OperatorType: data.OperatorType, | 45 | OperatorType: data.OperatorType, |
47 | LogAction: data.LogAction, | 46 | LogAction: data.LogAction, |
48 | Descript: data.Descript, | 47 | Descript: data.Descript, |
49 | - Content: data.Content, | ||
50 | DataFrom: data.DataFrom, | 48 | DataFrom: data.DataFrom, |
51 | } | 49 | } |
52 | _, err := db.Model(&m).Insert() | 50 | _, err := db.Model(&m).Insert() |
@@ -278,3 +278,33 @@ func (c *OrderDividendController) EditOrderDividend() { | @@ -278,3 +278,33 @@ func (c *OrderDividendController) EditOrderDividend() { | ||
278 | c.ResponseData(nil) | 278 | c.ResponseData(nil) |
279 | return | 279 | return |
280 | } | 280 | } |
281 | + | ||
282 | +//OrderDividendDetailForBestshop 海鲜干货的订单分红详情 | ||
283 | +func (c *OrderDividendController) OrderDividendDetailForBestshop() { | ||
284 | + type Parameter struct { | ||
285 | + Id string `json:"id"` | ||
286 | + } | ||
287 | + var ( | ||
288 | + param Parameter | ||
289 | + err error | ||
290 | + ) | ||
291 | + if err = c.BindJsonData(¶m); err != nil { | ||
292 | + logs.Error(err) | ||
293 | + c.ResponseError(errors.New("json数据解析失败")) | ||
294 | + return | ||
295 | + } | ||
296 | + orderid, _ := strconv.ParseInt(param.Id, 10, 64) | ||
297 | + if orderid == 0 { | ||
298 | + c.ResponseError(errors.New("参数错误")) | ||
299 | + return | ||
300 | + } | ||
301 | + companyId := c.GetUserCompany() | ||
302 | + orderSrv := orderService.NewOrderInfoService(nil) | ||
303 | + respData, err := orderSrv.GetOrderBestshopInfoWithBonus(orderid, companyId) | ||
304 | + if err != nil { | ||
305 | + c.ResponseError(err) | ||
306 | + return | ||
307 | + } | ||
308 | + c.ResponseData(respData) | ||
309 | + return | ||
310 | +} |
@@ -29,6 +29,7 @@ func init() { | @@ -29,6 +29,7 @@ func init() { | ||
29 | beego.NSRouter("/list", &controllers.OrderDividendController{}, "POST:PageListOrderDividend"), | 29 | beego.NSRouter("/list", &controllers.OrderDividendController{}, "POST:PageListOrderDividend"), |
30 | beego.NSRouter("/edit", &controllers.OrderDividendController{}, "POST:EditOrderDividend"), | 30 | beego.NSRouter("/edit", &controllers.OrderDividendController{}, "POST:EditOrderDividend"), |
31 | beego.NSRouter("/detail", &controllers.OrderDividendController{}, "POST:OrderDividendDetail"), | 31 | beego.NSRouter("/detail", &controllers.OrderDividendController{}, "POST:OrderDividendDetail"), |
32 | + beego.NSRouter("/mini-program/detail", &controllers.OrderDividendController{}, "POST:OrderDividendDetailForBestshop"), | ||
32 | 33 | ||
33 | beego.NSRouter("/business/detail", &controllers.BusinessBonusController{}, "POST:GetBusinessBonus"), | 34 | beego.NSRouter("/business/detail", &controllers.BusinessBonusController{}, "POST:GetBusinessBonus"), |
34 | beego.NSRouter("/business/edit", &controllers.BusinessBonusController{}, "POST:UpdateBusinessBonus"), | 35 | beego.NSRouter("/business/edit", &controllers.BusinessBonusController{}, "POST:UpdateBusinessBonus"), |
-
请 注册 或 登录 后发表评论