|
|
@@ -169,26 +169,26 @@ func SaveOrderHandler(r *ghttp.Request) {
|
|
|
if err := g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
|
|
|
//todo 插入订单表
|
|
|
if _, err := g.DB().Ctx(ctx).Insert(ctx, "dataexport_order", g.Map{
|
|
|
- "order_code": orderCode,
|
|
|
- "order_money": param.OrderMoney,
|
|
|
- "pay_money": param.ContractMoney,
|
|
|
- "pay_way": param.PayType,
|
|
|
- "product_type": getProductNameByMasterKey(masterKey),
|
|
|
- "order_status": 0,
|
|
|
- "user_phone": param.PersonPhone,
|
|
|
- "company_name": param.CompanyName,
|
|
|
- "is_backstage_order": 1,
|
|
|
- "commission": param.ChannelCommission,
|
|
|
- "order_channel": param.OrderChannel,
|
|
|
- "create_person": userName,
|
|
|
- "last_update_person": userName,
|
|
|
- "salesperson_entUserId": entUserId,
|
|
|
- "signing_subject": param.PaybackCompany,
|
|
|
- "audit_status": common.If(param.Save == 1, 0, 1),
|
|
|
- "buy_subject": param.BuySubject,
|
|
|
- "payment_user": param.PaymentUser,
|
|
|
- "zero_type": param.ZeroOrderType,
|
|
|
- "mark": param.OrderRemark,
|
|
|
+ "order_code": orderCode,
|
|
|
+ "order_money": param.OrderMoney,
|
|
|
+ "pay_money": param.ContractMoney,
|
|
|
+ "pay_way": param.PayType,
|
|
|
+ "product_type": getProductNameByMasterKey(masterKey),
|
|
|
+ "order_status": 0,
|
|
|
+ "user_phone": param.PersonPhone,
|
|
|
+ "company_name": param.CompanyName,
|
|
|
+ "is_backstage_order": 1,
|
|
|
+ "commission": param.ChannelCommission,
|
|
|
+ "order_channel": param.OrderChannel,
|
|
|
+ "create_person": userName,
|
|
|
+ "last_update_person": userName,
|
|
|
+ "salesperson_id": entUserId,
|
|
|
+ "signing_subject": param.PaybackCompany,
|
|
|
+ "audit_status": common.If(param.Save == 1, 0, 1),
|
|
|
+ "buy_subject": param.BuySubject,
|
|
|
+ "payment_user": param.PaymentUser,
|
|
|
+ "zero_type": param.ZeroOrderType,
|
|
|
+ "mark": param.OrderRemark,
|
|
|
}); err != nil {
|
|
|
return gerror.Wrap(err, "插入订单表异常")
|
|
|
}
|
|
|
@@ -252,25 +252,25 @@ func UpdateOrderHandler(r *ghttp.Request) {
|
|
|
//数据库操作
|
|
|
if err := g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
|
|
|
upOrder := g.Map{
|
|
|
- "order_money": param.OrderMoney,
|
|
|
- "pay_money": param.ContractMoney,
|
|
|
- "pay_way": param.PayType,
|
|
|
- "product_type": getProductNameByMasterKey(masterKey),
|
|
|
- "order_status": param.OrderStatus,
|
|
|
- "user_phone": param.PersonPhone,
|
|
|
- "company_name": param.CompanyName,
|
|
|
- "is_backstage_order": 1,
|
|
|
- "commission": param.ChannelCommission,
|
|
|
- "order_channel": param.OrderChannel,
|
|
|
- "create_person": userName,
|
|
|
- "last_update_person": userName,
|
|
|
- "salesperson_entUserId": entUserId,
|
|
|
- "signing_subject": param.PaybackCompany,
|
|
|
- "audit_status": common.If(param.Save == 1, 0, 1),
|
|
|
- "buy_subject": param.BuySubject,
|
|
|
- "payment_user": param.PaymentUser,
|
|
|
- "zero_type": param.ZeroOrderType,
|
|
|
- "mark": param.OrderRemark,
|
|
|
+ "order_money": param.OrderMoney,
|
|
|
+ "pay_money": param.ContractMoney,
|
|
|
+ "pay_way": param.PayType,
|
|
|
+ "product_type": getProductNameByMasterKey(masterKey),
|
|
|
+ "order_status": param.OrderStatus,
|
|
|
+ "user_phone": param.PersonPhone,
|
|
|
+ "company_name": param.CompanyName,
|
|
|
+ "is_backstage_order": 1,
|
|
|
+ "commission": param.ChannelCommission,
|
|
|
+ "order_channel": param.OrderChannel,
|
|
|
+ "create_person": userName,
|
|
|
+ "last_update_person": userName,
|
|
|
+ "salesperson_id": entUserId,
|
|
|
+ "signing_subject": param.PaybackCompany,
|
|
|
+ "audit_status": common.If(param.Save == 1, 0, 1),
|
|
|
+ "buy_subject": param.BuySubject,
|
|
|
+ "payment_user": param.PaymentUser,
|
|
|
+ "zero_type": param.ZeroOrderType,
|
|
|
+ "mark": param.OrderRemark,
|
|
|
}
|
|
|
//退回单子重新编辑提交后更改审核状态
|
|
|
if auditStatus := gconv.Int(orderRes.Map()["audit_status"]); auditStatus < 0 {
|
