Commit 8bf4ecab by 兰国旗

Merge branch 'center-order' of gitlab.gongsibao.com:jiangyong/zhichan into center-order

parents c2d97310 79bf0f8b
......@@ -2617,15 +2617,15 @@ class OrderInfoService extends ServiceBase {
if (!pobj.actionBody.channelOrderNo) {
return system.getResult(null, "渠道方订单号不能为空,100110");
}
if (!pobj.actionBody.serviceOrderNo && pobj.appInfo.uapp_id!=31 ) {
return system.getResult(null, "蜂擎订单号不能为空,100120");
}
// if (!pobj.actionBody.serviceOrderNo && pobj.appInfo.uapp_id!=31 ) {
// return system.getResult(null, "蜂擎订单号不能为空,100120");
// }
if (!pobj.actionBody.serviceNo) {
return system.getResult(null, "服务单号不能为空,100130");
}
if (!pobj.actionBody.needNo && pobj.appInfo.uapp_id!=31) {
return system.getResult(null, "渠道方需求号不能为空,100110");
}
// if (!pobj.actionBody.needNo && pobj.appInfo.uapp_id!=31) {
// return system.getResult(null, "渠道方需求号不能为空,100110");
// }
if (!pobj.actionBody.created_at) {
return system.getResult(null, "商标创建时间不能为空,100190");
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment