提交分类 修复BUG；

提交内容	服务预约修复bug问题；
当前版本	测试版本6.1.0
是否冲突	是
Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer_fix

# Conflicts:
#	WeiChat/version.properties
#	app_core/common/src/main/java/com/core/app/Constants.java

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Dec 11 17:33:46 CST 2017
-debugName=117
-versionName=618
-debugCode=117
-versionCode=157
+#Tue Dec 12 17:46:05 CST 2017
+debugName=129
+versionName=623
+debugCode=129
+versionCode=162

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServiceAddActivity.java

@@ -991,7 +991,12 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                         map.put("sb_spname", tv_food_rooms.getText());
                     }else{
                         //选桌位
-                        map.put("sb_stname", tv_food_seats.getTag(R.id.tag_id));
+                        if (((Integer)tv_food_seats.getTag(R.id.tag_id2))>0) {
+                            map.put("sb_stname", tv_food_seats.getTag(R.id.tag_id));
+                        }else{
+                            ToastMessage("已无剩余桌位！");
+                            return null;
+                        }
                     }
                   
                 }
@@ -1153,6 +1158,11 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
         if (!isEdited) {
             et_book_phone.setText(data.getString("sb_telephone"));
             et_book_name.setText(data.getString("sb_recordor"));
+            if (data.getString("sb_sex").equals("0")){
+                rg_sex.check(rg_sex.getChildAt(0).getId());
+            }else if(data.getString("sb_sex").equals("1")){
+                rg_sex.check(rg_sex.getChildAt(1).getId());
+            }
             if (!StringUtil.isEmpty(data.getString("sb_remark"))){
                 et_book_notes.setText(data.getString("sb_remark"));
                 notes_rl.setVisibility(View.VISIBLE);
@@ -1183,6 +1193,12 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
              
                     searchSeatNumbers(tv_food_times.getText().toString(),data.getString("sb_companyid"));
                     getSteatListStates(data.getString("sb_companyid"));//获取餐饮类别状态信息
+                    
+                    if(StringUtil.isEmpty(data.getString("sb_stname"))){
+                        tv_food_rooms.setText("无");
+                    }else{
+                        tv_food_rooms.setText(data.getString("sb_stname"));
+                    }
                     tv_food_rooms.setText(data.getString("sb_stname"));
                     tv_food_peoples.setText(data.getString("sb_person"));
                     tv_food_peoples.setVisibility(View.VISIBLE);
@@ -1344,6 +1360,8 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     if (!StringUtil.isEmpty(dataService)) {
                         JSONObject object = JSON.parseObject(dataService);
                         String recordId = object.getString("sb_recordid");
+                        LogUtil.d(TAG,"userId:"+MyApplication.getInstance().mLoginUser.getUserId());
+                        LogUtil.d(TAG,"recordId:"+recordId);
                         if (MyApplication.getInstance().mLoginUser.getUserId().equals(recordId)) {
                             tvSeatsRight.setVisibility(View.GONE);
                         } else {
@@ -1632,8 +1650,14 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                                              CommonUtil.textSpanForStyle(tvDSeatsNum,"前方"+number+"桌",number,ct.getResources().getColor(R.color.blue_seats_num));
                                          }
                                     if (asType.equals(king)){
+                                        if (bookednumber<=0){
+                                            bookednumber=0;
+                                            ToastMessage("已无剩余桌量！");
+                                        }
                                         tv_food_seats.setTag(R.id.tag_id,deskcode);
+                                        tv_food_seats.setTag(R.id.tag_id2,bookednumber);//桌位数量
                                         CommonUtil.textSpanForStyle(tv_food_seats,"仅剩"+bookednumber+"桌",String.valueOf(bookednumber),ct.getResources().getColor(R.color.blue_seats_num));
+                                        isEnter=false;
                                     }else{
                                        isEnter=true;//置空，下面循环会进入指定逻辑代码
                                     }
@@ -1653,10 +1677,15 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                                     if (ListUtils.isEmpty(deskbook)) {
                                         if (as_type.equals(asType)||isEnter) {
                                             //tv_food_seats.setText("仅剩"+as_number+"桌");
+                                            if (bookNum<=0){
+                                                bookNum=0;
+                                                ToastMessage("已无剩余桌量！");
+                                            }
                                             CommonUtil.textSpanForStyle(tv_food_seats,"仅剩"+bookNum+"桌",String.valueOf(bookNum),ct.getResources().getColor(R.color.blue_seats_num));
                                             LogUtil.d(TAG,"as_number:"+as_number+" as_deskcode:"+as_deskcode);
                                            // tv_food_seats.setTag(0,as_number);
                                             tv_food_seats.setTag(R.id.tag_id,as_deskcode+"01");//桌位编号
+                                            tv_food_seats.setTag(R.id.tag_id2,bookNum);//桌位数量
                                        }
                                         LogUtil.d(TAG,"桌:"+as_type+"：前方"+as_number+"桌");
                                         if ("小桌".equals(as_type)){

app_modular/appbooking/src/main/res/layout/activity_bservice_add.xml

@@ -495,7 +495,7 @@
                     android:layout_toLeftOf="@+id/sv_food_rooms"
                     android:drawableRight="@drawable/oa_next"
                     android:contentDescription="@string/service_food_rooms"
-                    android:hint="@string/common_select"
+                    android:hint="@string/common_select_not_must"
                     android:text="否"
                     android:textColor="@color/hintColor" />
                 <com.core.widget.view.SwitchView