优化 state 没有填写导致保存报错问题

java110-bean/src/main/java/com/java110/dto/rentingAppointment/RentingAppointmentDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.rentingAppointment;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -14,17 +15,19 @@ import java.util.Date;
  **/
 public class RentingAppointmentDto extends PageDto implements Serializable {
 
+    public static final String STATE_SUBMIT = "1001";//提交
+
     private String msg;
-private String tenantTel;
-private String tenantName;
-private String appointmentTime;
-private String appointmentRoomId;
-private String appointmentId;
-private String remark;
-private String state;
-private String tenantSex;
-private String storeId;
-private String roomId;
+    private String tenantTel;
+    private String tenantName;
+    private String appointmentTime;
+    private String appointmentRoomId;
+    private String appointmentId;
+    private String remark;
+    private String state;
+    private String tenantSex;
+    private String storeId;
+    private String roomId;
 
 
     private Date createTime;
@@ -35,67 +38,88 @@ private String roomId;
     public String getMsg() {
         return msg;
     }
-public void setMsg(String msg) {
+
+    public void setMsg(String msg) {
         this.msg = msg;
     }
-public String getTenantTel() {
+
+    public String getTenantTel() {
         return tenantTel;
     }
-public void setTenantTel(String tenantTel) {
+
+    public void setTenantTel(String tenantTel) {
         this.tenantTel = tenantTel;
     }
-public String getTenantName() {
+
+    public String getTenantName() {
         return tenantName;
     }
-public void setTenantName(String tenantName) {
+
+    public void setTenantName(String tenantName) {
         this.tenantName = tenantName;
     }
-public String getAppointmentTime() {
+
+    public String getAppointmentTime() {
         return appointmentTime;
     }
-public void setAppointmentTime(String appointmentTime) {
+
+    public void setAppointmentTime(String appointmentTime) {
         this.appointmentTime = appointmentTime;
     }
-public String getAppointmentRoomId() {
+
+    public String getAppointmentRoomId() {
         return appointmentRoomId;
     }
-public void setAppointmentRoomId(String appointmentRoomId) {
+
+    public void setAppointmentRoomId(String appointmentRoomId) {
         this.appointmentRoomId = appointmentRoomId;
     }
-public String getAppointmentId() {
+
+    public String getAppointmentId() {
         return appointmentId;
     }
-public void setAppointmentId(String appointmentId) {
+
+    public void setAppointmentId(String appointmentId) {
         this.appointmentId = appointmentId;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getTenantSex() {
+
+    public String getTenantSex() {
         return tenantSex;
     }
-public void setTenantSex(String tenantSex) {
+
+    public void setTenantSex(String tenantSex) {
         this.tenantSex = tenantSex;
     }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
-public String getRoomId() {
+
+    public String getRoomId() {
         return roomId;
     }
-public void setRoomId(String roomId) {
+
+    public void setRoomId(String roomId) {
         this.roomId = roomId;
     }
 

java110-bean/src/main/java/com/java110/po/rentingAppointment/RentingAppointmentPo.java

@@ -1,95 +1,117 @@
 package com.java110.po.rentingAppointment;
 
 import java.io.Serializable;
-import java.util.Date;
 
 public class RentingAppointmentPo implements Serializable {
 
     private String msg;
-private String tenantTel;
-private String tenantName;
-private String appointmentTime;
-private String appointmentRoomId;
-private String appointmentId;
-private String remark;
-private String statusCd = "0";
-private String state;
-private String tenantSex;
-private String storeId;
-private String roomId;
-public String getMsg() {
+    private String tenantTel;
+    private String tenantName;
+    private String appointmentTime;
+    private String appointmentRoomId;
+    private String appointmentId;
+    private String remark;
+    private String statusCd = "0";
+    private String state;
+    private String tenantSex;
+    private String storeId;
+    private String roomId;
+
+    public String getMsg() {
         return msg;
     }
-public void setMsg(String msg) {
+
+    public void setMsg(String msg) {
         this.msg = msg;
     }
-public String getTenantTel() {
+
+    public String getTenantTel() {
         return tenantTel;
     }
-public void setTenantTel(String tenantTel) {
+
+    public void setTenantTel(String tenantTel) {
         this.tenantTel = tenantTel;
     }
-public String getTenantName() {
+
+    public String getTenantName() {
         return tenantName;
     }
-public void setTenantName(String tenantName) {
+
+    public void setTenantName(String tenantName) {
         this.tenantName = tenantName;
     }
-public String getAppointmentTime() {
+
+    public String getAppointmentTime() {
         return appointmentTime;
     }
-public void setAppointmentTime(String appointmentTime) {
+
+    public void setAppointmentTime(String appointmentTime) {
         this.appointmentTime = appointmentTime;
     }
-public String getAppointmentRoomId() {
+
+    public String getAppointmentRoomId() {
         return appointmentRoomId;
     }
-public void setAppointmentRoomId(String appointmentRoomId) {
+
+    public void setAppointmentRoomId(String appointmentRoomId) {
         this.appointmentRoomId = appointmentRoomId;
     }
-public String getAppointmentId() {
+
+    public String getAppointmentId() {
         return appointmentId;
     }
-public void setAppointmentId(String appointmentId) {
+
+    public void setAppointmentId(String appointmentId) {
         this.appointmentId = appointmentId;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getTenantSex() {
+
+    public String getTenantSex() {
         return tenantSex;
     }
-public void setTenantSex(String tenantSex) {
+
+    public void setTenantSex(String tenantSex) {
         this.tenantSex = tenantSex;
     }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
-public String getRoomId() {
+
+    public String getRoomId() {
         return roomId;
     }
-public void setRoomId(String roomId) {
+
+    public void setRoomId(String roomId) {
         this.roomId = roomId;
     }
 
 
-
 }

service-user/src/main/java/com/java110/user/api/RentingAppointmentApi.java

@@ -15,9 +15,8 @@ import org.springframework.web.bind.annotation.*;
 
 /**
  * 租赁 预约接口类 controller
- *
+ * <p>
  * add by 吴学文
- *
  */
 @RestController
 @RequestMapping(value = "/rentingAppointment")
@@ -42,7 +41,8 @@ public class RentingAppointmentApi {
      * @path /app/rentingAppointment/saveRentingAppointment
      */
     @RequestMapping(value = "/saveRentingAppointment", method = RequestMethod.POST)
-    public ResponseEntity<String> saveRentingAppointment(@RequestBody JSONObject reqJson) {
+    public ResponseEntity<String> saveRentingAppointment(@RequestBody JSONObject reqJson,
+                                                         @RequestHeader(value = "store-id") String storeId) {
 
         Assert.hasKeyAndValue(reqJson, "tenantName", "请求报文中未包含tenantName");
         Assert.hasKeyAndValue(reqJson, "tenantSex", "请求报文中未包含tenantSex");
@@ -51,6 +51,7 @@ public class RentingAppointmentApi {
 
 
         RentingAppointmentPo rentingAppointmentPo = BeanConvertUtil.covertBean(reqJson, RentingAppointmentPo.class);
+        rentingAppointmentPo.setStoreId(storeId);
         return saveRentingAppointmentBMOImpl.save(rentingAppointmentPo);
     }
 

service-user/src/main/java/com/java110/user/bmo/rentingAppointment/impl/SaveRentingAppointmentBMOImpl.java

@@ -2,6 +2,7 @@ package com.java110.user.bmo.rentingAppointment.impl;
 
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.rentingAppointment.RentingAppointmentDto;
 import com.java110.intf.IRentingAppointmentInnerServiceSMO;
 import com.java110.po.rentingAppointment.RentingAppointmentPo;
 import com.java110.user.bmo.rentingAppointment.ISaveRentingAppointmentBMO;
@@ -26,6 +27,7 @@ public class SaveRentingAppointmentBMOImpl implements ISaveRentingAppointmentBMO
     public ResponseEntity<String> save(RentingAppointmentPo rentingAppointmentPo) {
 
         rentingAppointmentPo.setAppointmentId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_appointmentId));
+        rentingAppointmentPo.setState(RentingAppointmentDto.STATE_SUBMIT);
         int flag = rentingAppointmentInnerServiceSMOImpl.saveRentingAppointment(rentingAppointmentPo);
 
         if (flag > 0) {