加入我的预约订单功能

java110-bean/src/main/java/com/java110/dto/reserveGoodsOrderTime/ReserveGoodsOrderTimeDto.java

@@ -15,6 +15,12 @@ import java.util.Date;
  **/
 public class ReserveGoodsOrderTimeDto extends PageDto implements Serializable {
 
+
+    public static final String STATE_WAIT_CONFIRM = "W"; //待核销
+    public static final String STATE_FINISH = "C"; // 核销完成
+
+    public static final String STATE_CL = "CL";//取消预约
+
     private String hours;
     private String quantity;
     private String timeId;
@@ -31,6 +37,11 @@ public class ReserveGoodsOrderTimeDto extends PageDto implements Serializable {
     private String statusCd = "0";
 
     private String appointmentTime;
+    private String personName;
+    private String personTel;
+    private String goodName;
+    private String receivedAmount;
+    private String stateName;
 
 
     public String getHours() {
@@ -121,4 +132,44 @@ public class ReserveGoodsOrderTimeDto extends PageDto implements Serializable {
     public void setAppointmentTime(String appointmentTime) {
         this.appointmentTime = appointmentTime;
     }
+
+    public String getPersonName() {
+        return personName;
+    }
+
+    public void setPersonName(String personName) {
+        this.personName = personName;
+    }
+
+    public String getPersonTel() {
+        return personTel;
+    }
+
+    public void setPersonTel(String personTel) {
+        this.personTel = personTel;
+    }
+
+    public String getGoodName() {
+        return goodName;
+    }
+
+    public void setGoodName(String goodName) {
+        this.goodName = goodName;
+    }
+
+    public String getReceivedAmount() {
+        return receivedAmount;
+    }
+
+    public void setReceivedAmount(String receivedAmount) {
+        this.receivedAmount = receivedAmount;
+    }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
 }

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

@@ -18,9 +18,13 @@
     <!-- 查询预约订单时间信息 add by wuxw 2018-07-03 -->
     <select id="getReserveGoodsOrderTimeInfo" parameterType="Map" resultType="Map">
         select t.hours,t.quantity,t.time_id,t.time_id timeId,t.order_id,t.order_id orderId,t.goods_id,t.goods_id
-        goodsId,t.status_cd,t.status_cd statusCd,t.state,t.community_id,t.community_id communityId
+        goodsId,t.status_cd,t.status_cd statusCd,t.state,t.community_id,t.community_id communityId,rgo.person_name personName,
+        rgo.person_tel personTel,rgo.appointment_time appointmentTime,rg.goods_name goodName,rgo.received_amount receivedAmount,rgo.state,
+        td.`name` stateName
         from reserve_goods_order_time t
-        left join reserve_goods_order rgo on t.goods_id = rgo.goods_id and rgo.status_cd='0'
+        left join reserve_goods_order rgo on t.order_id = rgo.order_id and rgo.status_cd='0'
+        left join reserve_goods rg on t.goods_id = rg.goods_id and rg.status_cd = '0'
+        left join t_dict td on td.table_name = 'reserve_goods_order' and td.table_columns = 'state'
         where 1 =1
         <if test="appointmentTime !=null and appointmentTime != ''">
             and rgo.appointment_time = #{appointmentTime}

service-acct/src/main/java/com/java110/acct/smo/impl/AccountInnerServiceSMOImpl.java

@@ -209,7 +209,7 @@ public class AccountInnerServiceSMOImpl extends BaseServiceSMO implements IAccou
             }
             accountDetailPo.setObjType(accounts.get(0).getObjType());
         } finally {
-            DistributedLock.releaseDistributedLock(requestId, key);
+            DistributedLock.releaseDistributedLock(key,requestId);
         }
         accountDetailPo.setDetailType(AccountDetailDto.DETAIL_TYPE_OUT);
         if(StringUtil.isEmpty(accountDetailPo.getDetailId())) {

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

@@ -0,0 +1,131 @@
+/*
+ * 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.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.reserveGoodsOrder.ReserveGoodsOrderDto;
+import com.java110.dto.reserveGoodsOrderTime.ReserveGoodsOrderTimeDto;
+import com.java110.dto.user.UserDto;
+import com.java110.intf.store.IReserveGoodsOrderTimeV1InnerServiceSMO;
+import com.java110.intf.store.IReserveGoodsOrderV1InnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
+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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * 类表述：查询
+ * 服务编码：reserveGoodsOrder.listReserveGoodsOrder
+ * 请求路劲：/app/reserveGoodsOrder.ListReserveGoodsOrder
+ * 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.listMyReserveGoodsOrderTime")
+public class ListMyReserveGoodsOrderTimeCmd extends Cmd {
+
+    private static Logger logger = LoggerFactory.getLogger(ListMyReserveGoodsOrderTimeCmd.class);
+    @Autowired
+    private IReserveGoodsOrderV1InnerServiceSMO reserveGoodsOrderV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IUserInnerServiceSMO userInnerServiceSMOImpl;
+
+    @Autowired
+    private IReserveGoodsOrderTimeV1InnerServiceSMO reserveGoodsOrderTimeV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
+        super.validatePageInfo(reqJson);
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+
+        String userId = cmdDataFlowContext.getReqHeaders().get("user-id");
+
+        UserDto userDto = new UserDto();
+        userDto.setUserId(userId);
+        List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
+
+        Assert.listOnlyOne(userDtos,"用户不存在");
+
+        ReserveGoodsOrderTimeDto reserveGoodsOrderTimeDto = BeanConvertUtil.covertBean(reqJson, ReserveGoodsOrderTimeDto.class);
+        reserveGoodsOrderTimeDto.setPersonTel(userDtos.get(0).getTel());
+
+        int count = reserveGoodsOrderTimeV1InnerServiceSMOImpl.queryReserveGoodsOrderTimesCount(reserveGoodsOrderTimeDto);
+
+        List<ReserveGoodsOrderTimeDto> reserveGoodsOrderTimeDtos = null;
+
+        if (count > 0) {
+            reserveGoodsOrderTimeDtos = reserveGoodsOrderTimeV1InnerServiceSMOImpl.queryReserveGoodsOrderTimes(reserveGoodsOrderTimeDto);
+        } else {
+            reserveGoodsOrderTimeDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, reserveGoodsOrderTimeDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        cmdDataFlowContext.setResponseEntity(responseEntity);
+    }
+
+    /**
+     * 刷入时间
+     *
+     * @param reserveGoodsOrderDtos
+     */
+    private void freshTimes(List<ReserveGoodsOrderDto> reserveGoodsOrderDtos) {
+        if (reserveGoodsOrderDtos == null || reserveGoodsOrderDtos.size() < 1) {
+            return;
+        }
+        List<String> goodsIds = new ArrayList<>();
+        for (ReserveGoodsOrderDto reserveGoodsOrderDto : reserveGoodsOrderDtos) {
+            goodsIds.add(reserveGoodsOrderDto.getGoodsId());
+        }
+
+        ReserveGoodsOrderTimeDto reserveGoodsOrderTimeDto = new ReserveGoodsOrderTimeDto();
+        reserveGoodsOrderTimeDto.setGoodsIds(goodsIds.toArray(new String[goodsIds.size()]));
+        List<ReserveGoodsOrderTimeDto> reserveGoodsOrderTimeDtos
+                = reserveGoodsOrderTimeV1InnerServiceSMOImpl.queryReserveGoodsOrderTimes(reserveGoodsOrderTimeDto);
+        List<ReserveGoodsOrderTimeDto> times = null;
+        for (ReserveGoodsOrderDto reserveGoodsOrderDto : reserveGoodsOrderDtos) {
+            times = new ArrayList<>();
+            for (ReserveGoodsOrderTimeDto tmpReserveGoodsOrderTimeDto : reserveGoodsOrderTimeDtos) {
+                if (reserveGoodsOrderDto.getGoodsId().equals(tmpReserveGoodsOrderTimeDto.getGoodsId())) {
+                    times.add(tmpReserveGoodsOrderTimeDto);
+                }
+            }
+            reserveGoodsOrderDto.setTimes(times);
+        }
+    }
+}