|
@@ -343,9 +343,11 @@ func orderList(context *admin.Context) (interface{}, error) {
|
|
|
} else {
|
|
|
userIdStr = `"` + userIdArr[0] + `","` + userIdArr[1] + `"`
|
|
|
}
|
|
|
- str += " (( e.user_id in (" + userIdStr + " )) OR ( e.user_phone like '%" + param.Phone + "%' AND e.is_backstage_order = 1 ) ) and"
|
|
|
+ //str += " (( e.user_id in (" + userIdStr + " )) OR ( e.user_phone like '%" + param.Phone + "%' AND e.is_backstage_order = 1 ) ) and"
|
|
|
+ str += " ( e.user_id in (" + userIdStr + " ) OR e.user_phone like '%" + param.Phone + "%' ) and"
|
|
|
} else {
|
|
|
- str += " ( e.user_phone like '%" + param.Phone + "%' AND e.is_backstage_order = 1 ) and"
|
|
|
+ //str += " ( e.user_phone like '%" + param.Phone + "%' AND e.is_backstage_order = 1 ) and"
|
|
|
+ str += " e.user_phone like '%" + param.Phone + "%' and"
|
|
|
}
|
|
|
}
|
|
|
if param.ContractNature != 0 {
|
|
@@ -1363,13 +1365,16 @@ func UpdateBigOrder(context *admin.Context) (interface{}, error) {
|
|
|
if param.BuySubject == "" {
|
|
|
return nil, errors.New("缺少购买主体")
|
|
|
}
|
|
|
+ if param.BuyCount == 0 {
|
|
|
+ return nil, errors.New("缺少购买数量")
|
|
|
+ }
|
|
|
if param.BuySubject == "2" {
|
|
|
- if param.BuyCount == 0 {
|
|
|
- return nil, errors.New("缺少购买数量")
|
|
|
- }
|
|
|
if param.CompanyName == "" {
|
|
|
return nil, errors.New("缺少公司名称")
|
|
|
}
|
|
|
+ if param.Contract_userA_type == "1" {
|
|
|
+ return nil, errors.New("协议甲方类型错误")
|
|
|
+ }
|
|
|
}
|
|
|
if param.AgreementStatus == 999 {
|
|
|
return nil, errors.New("缺少协议状态")
|
|
@@ -1567,10 +1572,62 @@ func UpdateBigOrder(context *admin.Context) (interface{}, error) {
|
|
|
var status error
|
|
|
if param.CreateType == 1 {
|
|
|
status = UpdateNewBigOrder(oldFilter, subStatus, dateType, now, startdate, enddate, userId, code, sName, ¶m, returnStatus)
|
|
|
- } else if param.CreateType == 3 { //p504新增续费合同
|
|
|
- status = UpdateExtendBigOrder(res, code, ¶m)
|
|
|
} else {
|
|
|
- config.JysqlDB.Update("dataexport_order", map[string]interface{}{"order_code": code}, map[string]interface{}{"sale_time": param.SaleTime})
|
|
|
+ //先处理之前的订单
|
|
|
+ var contractStatus int
|
|
|
+ if param.ContractUrl != "" {
|
|
|
+ contractStatus = 1
|
|
|
+ }
|
|
|
+ //处理计费模式下的数据-已回款
|
|
|
+ isAll := 2
|
|
|
+ if param.PayMoney == 0 {
|
|
|
+ isAll = 1
|
|
|
+ }
|
|
|
+ filter_map := ParamToFilter(¶m, enddate, isAll, contractStatus)
|
|
|
+ // 如果本来就包含人工审核字段就在filter里面赋值人工审核字段
|
|
|
+ if strings.Contains(oldFilter, "人工审核") {
|
|
|
+ filter_map["audit_type"] = "人工审核"
|
|
|
+ }
|
|
|
+ filter, _ := json.Marshal(filter_map)
|
|
|
+ // serverMap := GetServerPid()
|
|
|
+ if param.PayMoney > -1 {
|
|
|
+ paramOrder := map[string]interface{}{
|
|
|
+ "order_money": param.OrderMoney,
|
|
|
+ "order_status": param.OrderStatus,
|
|
|
+ "filter": string(filter),
|
|
|
+ "order_code": code,
|
|
|
+ "product_type": "大会员",
|
|
|
+ "user_id": userId,
|
|
|
+ "original_price": param.OrderMoney,
|
|
|
+ "pay_money": param.PayMoney,
|
|
|
+ //"vip_starttime": date.FormatDate(&startdate, date.Date_Full_Layout),
|
|
|
+ //"vip_endtime": date.FormatDate(&enddate, date.Date_Full_Layout),
|
|
|
+ "salesperson": param.Salesperson,
|
|
|
+ "salesperson_id": param.SalespersonId,
|
|
|
+ "return_status": returnStatus,
|
|
|
+ //"user_phone": param.Phone,
|
|
|
+ "company_name": param.CompanyName,
|
|
|
+ "billingMode": common.If(param.PayMoney > 0, 1, 0),
|
|
|
+ "sale_time": param.SaleTime, // 业绩统计时间
|
|
|
+ //"commission": param.Commission, // 佣金 2021-12-29 订单优化需求新增字段
|
|
|
+ //"procedures_money": param.ProceduresMoney, // 手续费 2021-12-29 订单优化需求新增字段
|
|
|
+ "salesChannel": param.SalesChannel,
|
|
|
+ "orderChannel": param.OrderChannel,
|
|
|
+ "paybackCompany": param.PaybackCompany,
|
|
|
+ //"last_update_person": param.CreatePerson,
|
|
|
+ "last_update_time": date.NowFormat(date.Date_Full_Layout),
|
|
|
+ "pay_way": param.PayType,
|
|
|
+ "saleDep": param.SaleDep,
|
|
|
+ //"contract_nature": param.Contract_nature,
|
|
|
+ "saleMoney": param.SaleMoney,
|
|
|
+ }
|
|
|
+ _ = util.JyOrder("/UpdateOrder", paramOrder)
|
|
|
+ }
|
|
|
+
|
|
|
+ if param.CreateType == 3 { //p504新增续费合同
|
|
|
+ status = UpdateExtendBigOrder(res, code, ¶m)
|
|
|
+ }
|
|
|
+ //config.JysqlDB.Update("dataexport_order", map[string]interface{}{"order_code": code}, map[string]interface{}{"sale_time": param.SaleTime})
|
|
|
}
|
|
|
if status == nil {
|
|
|
// 判断是否需要修改用户类型
|
|
@@ -1761,9 +1818,9 @@ func MyUpdateBigOrder(context *admin.Context) (interface{}, error) {
|
|
|
"i_pay_sub_num": 0,
|
|
|
"i_free_sub_num": 0,
|
|
|
}
|
|
|
- if subStatus == 1 {
|
|
|
+ /*if subStatus == 1 {
|
|
|
sets["i_member_sub_status"] = 0
|
|
|
- }
|
|
|
+ }*/
|
|
|
set := map[string]interface{}{
|
|
|
"$set": sets,
|
|
|
"$unset": map[string]interface{}{ // 修改手机号时,被取消的原手机号也移除省份数量字段
|
|
@@ -2898,7 +2955,7 @@ func UpdateSupplyOrder(context *admin.Context) (interface{}, error) {
|
|
|
if param.Phone == "" {
|
|
|
return nil, errors.New("缺少手机号")
|
|
|
}
|
|
|
- if param.EntId == 0 {
|
|
|
+ if param.BuySubject == "2" && param.EntId == 0 {
|
|
|
return nil, errors.New("缺少企业id")
|
|
|
}
|
|
|
res := map[string]interface{}{}
|