|
|
@@ -115,7 +115,7 @@ func createOtherOrder(param *CreateOtherOrderParams, code string) bool {
|
|
|
"vip_endtime": param.EndTime,
|
|
|
"order_status": param.OrderStatus,
|
|
|
"user_id": "",
|
|
|
- "return_status": 0,
|
|
|
+ "return_status": qutil.If(param.ContractMoney == 0, 1, 0),
|
|
|
"refund_status": 0,
|
|
|
"company_name": param.CompanyName,
|
|
|
"sale_time": qutil.If(param.SaleTime == "", nil, param.SaleTime), // 业务统计时间
|
|
|
@@ -271,7 +271,7 @@ func createEntnicheOrder(param *CreateOtherOrderParams, code string) bool {
|
|
|
"order_status": param.OrderStatus,
|
|
|
"user_id": "",
|
|
|
"pay_time": qutil.NowFormat(qutil.Date_Full_Layout),
|
|
|
- "return_status": 0,
|
|
|
+ "return_status": qutil.If(param.ContractMoney == 0, 1, 0),
|
|
|
"refund_status": 0,
|
|
|
"company_name": param.CompanyName,
|
|
|
"sale_time": param.SaleTime, // 业务统计时间
|
|
|
@@ -766,16 +766,16 @@ func createVipOrder(param *CreateOtherOrderParams, code string) (bool, string) {
|
|
|
}
|
|
|
}
|
|
|
payWay := "wx_app"
|
|
|
- returnStatus := 1
|
|
|
+ // returnStatus := 1
|
|
|
if param.ChargeMode == 1 {
|
|
|
- returnStatus = 0
|
|
|
+ // returnStatus = 0
|
|
|
if param.Pay_way == "" {
|
|
|
payWay = "transferAccounts"
|
|
|
}
|
|
|
}
|
|
|
- if param.ReturnStatus == 1 {
|
|
|
- returnStatus = 1
|
|
|
- }
|
|
|
+ // if param.ReturnStatus == 1 {
|
|
|
+ // returnStatus = 1
|
|
|
+ // }
|
|
|
if param.Badge != "" {
|
|
|
payWay = ""
|
|
|
}
|
|
|
@@ -814,7 +814,7 @@ func createVipOrder(param *CreateOtherOrderParams, code string) (bool, string) {
|
|
|
"order_status": param.OrderStatus,
|
|
|
"user_id": userId,
|
|
|
"out_trade_no": code,
|
|
|
- "return_status": returnStatus,
|
|
|
+ "return_status": qutil.If(param.ContractMoney == 0, 1, 0),
|
|
|
"refund_status": 0,
|
|
|
"company_name": param.CompanyName,
|
|
|
"billingMode": param.ChargeMode, //计费模式 0 免费 1 收费
|
