加入订单核销

java110-bean/src/main/java/com/java110/dto/reserveGoodsConfirmOrder/ReserveGoodsConfirmOrderDto.java

@@ -0,0 +1,90 @@
+package com.java110.dto.reserveGoodsConfirmOrder;
+
+import com.java110.dto.PageDto;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName FloorDto
+ * @Description 预约订单时间数据层封装
+ * @Author wuxw
+ * @Date 2019/4/24 8:52
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+public class ReserveGoodsConfirmOrderDto extends PageDto implements Serializable {
+
+    private String timeId;
+private String orderId;
+private String goodsId;
+private String coId;
+private String remark;
+private String type;
+private String communityId;
+
+
+    private Date createTime;
+
+    private String statusCd = "0";
+
+
+    public String getTimeId() {
+        return timeId;
+    }
+public void setTimeId(String timeId) {
+        this.timeId = timeId;
+    }
+public String getOrderId() {
+        return orderId;
+    }
+public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+public String getGoodsId() {
+        return goodsId;
+    }
+public void setGoodsId(String goodsId) {
+        this.goodsId = goodsId;
+    }
+public String getCoId() {
+        return coId;
+    }
+public void setCoId(String coId) {
+        this.coId = coId;
+    }
+public String getRemark() {
+        return remark;
+    }
+public void setRemark(String remark) {
+        this.remark = remark;
+    }
+public String getType() {
+        return type;
+    }
+public void setType(String type) {
+        this.type = type;
+    }
+public String getCommunityId() {
+        return communityId;
+    }
+public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+}

java110-bean/src/main/java/com/java110/po/reserveGoodsConfirmOrder/ReserveGoodsConfirmOrderPo.java

@@ -0,0 +1,105 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.po.reserveGoodsConfirmOrder;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 类表述： Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
+ * add by 吴学文 at 2022-12-06 16:15:13 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网：http://www.homecommunity.cn
+ * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
+ */
+public class ReserveGoodsConfirmOrderPo implements Serializable {
+
+    private String timeId;
+    private String orderId;
+    private String goodsId;
+    private String coId;
+    private String remark;
+    private String statusCd = "0";
+    private String type;
+    private String communityId;
+
+    public String getTimeId() {
+        return timeId;
+    }
+
+    public void setTimeId(String timeId) {
+        this.timeId = timeId;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getGoodsId() {
+        return goodsId;
+    }
+
+    public void setGoodsId(String goodsId) {
+        this.goodsId = goodsId;
+    }
+
+    public String getCoId() {
+        return coId;
+    }
+
+    public void setCoId(String coId) {
+        this.coId = coId;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
+
+}

java110-db/src/main/resources/mapper/store/ReserveGoodsConfirmOrderV1ServiceDaoImplMapper.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="reserveGoodsConfirmOrderV1ServiceDaoImpl">
+
+
+
+
+
+    <!-- 保存预约订单时间信息 add by wuxw 2018-07-03 -->
+    <insert id="saveReserveGoodsConfirmOrderInfo" parameterType="Map">
+        insert into reserve_goods_confirm_order(
+time_id,order_id,goods_id,co_id,remark,type,community_id
+) values (
+#{timeId},#{orderId},#{goodsId},#{coId},#{remark},#{type},#{communityId}
+)
+    </insert>
+
+
+
+    <!-- 查询预约订单时间信息 add by wuxw 2018-07-03 -->
+    <select id="getReserveGoodsConfirmOrderInfo" parameterType="Map" resultType="Map">
+        select  t.time_id,t.time_id timeId,t.order_id,t.order_id orderId,t.goods_id,t.goods_id goodsId,t.co_id,t.co_id coId,t.remark,t.status_cd,t.status_cd statusCd,t.type,t.community_id,t.community_id communityId 
+from reserve_goods_confirm_order t 
+where 1 =1 
+<if test="timeId !=null and timeId != ''">
+   and t.time_id= #{timeId}
+</if> 
+<if test="orderId !=null and orderId != ''">
+   and t.order_id= #{orderId}
+</if> 
+<if test="goodsId !=null and goodsId != ''">
+   and t.goods_id= #{goodsId}
+</if> 
+<if test="coId !=null and coId != ''">
+   and t.co_id= #{coId}
+</if> 
+<if test="remark !=null and remark != ''">
+   and t.remark= #{remark}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="type !=null and type != ''">
+   and t.type= #{type}
+</if> 
+<if test="communityId !=null and communityId != ''">
+   and t.community_id= #{communityId}
+</if> 
+order by t.create_time desc
+<if test="page != -1 and page != null ">
+   limit #{page}, #{row}
+</if> 
+
+    </select>
+
+
+
+
+    <!-- 修改预约订单时间信息 add by wuxw 2018-07-03 -->
+    <update id="updateReserveGoodsConfirmOrderInfo" parameterType="Map">
+        update  reserve_goods_confirm_order t set t.status_cd = #{statusCd}
+<if test="newBId != null and newBId != ''">
+,t.b_id = #{newBId}
+</if> 
+<if test="timeId !=null and timeId != ''">
+, t.time_id= #{timeId}
+</if> 
+<if test="orderId !=null and orderId != ''">
+, t.order_id= #{orderId}
+</if> 
+<if test="goodsId !=null and goodsId != ''">
+, t.goods_id= #{goodsId}
+</if> 
+<if test="remark !=null and remark != ''">
+, t.remark= #{remark}
+</if> 
+<if test="type !=null and type != ''">
+, t.type= #{type}
+</if> 
+<if test="communityId !=null and communityId != ''">
+, t.community_id= #{communityId}
+</if> 
+ where 1=1 <if test="coId !=null and coId != ''">
+and t.co_id= #{coId}
+</if> 
+
+    </update>
+
+    <!-- 查询预约订单时间数量 add by wuxw 2018-07-03 -->
+     <select id="queryReserveGoodsConfirmOrdersCount" parameterType="Map" resultType="Map">
+        select  count(1) count 
+from reserve_goods_confirm_order t 
+where 1 =1 
+<if test="timeId !=null and timeId != ''">
+   and t.time_id= #{timeId}
+</if> 
+<if test="orderId !=null and orderId != ''">
+   and t.order_id= #{orderId}
+</if> 
+<if test="goodsId !=null and goodsId != ''">
+   and t.goods_id= #{goodsId}
+</if> 
+<if test="coId !=null and coId != ''">
+   and t.co_id= #{coId}
+</if> 
+<if test="remark !=null and remark != ''">
+   and t.remark= #{remark}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="type !=null and type != ''">
+   and t.type= #{type}
+</if> 
+<if test="communityId !=null and communityId != ''">
+   and t.community_id= #{communityId}
+</if> 
+
+
+     </select>
+
+</mapper>

java110-interface/src/main/java/com/java110/intf/store/IReserveGoodsConfirmOrderV1InnerServiceSMO.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.intf.store;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.reserveGoodsConfirmOrder.ReserveGoodsConfirmOrderDto;
+import com.java110.po.reserveGoodsConfirmOrder.ReserveGoodsConfirmOrderPo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.List;
+
+/**
+ * 类表述： 服务之前调用的接口类，不对外提供接口能力 只用于接口建调用
+ * add by 吴学文 at 2022-12-06 16:15:13 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网：http://www.homecommunity.cn
+ * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
+ */
+@FeignClient(name = "store-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/reserveGoodsConfirmOrderV1Api")
+public interface IReserveGoodsConfirmOrderV1InnerServiceSMO {
+
+
+    @RequestMapping(value = "/saveReserveGoodsConfirmOrder", method = RequestMethod.POST)
+    public int saveReserveGoodsConfirmOrder(@RequestBody  ReserveGoodsConfirmOrderPo reserveGoodsConfirmOrderPo);
+
+    @RequestMapping(value = "/updateReserveGoodsConfirmOrder", method = RequestMethod.POST)
+    public int updateReserveGoodsConfirmOrder(@RequestBody  ReserveGoodsConfirmOrderPo reserveGoodsConfirmOrderPo);
+
+    @RequestMapping(value = "/deleteReserveGoodsConfirmOrder", method = RequestMethod.POST)
+    public int deleteReserveGoodsConfirmOrder(@RequestBody  ReserveGoodsConfirmOrderPo reserveGoodsConfirmOrderPo);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param reserveGoodsConfirmOrderDto 数据对象分享
+     * @return ReserveGoodsConfirmOrderDto 对象数据
+     */
+    @RequestMapping(value = "/queryReserveGoodsConfirmOrders", method = RequestMethod.POST)
+    List<ReserveGoodsConfirmOrderDto> queryReserveGoodsConfirmOrders(@RequestBody ReserveGoodsConfirmOrderDto reserveGoodsConfirmOrderDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param reserveGoodsConfirmOrderDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryReserveGoodsConfirmOrdersCount", method = RequestMethod.POST)
+    int queryReserveGoodsConfirmOrdersCount(@RequestBody ReserveGoodsConfirmOrderDto reserveGoodsConfirmOrderDto);
+}

service-store/src/main/java/com/java110/store/cmd/reserveOrder/DeleteReserveGoodsOrderCmd.java

@@ -1,71 +0,0 @@
-/*
- * Copyright 2017-2020 吴学文 and java110 team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.java110.store.cmd.reserveOrder;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.Cmd;
-import com.java110.core.event.cmd.CmdEvent;
-import com.java110.intf.store.IReserveGoodsOrderV1InnerServiceSMO;
-import com.java110.po.reserveGoodsOrder.ReserveGoodsOrderPo;
-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;
-
-/**
- * 类表述：删除
- * 服务编码：reserveGoodsOrder.deleteReserveGoodsOrder
- * 请求路劲：/app/reserveGoodsOrder.DeleteReserveGoodsOrder
- * add by 吴学文 at 2022-12-06 10:58:18 mail: 928255095@qq.com
- * open source address: https://gitee.com/wuxw7/MicroCommunity
- * 官网：http://www.homecommunity.cn
- * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
- * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
- */
-@Java110Cmd(serviceCode = "reserveOrder.deleteReserveGoodsOrder")
-public class DeleteReserveGoodsOrderCmd extends Cmd {
-    private static Logger logger = LoggerFactory.getLogger(DeleteReserveGoodsOrderCmd.class);
-
-    @Autowired
-    private IReserveGoodsOrderV1InnerServiceSMO reserveGoodsOrderV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "orderId", "orderId不能为空");
-        Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
-
-    }
-
-    @Override
-    @Java110Transactional
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-        ReserveGoodsOrderPo reserveGoodsOrderPo = BeanConvertUtil.covertBean(reqJson, ReserveGoodsOrderPo.class);
-        int flag = reserveGoodsOrderV1InnerServiceSMOImpl.deleteReserveGoodsOrder(reserveGoodsOrderPo);
-
-        if (flag < 1) {
-            throw new CmdException("删除数据失败");
-        }
-
-        cmdDataFlowContext.setResponseEntity(ResultVo.success());
-    }
-}

service-store/src/main/java/com/java110/store/cmd/reserveOrder/DeleteReserveGoodsOrderTimeCmd.java

@@ -1,70 +0,0 @@
-/*
- * Copyright 2017-2020 吴学文 and java110 team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.java110.store.cmd.reserveOrder;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.Cmd;
-import com.java110.core.event.cmd.CmdEvent;
-import com.java110.intf.store.IReserveGoodsOrderTimeV1InnerServiceSMO;
-import com.java110.po.reserveGoodsOrderTime.ReserveGoodsOrderTimePo;
-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;
-/**
- * 类表述：删除
- * 服务编码：reserveGoodsOrderTime.deleteReserveGoodsOrderTime
- * 请求路劲：/app/reserveGoodsOrderTime.DeleteReserveGoodsOrderTime
- * add by 吴学文 at 2022-12-06 11:04:20 mail: 928255095@qq.com
- * open source address: https://gitee.com/wuxw7/MicroCommunity
- * 官网：http://www.homecommunity.cn
- * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
- * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
- */
-@Java110Cmd(serviceCode = "reserveOrder.deleteReserveGoodsOrderTime")
-public class DeleteReserveGoodsOrderTimeCmd extends Cmd {
-  private static Logger logger = LoggerFactory.getLogger(DeleteReserveGoodsOrderTimeCmd.class);
-
-    @Autowired
-    private IReserveGoodsOrderTimeV1InnerServiceSMO reserveGoodsOrderTimeV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "timeId", "timeId不能为空");
-Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
-
-    }
-
-    @Override
-    @Java110Transactional
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-       ReserveGoodsOrderTimePo reserveGoodsOrderTimePo = BeanConvertUtil.covertBean(reqJson, ReserveGoodsOrderTimePo.class);
-        int flag = reserveGoodsOrderTimeV1InnerServiceSMOImpl.deleteReserveGoodsOrderTime(reserveGoodsOrderTimePo);
-
-        if (flag < 1) {
-            throw new CmdException("删除数据失败");
-        }
-
-        cmdDataFlowContext.setResponseEntity(ResultVo.success());
-    }
-}

service-store/src/main/java/com/java110/store/cmd/reserveOrder/ListReserveGoodsOrderTimeCmd.java

@@ -20,12 +20,12 @@ import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
-import com.java110.intf.store.IReserveGoodsOrderTimeV1InnerServiceSMO;
+import com.java110.intf.store.IReserveGoodsConfirmOrderV1InnerServiceSMO;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.java110.dto.reserveGoodsOrderTime.ReserveGoodsOrderTimeDto;
+import com.java110.dto.reserveGoodsConfirmOrder.ReserveGoodsConfirmOrderDto;
 import java.util.List;
 import java.util.ArrayList;
 import org.springframework.http.ResponseEntity;
@@ -36,20 +36,20 @@ import org.slf4j.LoggerFactory;
 
 /**
  * 类表述：查询
- * 服务编码：reserveGoodsOrderTime.listReserveGoodsOrderTime
- * 请求路劲：/app/reserveGoodsOrderTime.ListReserveGoodsOrderTime
- * add by 吴学文 at 2022-12-06 11:04:20 mail: 928255095@qq.com
+ * 服务编码：reserveGoodsConfirmOrder.listReserveGoodsConfirmOrder
+ * 请求路劲：/app/reserveGoodsConfirmOrder.ListReserveGoodsConfirmOrder
+ * add by 吴学文 at 2022-12-06 16:15:14 mail: 928255095@qq.com
  * open source address: https://gitee.com/wuxw7/MicroCommunity
  * 官网：http://www.homecommunity.cn
  * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
  * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
  */
-@Java110Cmd(serviceCode = "reserveOrder.listReserveGoodsOrderTime")
-public class ListReserveGoodsOrderTimeCmd extends Cmd {
+@Java110Cmd(serviceCode = "reserveOrder.listReserveGoodsConfirmOrder")
+public class ListReserveGoodsConfirmOrderCmd extends Cmd {
 
-  private static Logger logger = LoggerFactory.getLogger(ListReserveGoodsOrderTimeCmd.class);
+  private static Logger logger = LoggerFactory.getLogger(ListReserveGoodsConfirmOrderCmd.class);
     @Autowired
-    private IReserveGoodsOrderTimeV1InnerServiceSMO reserveGoodsOrderTimeV1InnerServiceSMOImpl;
+    private IReserveGoodsConfirmOrderV1InnerServiceSMO reserveGoodsConfirmOrderV1InnerServiceSMOImpl;
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
@@ -59,19 +59,19 @@ public class ListReserveGoodsOrderTimeCmd extends Cmd {
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-           ReserveGoodsOrderTimeDto reserveGoodsOrderTimeDto = BeanConvertUtil.covertBean(reqJson, ReserveGoodsOrderTimeDto.class);
+           ReserveGoodsConfirmOrderDto reserveGoodsConfirmOrderDto = BeanConvertUtil.covertBean(reqJson, ReserveGoodsConfirmOrderDto.class);
 
-           int count = reserveGoodsOrderTimeV1InnerServiceSMOImpl.queryReserveGoodsOrderTimesCount(reserveGoodsOrderTimeDto);
+           int count = reserveGoodsConfirmOrderV1InnerServiceSMOImpl.queryReserveGoodsConfirmOrdersCount(reserveGoodsConfirmOrderDto);
 
-           List<ReserveGoodsOrderTimeDto> reserveGoodsOrderTimeDtos = null;
+           List<ReserveGoodsConfirmOrderDto> reserveGoodsConfirmOrderDtos = null;
 
            if (count > 0) {
-               reserveGoodsOrderTimeDtos = reserveGoodsOrderTimeV1InnerServiceSMOImpl.queryReserveGoodsOrderTimes(reserveGoodsOrderTimeDto);
+               reserveGoodsConfirmOrderDtos = reserveGoodsConfirmOrderV1InnerServiceSMOImpl.queryReserveGoodsConfirmOrders(reserveGoodsConfirmOrderDto);
            } else {
-               reserveGoodsOrderTimeDtos = new ArrayList<>();
+               reserveGoodsConfirmOrderDtos = new ArrayList<>();
            }
 
-           ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, reserveGoodsOrderTimeDtos);
+           ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, reserveGoodsConfirmOrderDtos);
 
            ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
 

service-store/src/main/java/com/java110/store/cmd/reserveOrder/SaveReserveGoodsConfirmOrderCmd.java

@@ -0,0 +1,124 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.store.cmd.reserveOrder;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.communitySpaceConfirmOrder.CommunitySpaceConfirmOrderDto;
+import com.java110.dto.communitySpacePersonTime.CommunitySpacePersonTimeDto;
+import com.java110.dto.reserveGoods.ReserveGoodsDto;
+import com.java110.dto.reserveGoodsConfirmOrder.ReserveGoodsConfirmOrderDto;
+import com.java110.dto.reserveGoodsOrder.ReserveGoodsOrderDto;
+import com.java110.dto.reserveGoodsOrderTime.ReserveGoodsOrderTimeDto;
+import com.java110.intf.store.IReserveGoodsConfirmOrderV1InnerServiceSMO;
+import com.java110.intf.store.IReserveGoodsOrderTimeV1InnerServiceSMO;
+import com.java110.intf.store.IReserveGoodsOrderV1InnerServiceSMO;
+import com.java110.po.communitySpacePersonTime.CommunitySpacePersonTimePo;
+import com.java110.po.reserveGoodsConfirmOrder.ReserveGoodsConfirmOrderPo;
+import com.java110.po.reserveGoodsOrderTime.ReserveGoodsOrderTimePo;
+import com.java110.store.dao.IReserveGoodsOrderTimeV1ServiceDao;
+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 java.util.List;
+
+/**
+ * 类表述：保存
+ * 服务编码：reserveGoodsConfirmOrder.saveReserveGoodsConfirmOrder
+ * 请求路劲：/app/reserveGoodsConfirmOrder.SaveReserveGoodsConfirmOrder
+ * add by 吴学文 at 2022-12-06 16:15:13 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网：http://www.homecommunity.cn
+ * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
+ */
+@Java110Cmd(serviceCode = "reserveOrder.saveReserveGoodsConfirmOrder")
+public class SaveReserveGoodsConfirmOrderCmd extends Cmd {
+
+    private static Logger logger = LoggerFactory.getLogger(SaveReserveGoodsConfirmOrderCmd.class);
+
+    public static final String CODE_PREFIX_ID = "10";
+
+    @Autowired
+    private IReserveGoodsConfirmOrderV1InnerServiceSMO reserveGoodsConfirmOrderV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IReserveGoodsOrderTimeV1InnerServiceSMO reserveGoodsOrderTimeV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IReserveGoodsOrderV1InnerServiceSMO reserveGoodsOrderV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "timeId", "请求报文中未包含timeId");
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+        ReserveGoodsOrderTimeDto reserveGoodsOrderTimeDto = new ReserveGoodsOrderTimeDto();
+        reserveGoodsOrderTimeDto.setTimeId(reqJson.getString("timeId"));
+        reserveGoodsOrderTimeDto.setCommunityId(reqJson.getString("communityId"));
+        reserveGoodsOrderTimeDto.setState(CommunitySpacePersonTimeDto.STATE_WAIT_CONFIRM);
+        List<ReserveGoodsOrderTimeDto> reserveGoodsOrderTimeDtos = reserveGoodsOrderTimeV1InnerServiceSMOImpl.queryReserveGoodsOrderTimes(reserveGoodsOrderTimeDto);
+
+        Assert.listOnlyOne(reserveGoodsOrderTimeDtos, "未包含预约记录");
+
+        ReserveGoodsOrderDto reserveGoodsOrderDto = new ReserveGoodsOrderDto();
+        reserveGoodsOrderDto.setOrderId(reserveGoodsOrderTimeDtos.get(0).getOrderId());
+        List<ReserveGoodsOrderDto> reserveGoodsOrderDtos = reserveGoodsOrderV1InnerServiceSMOImpl.queryReserveGoodsOrders(reserveGoodsOrderDto);
+        Assert.listOnlyOne(reserveGoodsOrderDtos, "预约订单不存在");
+
+        //将 时间修改 核销中
+        ReserveGoodsOrderTimePo reserveGoodsOrderTimePo = new ReserveGoodsOrderTimePo();
+        reserveGoodsOrderTimePo.setTimeId(reserveGoodsOrderTimeDtos.get(0).getTimeId());
+        reserveGoodsOrderTimePo.setState(CommunitySpacePersonTimeDto.STATE_FINISH);
+        int flag = reserveGoodsOrderTimeV1InnerServiceSMOImpl.updateReserveGoodsOrderTime(reserveGoodsOrderTimePo);
+        if (flag < 1) {
+            throw new CmdException("核销预约失败");
+        }
+
+        ReserveGoodsConfirmOrderPo reserveGoodsConfirmOrderPo = BeanConvertUtil.covertBean(reqJson, ReserveGoodsConfirmOrderPo.class);
+        reserveGoodsConfirmOrderPo.setCoId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+        reserveGoodsConfirmOrderPo.setOrderId(reserveGoodsOrderTimeDtos.get(0).getOrderId());
+        reserveGoodsConfirmOrderPo.setType(reserveGoodsOrderDtos.get(0).getType());
+        reserveGoodsConfirmOrderPo.setGoodsId(reserveGoodsOrderDtos.get(0).getGoodsId());
+        flag = reserveGoodsConfirmOrderV1InnerServiceSMOImpl.saveReserveGoodsConfirmOrder(reserveGoodsConfirmOrderPo);
+
+        if (flag < 1) {
+            throw new CmdException("保存数据失败");
+        }
+
+        ReserveGoodsConfirmOrderDto reserveGoodsConfirmOrderDto = new ReserveGoodsConfirmOrderDto();
+        reserveGoodsConfirmOrderDto.setCoId(reserveGoodsConfirmOrderPo.getCoId());
+        List<ReserveGoodsConfirmOrderDto> reserveGoodsConfirmOrderDtos = reserveGoodsConfirmOrderV1InnerServiceSMOImpl.queryReserveGoodsConfirmOrders(reserveGoodsConfirmOrderDto);
+
+        cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(reserveGoodsConfirmOrderDtos));
+
+    }
+}

service-store/src/main/java/com/java110/store/cmd/reserveOrder/SaveReserveGoodsOrderTimeCmd.java

@@ -1,80 +0,0 @@
-/*
- * Copyright 2017-2020 吴学文 and java110 team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.java110.store.cmd.reserveOrder;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.Cmd;
-import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.intf.store.IReserveGoodsOrderTimeV1InnerServiceSMO;
-import com.java110.po.reserveGoodsOrderTime.ReserveGoodsOrderTimePo;
-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;
-
-/**
- * 类表述：保存
- * 服务编码：reserveGoodsOrderTime.saveReserveGoodsOrderTime
- * 请求路劲：/app/reserveGoodsOrderTime.SaveReserveGoodsOrderTime
- * add by 吴学文 at 2022-12-06 11:04:20 mail: 928255095@qq.com
- * open source address: https://gitee.com/wuxw7/MicroCommunity
- * 官网：http://www.homecommunity.cn
- * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
- * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
- */
-@Java110Cmd(serviceCode = "reserveOrder.saveReserveGoodsOrderTime")
-public class SaveReserveGoodsOrderTimeCmd extends Cmd {
-
-    private static Logger logger = LoggerFactory.getLogger(SaveReserveGoodsOrderTimeCmd.class);
-
-    public static final String CODE_PREFIX_ID = "10";
-
-    @Autowired
-    private IReserveGoodsOrderTimeV1InnerServiceSMO reserveGoodsOrderTimeV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "orderId", "请求报文中未包含orderId");
-Assert.hasKeyAndValue(reqJson, "goodsId", "请求报文中未包含goodsId");
-Assert.hasKeyAndValue(reqJson, "hours", "请求报文中未包含hours");
-Assert.hasKeyAndValue(reqJson, "quantity", "请求报文中未包含quantity");
-Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
-Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
-
-    }
-
-    @Override
-    @Java110Transactional
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-       ReserveGoodsOrderTimePo reserveGoodsOrderTimePo = BeanConvertUtil.covertBean(reqJson, ReserveGoodsOrderTimePo.class);
-        reserveGoodsOrderTimePo.setTimeId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
-        int flag = reserveGoodsOrderTimeV1InnerServiceSMOImpl.saveReserveGoodsOrderTime(reserveGoodsOrderTimePo);
-
-        if (flag < 1) {
-            throw new CmdException("保存数据失败");
-        }
-
-        cmdDataFlowContext.setResponseEntity(ResultVo.success());
-    }
-}

service-store/src/main/java/com/java110/store/cmd/reserveOrder/UpdateReserveGoodsOrderCmd.java

@@ -1,74 +0,0 @@
-/*
- * Copyright 2017-2020 吴学文 and java110 team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.java110.store.cmd.reserveOrder;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.Cmd;
-import com.java110.core.event.cmd.CmdEvent;
-import com.java110.intf.store.IReserveGoodsOrderV1InnerServiceSMO;
-import com.java110.po.reserveGoodsOrder.ReserveGoodsOrderPo;
-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;
-
-
-/**
- * 类表述：更新
- * 服务编码：reserveGoodsOrder.updateReserveGoodsOrder
- * 请求路劲：/app/reserveGoodsOrder.UpdateReserveGoodsOrder
- * add by 吴学文 at 2022-12-06 10:58:18 mail: 928255095@qq.com
- * open source address: https://gitee.com/wuxw7/MicroCommunity
- * 官网：http://www.homecommunity.cn
- * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
- * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
- */
-@Java110Cmd(serviceCode = "reserveOrder.updateReserveGoodsOrder")
-public class UpdateReserveGoodsOrderCmd extends Cmd {
-
-    private static Logger logger = LoggerFactory.getLogger(UpdateReserveGoodsOrderCmd.class);
-
-
-    @Autowired
-    private IReserveGoodsOrderV1InnerServiceSMO reserveGoodsOrderV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "orderId", "orderId不能为空");
-        Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
-
-    }
-
-    @Override
-    @Java110Transactional
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-        ReserveGoodsOrderPo reserveGoodsOrderPo = BeanConvertUtil.covertBean(reqJson, ReserveGoodsOrderPo.class);
-        int flag = reserveGoodsOrderV1InnerServiceSMOImpl.updateReserveGoodsOrder(reserveGoodsOrderPo);
-
-        if (flag < 1) {
-            throw new CmdException("更新数据失败");
-        }
-
-        cmdDataFlowContext.setResponseEntity(ResultVo.success());
-    }
-}

service-store/src/main/java/com/java110/store/cmd/reserveOrder/UpdateReserveGoodsOrderTimeCmd.java

@@ -1,74 +0,0 @@
-/*
- * Copyright 2017-2020 吴学文 and java110 team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.java110.store.cmd.reserveOrder;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.Cmd;
-import com.java110.core.event.cmd.CmdEvent;
-import com.java110.intf.store.IReserveGoodsOrderTimeV1InnerServiceSMO;
-import com.java110.po.reserveGoodsOrderTime.ReserveGoodsOrderTimePo;
-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;
-
-
-/**
- * 类表述：更新
- * 服务编码：reserveGoodsOrderTime.updateReserveGoodsOrderTime
- * 请求路劲：/app/reserveGoodsOrderTime.UpdateReserveGoodsOrderTime
- * add by 吴学文 at 2022-12-06 11:04:20 mail: 928255095@qq.com
- * open source address: https://gitee.com/wuxw7/MicroCommunity
- * 官网：http://www.homecommunity.cn
- * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
- * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
- */
-@Java110Cmd(serviceCode = "reserveOrder.updateReserveGoodsOrderTime")
-public class UpdateReserveGoodsOrderTimeCmd extends Cmd {
-
-    private static Logger logger = LoggerFactory.getLogger(UpdateReserveGoodsOrderTimeCmd.class);
-
-
-    @Autowired
-    private IReserveGoodsOrderTimeV1InnerServiceSMO reserveGoodsOrderTimeV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "timeId", "timeId不能为空");
-        Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
-
-    }
-
-    @Override
-    @Java110Transactional
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-        ReserveGoodsOrderTimePo reserveGoodsOrderTimePo = BeanConvertUtil.covertBean(reqJson, ReserveGoodsOrderTimePo.class);
-        int flag = reserveGoodsOrderTimeV1InnerServiceSMOImpl.updateReserveGoodsOrderTime(reserveGoodsOrderTimePo);
-
-        if (flag < 1) {
-            throw new CmdException("更新数据失败");
-        }
-
-        cmdDataFlowContext.setResponseEntity(ResultVo.success());
-    }
-}

service-store/src/main/java/com/java110/store/dao/IReserveGoodsConfirmOrderV1ServiceDao.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.store.dao;
+
+
+import com.java110.utils.exception.DAOException;
+import com.java110.entity.merchant.BoMerchant;
+import com.java110.entity.merchant.BoMerchantAttr;
+import com.java110.entity.merchant.Merchant;
+import com.java110.entity.merchant.MerchantAttr;
+
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 类表述：
+ * add by 吴学文 at 2022-12-06 16:15:13 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网：http://www.homecommunity.cn
+ * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
+ */
+public interface IReserveGoodsConfirmOrderV1ServiceDao {
+
+
+    /**
+     * 保存 预约订单时间信息
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    int saveReserveGoodsConfirmOrderInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询预约订单时间信息（instance过程）
+     * 根据bId 查询预约订单时间信息
+     * @param info bId 信息
+     * @return 预约订单时间信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getReserveGoodsConfirmOrderInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改预约订单时间信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    int updateReserveGoodsConfirmOrderInfo(Map info) throws DAOException;
+
+
+    /**
+     * 查询预约订单时间总数
+     *
+     * @param info 预约订单时间信息
+     * @return 预约订单时间数量
+     */
+    int queryReserveGoodsConfirmOrdersCount(Map info);
+
+}

service-store/src/main/java/com/java110/store/dao/impl/ReserveGoodsConfirmOrderV1ServiceDaoImpl.java

@@ -0,0 +1,112 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.store.dao.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.exception.DAOException;
+import com.java110.utils.util.DateUtil;
+import com.java110.core.base.dao.BaseServiceDao;
+import com.java110.store.dao.IReserveGoodsConfirmOrderV1ServiceDao;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 类表述：
+ * add by 吴学文 at 2022-12-06 16:15:13 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网：http://www.homecommunity.cn
+ * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
+ */
+@Service("reserveGoodsConfirmOrderV1ServiceDaoImpl")
+public class ReserveGoodsConfirmOrderV1ServiceDaoImpl extends BaseServiceDao implements IReserveGoodsConfirmOrderV1ServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(ReserveGoodsConfirmOrderV1ServiceDaoImpl.class);
+
+
+
+
+
+    /**
+     * 保存预约订单时间信息 到 instance
+     * @param info   bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public int saveReserveGoodsConfirmOrderInfo(Map info) throws DAOException {
+        logger.debug("保存 saveReserveGoodsConfirmOrderInfo 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.insert("reserveGoodsConfirmOrderV1ServiceDaoImpl.saveReserveGoodsConfirmOrderInfo",info);
+
+        return saveFlag;
+    }
+
+
+    /**
+     * 查询预约订单时间信息（instance）
+     * @param info bId 信息
+     * @return List<Map>
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getReserveGoodsConfirmOrderInfo(Map info) throws DAOException {
+        logger.debug("查询 getReserveGoodsConfirmOrderInfo 入参 info : {}",info);
+
+        List<Map> businessReserveGoodsConfirmOrderInfos = sqlSessionTemplate.selectList("reserveGoodsConfirmOrderV1ServiceDaoImpl.getReserveGoodsConfirmOrderInfo",info);
+
+        return businessReserveGoodsConfirmOrderInfos;
+    }
+
+
+    /**
+     * 修改预约订单时间信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public int updateReserveGoodsConfirmOrderInfo(Map info) throws DAOException {
+        logger.debug("修改 updateReserveGoodsConfirmOrderInfo 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.update("reserveGoodsConfirmOrderV1ServiceDaoImpl.updateReserveGoodsConfirmOrderInfo",info);
+
+        return saveFlag;
+    }
+
+     /**
+     * 查询预约订单时间数量
+     * @param info 预约订单时间信息
+     * @return 预约订单时间数量
+     */
+    @Override
+    public int queryReserveGoodsConfirmOrdersCount(Map info) {
+        logger.debug("查询 queryReserveGoodsConfirmOrdersCount 入参 info : {}",info);
+
+        List<Map> businessReserveGoodsConfirmOrderInfos = sqlSessionTemplate.selectList("reserveGoodsConfirmOrderV1ServiceDaoImpl.queryReserveGoodsConfirmOrdersCount", info);
+        if (businessReserveGoodsConfirmOrderInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessReserveGoodsConfirmOrderInfos.get(0).get("count").toString());
+    }
+
+
+}

service-store/src/main/java/com/java110/store/smo/impl/ReserveGoodsConfirmOrderV1InnerServiceSMOImpl.java

@@ -0,0 +1,89 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.store.smo.impl;
+
+
+import com.java110.store.dao.IReserveGoodsConfirmOrderV1ServiceDao;
+import com.java110.intf.store.IReserveGoodsConfirmOrderV1InnerServiceSMO;
+import com.java110.dto.reserveGoodsConfirmOrder.ReserveGoodsConfirmOrderDto;
+import com.java110.po.reserveGoodsConfirmOrder.ReserveGoodsConfirmOrderPo;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.user.UserDto;
+import com.java110.dto.PageDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 类表述： 服务之前调用的接口实现类，不对外提供接口能力 只用于接口建调用
+ * add by 吴学文 at 2022-12-06 16:15:13 mail: 928255095@qq.com
+ * open source address: https://gitee.com/wuxw7/MicroCommunity
+ * 官网：http://www.homecommunity.cn
+ * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
+ * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
+ */
+@RestController
+public class ReserveGoodsConfirmOrderV1InnerServiceSMOImpl extends BaseServiceSMO implements IReserveGoodsConfirmOrderV1InnerServiceSMO {
+
+    @Autowired
+    private IReserveGoodsConfirmOrderV1ServiceDao reserveGoodsConfirmOrderV1ServiceDaoImpl;
+
+
+    @Override
+    public int saveReserveGoodsConfirmOrder(@RequestBody  ReserveGoodsConfirmOrderPo reserveGoodsConfirmOrderPo) {
+        int saveFlag = reserveGoodsConfirmOrderV1ServiceDaoImpl.saveReserveGoodsConfirmOrderInfo(BeanConvertUtil.beanCovertMap(reserveGoodsConfirmOrderPo));
+        return saveFlag;
+    }
+
+     @Override
+    public int updateReserveGoodsConfirmOrder(@RequestBody  ReserveGoodsConfirmOrderPo reserveGoodsConfirmOrderPo) {
+        int saveFlag = reserveGoodsConfirmOrderV1ServiceDaoImpl.updateReserveGoodsConfirmOrderInfo(BeanConvertUtil.beanCovertMap(reserveGoodsConfirmOrderPo));
+        return saveFlag;
+    }
+
+     @Override
+    public int deleteReserveGoodsConfirmOrder(@RequestBody  ReserveGoodsConfirmOrderPo reserveGoodsConfirmOrderPo) {
+       reserveGoodsConfirmOrderPo.setStatusCd("1");
+       int saveFlag = reserveGoodsConfirmOrderV1ServiceDaoImpl.updateReserveGoodsConfirmOrderInfo(BeanConvertUtil.beanCovertMap(reserveGoodsConfirmOrderPo));
+       return saveFlag;
+    }
+
+    @Override
+    public List<ReserveGoodsConfirmOrderDto> queryReserveGoodsConfirmOrders(@RequestBody  ReserveGoodsConfirmOrderDto reserveGoodsConfirmOrderDto) {
+
+        //校验是否传了 分页信息
+
+        int page = reserveGoodsConfirmOrderDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            reserveGoodsConfirmOrderDto.setPage((page - 1) * reserveGoodsConfirmOrderDto.getRow());
+        }
+
+        List<ReserveGoodsConfirmOrderDto> reserveGoodsConfirmOrders = BeanConvertUtil.covertBeanList(reserveGoodsConfirmOrderV1ServiceDaoImpl.getReserveGoodsConfirmOrderInfo(BeanConvertUtil.beanCovertMap(reserveGoodsConfirmOrderDto)), ReserveGoodsConfirmOrderDto.class);
+
+        return reserveGoodsConfirmOrders;
+    }
+
+
+    @Override
+    public int queryReserveGoodsConfirmOrdersCount(@RequestBody ReserveGoodsConfirmOrderDto reserveGoodsConfirmOrderDto) {
+        return reserveGoodsConfirmOrderV1ServiceDaoImpl.queryReserveGoodsConfirmOrdersCount(BeanConvertUtil.beanCovertMap(reserveGoodsConfirmOrderDto));    }
+
+}