优化代码

java110-bean/src/main/java/com/java110/dto/communitySpacePersonTime/CommunitySpacePersonTimeDto.java

@@ -15,6 +15,9 @@ import java.util.Date;
  **/
 public class CommunitySpacePersonTimeDto extends PageDto implements Serializable {
 
+    public static final String STATE_WAIT_CONFIRM = "W"; //待核销
+    public static final String STATE_FINISH = "C"; // 核销完成
+
     private String spaceId;
     private String cspId;
     private String[] cspIds;
@@ -24,6 +27,8 @@ public class CommunitySpacePersonTimeDto extends PageDto implements Serializable
 
     private String appointmentTime;
 
+    private String state;
+
 
     private Date createTime;
 
@@ -102,4 +107,12 @@ public class CommunitySpacePersonTimeDto extends PageDto implements Serializable
     public void setAppointmentTime(String appointmentTime) {
         this.appointmentTime = appointmentTime;
     }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
 }

java110-bean/src/main/java/com/java110/po/communitySpaceConfirmOrder/CommunitySpaceConfirmOrderPo.java

@@ -16,7 +16,7 @@
 package com.java110.po.communitySpaceConfirmOrder;
 
 import java.io.Serializable;
-import java.util.Date;
+
 /**
  * 类表述： Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
  * add by 吴学文 at 2022-10-14 15:27:08 mail: 928255095@qq.com
@@ -28,55 +28,68 @@ import java.util.Date;
 public class CommunitySpaceConfirmOrderPo implements Serializable {
 
     private String spaceId;
-private String cspId;
-private String timeId;
-private String orderId;
-private String remark;
-private String statusCd = "0";
-private String communityId;
-public String getSpaceId() {
+    private String cspId;
+    private String timeId;
+    private String orderId;
+    private String remark;
+    private String statusCd = "0";
+    private String communityId;
+
+    public String getSpaceId() {
         return spaceId;
     }
-public void setSpaceId(String spaceId) {
+
+    public void setSpaceId(String spaceId) {
         this.spaceId = spaceId;
     }
-public String getCspId() {
+
+    public String getCspId() {
         return cspId;
     }
-public void setCspId(String cspId) {
+
+    public void setCspId(String cspId) {
         this.cspId = cspId;
     }
-public String getTimeId() {
+
+    public String getTimeId() {
         return timeId;
     }
-public void setTimeId(String timeId) {
+
+    public void setTimeId(String timeId) {
         this.timeId = timeId;
     }
-public String getOrderId() {
+
+    public String getOrderId() {
         return orderId;
     }
-public void setOrderId(String orderId) {
+
+    public void setOrderId(String orderId) {
         this.orderId = orderId;
     }
-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 getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
 
 
-
 }

java110-bean/src/main/java/com/java110/po/communitySpacePersonTime/CommunitySpacePersonTimePo.java

@@ -16,7 +16,7 @@
 package com.java110.po.communitySpacePersonTime;
 
 import java.io.Serializable;
-import java.util.Date;
+
 /**
  * 类表述： Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
  * add by 吴学文 at 2022-10-03 01:12:49 mail: 928255095@qq.com
@@ -28,48 +28,67 @@ import java.util.Date;
 public class CommunitySpacePersonTimePo implements Serializable {
 
     private String spaceId;
-private String cspId;
-private String hours;
-private String timeId;
-private String statusCd = "0";
-private String communityId;
-public String getSpaceId() {
+    private String cspId;
+    private String hours;
+    private String timeId;
+    private String statusCd = "0";
+    private String communityId;
+
+    private String state;
+
+    public String getSpaceId() {
         return spaceId;
     }
-public void setSpaceId(String spaceId) {
+
+    public void setSpaceId(String spaceId) {
         this.spaceId = spaceId;
     }
-public String getCspId() {
+
+    public String getCspId() {
         return cspId;
     }
-public void setCspId(String cspId) {
+
+    public void setCspId(String cspId) {
         this.cspId = cspId;
     }
-public String getHours() {
+
+    public String getHours() {
         return hours;
     }
-public void setHours(String hours) {
+
+    public void setHours(String hours) {
         this.hours = hours;
     }
-public String getTimeId() {
+
+    public String getTimeId() {
         return timeId;
     }
-public void setTimeId(String timeId) {
+
+    public void setTimeId(String timeId) {
         this.timeId = timeId;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
 
+    public String getState() {
+        return state;
+    }
 
-
+    public void setState(String state) {
+        this.state = state;
+    }
 }

java110-db/src/main/resources/mapper/community/CommunitySpacePersonTimeV1ServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
     <!-- 保存场地预约时间信息 add by wuxw 2018-07-03 -->
     <insert id="saveCommunitySpacePersonTimeInfo" parameterType="Map">
         insert into community_space_person_time(
-        space_id,csp_id,hours,time_id,community_id
+        space_id,csp_id,hours,time_id,community_id,state
         ) values (
-        #{spaceId},#{cspId},#{hours},#{timeId},#{communityId}
+        #{spaceId},#{cspId},#{hours},#{timeId},#{communityId},#{state}
         )
     </insert>
 
@@ -18,7 +18,7 @@
     <!-- 查询场地预约时间信息 add by wuxw 2018-07-03 -->
     <select id="getCommunitySpacePersonTimeInfo" parameterType="Map" resultType="Map">
         select t.space_id,t.space_id spaceId,t.csp_id,t.csp_id cspId,t.hours,t.time_id,t.time_id
-        timeId,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId
+        timeId,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.state
         from community_space_person_time t
         left join community_space_person csp on t.csp_id = csp.csp_id and csp.status_cd = '0'
         where 1 =1
@@ -40,6 +40,9 @@
         <if test="hours !=null and hours != ''">
             and t.hours= #{hours}
         </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
         <if test="timeId !=null and timeId != ''">
             and t.time_id= #{timeId}
         </if>
@@ -69,6 +72,9 @@
         <if test="cspId !=null and cspId != ''">
             , t.csp_id= #{cspId}
         </if>
+        <if test="state !=null and state != ''">
+            , t.state = #{state}
+        </if>
         <if test="hours !=null and hours != ''">
             , t.hours= #{hours}
         </if>
@@ -115,6 +121,9 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
 
 
     </select>

service-acct/src/main/java/com/java110/acct/payment/business/venue/VenueReservationPaymentBusiness.java

@@ -194,6 +194,7 @@ public class VenueReservationPaymentBusiness implements IPaymentBusiness {
                 communitySpacePersonTimePo.setHours(openTimes.getJSONObject(timeIndex).getString("hours"));
                 communitySpacePersonTimePo.setSpaceId(communitySpacePersonPo.getSpaceId());
                 communitySpacePersonTimePo.setTimeId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+                communitySpacePersonTimePo.setState(CommunitySpacePersonTimeDto.STATE_WAIT_CONFIRM);
                 communitySpacePersonTimeV1InnerServiceSMOImpl.saveCommunitySpacePersonTime(communitySpacePersonTimePo);
             }
         }

service-community/src/main/java/com/java110/community/cmd/communitySpace/SaveCommunitySpaceConfirmOrderCmd.java

@@ -23,15 +23,20 @@ import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.doc.annotation.*;
+import com.java110.dto.communitySpacePersonTime.CommunitySpacePersonTimeDto;
 import com.java110.intf.community.ICommunitySpaceConfirmOrderV1InnerServiceSMO;
+import com.java110.intf.community.ICommunitySpacePersonTimeV1InnerServiceSMO;
 import com.java110.po.communitySpaceConfirmOrder.CommunitySpaceConfirmOrderPo;
+import com.java110.po.communitySpacePersonTime.CommunitySpacePersonTimePo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
 
 
 @Java110CmdDoc(title = "场地预约核销",
@@ -44,8 +49,7 @@ import org.slf4j.LoggerFactory;
 )
 
 @Java110ParamsDoc(params = {
-        @Java110ParamDoc(name = "page", type = "int", length = 11, remark = "分页页数"),
-        @Java110ParamDoc(name = "row", type = "int", length = 11, remark = "分页行数"),
+        @Java110ParamDoc(name = "timeId", length = 11, remark = "预约时间ID"),
         @Java110ParamDoc(name = "communityId", length = 30, remark = "小区ID"),
 })
 
@@ -54,22 +58,21 @@ import org.slf4j.LoggerFactory;
                 @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "返回编号，0 成功 其他失败"),
                 @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "成功", remark = "描述"),
                 @Java110ParamDoc(name = "data", type = "Array", remark = "有效数据"),
-                @Java110ParamDoc(parentNodeName = "data", name = "communityId", type = "String", remark = "小区ID"),
-                @Java110ParamDoc(parentNodeName = "data", name = "name", type = "String", remark = "场地名称"),
-                @Java110ParamDoc(parentNodeName = "data", name = "state", type = "String", remark = "小区状态 1001 可预约状态 2002 不可以预约状态"),
-                @Java110ParamDoc(parentNodeName = "data", name = "startTime", type = "String", remark = "预约开始时间"),
-                @Java110ParamDoc(parentNodeName = "data", name = "endTime", type = "String", remark = "预约结束时间"),
-                @Java110ParamDoc(parentNodeName = "data", name = "feeMoney", type = "String", remark = "每小时费用"),
-                @Java110ParamDoc(parentNodeName = "data", name = "adminName", type = "String", remark = "管理员"),
-                @Java110ParamDoc(parentNodeName = "data", name = "tel", type = "String", remark = "联系电话"),
-                @Java110ParamDoc(parentNodeName = "data", name = "openTimes", type = "Array", remark = "联系电话"),
-                @Java110ParamDoc(parentNodeName = "openTimes", name = "hours", type = "String", remark = "小时"),
-                @Java110ParamDoc(parentNodeName = "openTimes", name = "isOpen", type = "String", remark = "是否预约 Y 可以预约 N 不能预约"),
+                @Java110ParamDoc(parentNodeName = "data", name = "appointmentTime", type = "String", remark = "预约时间"),
+                @Java110ParamDoc(parentNodeName = "data", name = "remark", type = "String", remark = "备注"),
+                @Java110ParamDoc(parentNodeName = "data", name = "createTime", type = "String", remark = "核销时间"),
+                @Java110ParamDoc(parentNodeName = "data", name = "hours", type = "String", remark = "核销小时"),
+                @Java110ParamDoc(parentNodeName = "data", name = "spaceName", type = "String", remark = "场地"),
+                @Java110ParamDoc(parentNodeName = "data", name = "personName", type = "String", remark = "预约人"),
+                @Java110ParamDoc(parentNodeName = "data", name = "personTel", type = "String", remark = "预约电话"),
         }
 )
 
 @Java110ExampleDoc(
-        reqBody = "http://{ip}:{port}/app/communitySpace.listCommunitySpaceConfirmOrder?spaceId=&name=&state=&communityId=2022081539020475&page=1&row=10",
+        reqBody = "{\n" +
+                "       timeId: '123',\n" +
+                "       communityId: '2123123123'\n" +
+                "}",
         resBody = "{\"code\":0,\"data\":[{\"adminName\":\"无需文\",\"communityId\":\"2022081539020475\",\"endTime\":\"06:10\",\"feeMoney\":\"10.00\",\"name\":\"体育场\",\"page\":-1,\"records\":0,\"row\":0,\"spaceId\":\"102022093043260007\",\"startTime\":\"05:05\",\"state\":\"1001\",\"statusCd\":\"0\",\"tel\":\"18909711443\",\"total\":0,\"openTimes\":[{\"hours\":0,\"Y\"}]}],\"msg\":\"成功\",\"page\":0,\"records\":1,\"rows\":0,\"total\":2}"
 )
 
@@ -93,25 +96,43 @@ public class SaveCommunitySpaceConfirmOrderCmd extends Cmd {
     @Autowired
     private ICommunitySpaceConfirmOrderV1InnerServiceSMO communitySpaceConfirmOrderV1InnerServiceSMOImpl;
 
+    @Autowired
+    private ICommunitySpacePersonTimeV1InnerServiceSMO communitySpacePersonTimeV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "cspId", "请求报文中未包含cspId");
-Assert.hasKeyAndValue(reqJson, "timeId", "请求报文中未包含timeId");
-Assert.hasKeyAndValue(reqJson, "spaceId", "请求报文中未包含spaceId");
-Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
-
+        Assert.hasKeyAndValue(reqJson, "timeId", "请求报文中未包含timeId");
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
     }
 
     @Override
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-       CommunitySpaceConfirmOrderPo communitySpaceConfirmOrderPo = BeanConvertUtil.covertBean(reqJson, CommunitySpaceConfirmOrderPo.class);
+        CommunitySpacePersonTimeDto communitySpacePersonTimeDto = new CommunitySpacePersonTimeDto();
+        communitySpacePersonTimeDto.setTimeId(reqJson.getString("timeId"));
+        communitySpacePersonTimeDto.setCommunityId(reqJson.getString("communityId"));
+        List<CommunitySpacePersonTimeDto> communitySpacePersonTimeDtos = communitySpacePersonTimeV1InnerServiceSMOImpl.queryCommunitySpacePersonTimes(communitySpacePersonTimeDto);
+
+        Assert.listOnlyOne(communitySpacePersonTimeDtos, "未包含预约记录");
+
+        //将 时间修改 核销中
+        CommunitySpacePersonTimePo communitySpacePersonTimePo = new CommunitySpacePersonTimePo();
+        communitySpacePersonTimePo.setTimeId(communitySpacePersonTimeDtos.get(0).getTimeId());
+        communitySpacePersonTimePo.setState(CommunitySpacePersonTimeDto.STATE_FINISH);
+        int flag = communitySpacePersonTimeV1InnerServiceSMOImpl.updateCommunitySpacePersonTime(communitySpacePersonTimePo);
+        if (flag < 1) {
+            throw new CmdException("核销预约失败");
+        }
+
+        CommunitySpaceConfirmOrderPo communitySpaceConfirmOrderPo = BeanConvertUtil.covertBean(reqJson, CommunitySpaceConfirmOrderPo.class);
         communitySpaceConfirmOrderPo.setOrderId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
-        int flag = communitySpaceConfirmOrderV1InnerServiceSMOImpl.saveCommunitySpaceConfirmOrder(communitySpaceConfirmOrderPo);
+        communitySpaceConfirmOrderPo.setSpaceId(communitySpacePersonTimeDtos.get(0).getSpaceId());
+        communitySpaceConfirmOrderPo.setCspId(communitySpacePersonTimeDtos.get(0).getCspId());
 
+        flag = communitySpaceConfirmOrderV1InnerServiceSMOImpl.saveCommunitySpaceConfirmOrder(communitySpaceConfirmOrderPo);
         if (flag < 1) {
-            throw new CmdException("保存数据失败");
+            throw new CmdException("核销数据失败");
         }
 
         cmdDataFlowContext.setResponseEntity(ResultVo.success());

service-community/src/main/java/com/java110/community/cmd/communitySpace/SaveCommunitySpacePersonCmd.java

@@ -183,6 +183,7 @@ public class SaveCommunitySpacePersonCmd extends Cmd {
             communitySpacePersonTimePo.setHours(openTimes.getJSONObject(timeIndex).getString("hours"));
             communitySpacePersonTimePo.setSpaceId(communitySpacePersonPo.getSpaceId());
             communitySpacePersonTimePo.setTimeId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+            communitySpacePersonTimePo.setState(CommunitySpacePersonTimeDto.STATE_WAIT_CONFIRM);
             communitySpacePersonTimeV1InnerServiceSMOImpl.saveCommunitySpacePersonTime(communitySpacePersonTimePo);
         }