加入我的预约订单功能

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

@@ -39,7 +39,7 @@ public class ReserveGoodsOrderTimeDto extends PageDto implements Serializable {
     private String appointmentTime;
     private String personName;
     private String personTel;
-    private String goodName;
+    private String goodsName;
     private String receivedAmount;
     private String stateName;
 
@@ -149,13 +149,7 @@ public class ReserveGoodsOrderTimeDto extends PageDto implements Serializable {
         this.personTel = personTel;
     }
 
-    public String getGoodName() {
-        return goodName;
-    }
 
-    public void setGoodName(String goodName) {
-        this.goodName = goodName;
-    }
 
     public String getReceivedAmount() {
         return receivedAmount;
@@ -172,4 +166,12 @@ public class ReserveGoodsOrderTimeDto extends PageDto implements Serializable {
     public void setStateName(String stateName) {
         this.stateName = stateName;
     }
+
+    public String getGoodsName() {
+        return goodsName;
+    }
+
+    public void setGoodsName(String goodsName) {
+        this.goodsName = goodsName;
+    }
 }

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

@@ -24,7 +24,7 @@
         from reserve_goods_order_time t
         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' and rgo.state = td.status_cd
+        left join t_dict td on td.table_name = 'reserve_goods_order_time' and td.table_columns = 'state' and t.state = td.status_cd
         where 1 =1
         <if test="appointmentTime !=null and appointmentTime != ''">
             and rgo.appointment_time = #{appointmentTime}

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

@@ -187,7 +187,7 @@ public class SaveReserveGoodsOrderCmd extends Cmd {
             reserveGoodsOrderTimePo.setHours(openTimes.getJSONObject(timeIndex).getString("hours"));
             reserveGoodsOrderTimePo.setQuantity(openTimes.getJSONObject(timeIndex).getString("quantity"));
             reserveGoodsOrderTimePo.setTimeId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
-            reserveGoodsOrderTimePo.setState(CommunitySpacePersonTimeDto.STATE_WAIT_CONFIRM);
+            reserveGoodsOrderTimePo.setState(ReserveGoodsOrderTimeDto.STATE_WAIT_CONFIRM);
             reserveGoodsOrderTimeV1InnerServiceSMOImpl.saveReserveGoodsOrderTime(reserveGoodsOrderTimePo);
         }