x

src/main/java/com/egolm/oms/service/impl/OrderServiceImpl.java

@@ -125,8 +125,16 @@ public class OrderServiceImpl implements OrderService {
 				String sSalesOrderID = (String)commitMap.get(0).get("SalesOrderID");
 				jdbcTemplate.update("update tSalesOrder set sFormID = ?, sEmail = ?, sSalesmanNO = ? where sSalesOrderID = ?", formId, email, salesmanNo, sSalesOrderID);
 				this.sendWxMessage(sSalesOrderID);
+				return Rjx.jsonOk().setData(commitMap).toJson();			
+			} else {
+				String errorMsg = "";
+				if(commitMap.size()>1){
+					 errorMsg = (String)commitMap.get(0).get("StatusName")+";"+(String)commitMap.get(1).get("StatusName");
+				}else{
+					 errorMsg = (String)commitMap.get(0).get("StatusName");
+				}
+				return Rjx.jsonErr().setMessage(I18NUtils.getMessage(LangID, "Msg_Submit_Order_failure")).set("errorMsg", errorMsg).setData(commitMap).toJson();
 			}
-			return Rjx.jsonOk().setData(commitMap).toJson();
 		} catch (Exception e) {
 			e.printStackTrace();
 			return Rjx.jsonErr().set("errorMsg", e.getMessage()).setMessage(I18NUtils.getMessage(LangID, "Msg_Submit_Order_error")).toJson();