加入代码

java110-bean/src/main/java/com/java110/dto/reserveGoodsOrder/ReserveGoodsOrderDto.java

@@ -16,7 +16,11 @@ import java.util.List;
  * add by wuxw 2019/4/24
  **/
 public class ReserveGoodsOrderDto extends PageDto implements Serializable {
-
+    public static final String STATE_S = "S"; //预约成功
+    public static final String STATE_F = "F";//预约失败
+    public static final String STATE_W = "W";//待审核
+    public static final String STATE_WP = "WP";//待支付
+    public static final String STATE_CL = "CL";//取消预约
     private String orderId;
     private String goodsId;
     private String goodsName;

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

@@ -42,7 +42,7 @@
         <if test="type !=null and type != ''">
             and t.type= #{type}
         </if>
-        order by t.create_time desc
+        order by t.sort
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>

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

@@ -26,6 +26,7 @@ import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.communitySpacePerson.CommunitySpacePersonDto;
 import com.java110.dto.communitySpacePersonTime.CommunitySpacePersonTimeDto;
 import com.java110.dto.reserveGoods.ReserveGoodsDto;
+import com.java110.dto.reserveGoodsOrder.ReserveGoodsOrderDto;
 import com.java110.dto.reserveGoodsOrderTime.ReserveGoodsOrderTimeDto;
 import com.java110.dto.reserveParams.ReserveParamsDto;
 import com.java110.intf.store.IReserveGoodsOrderTimeV1InnerServiceSMO;
@@ -166,9 +167,9 @@ public class SaveReserveGoodsOrderCmd extends Cmd {
         if (StringUtil.isEmpty(reserveGoodsOrderPo.getExtOrderId())) {
             reserveGoodsOrderPo.setExtOrderId("-1");
         }
-        if (StringUtil.isEmpty(reserveGoodsOrderPo.getState())) {
-            reserveGoodsOrderPo.setState(CommunitySpacePersonDto.STATE_W);
-        }
+
+        reserveGoodsOrderPo.setState(ReserveGoodsOrderDto.STATE_W);
+
         int flag = reserveGoodsOrderV1InnerServiceSMOImpl.saveReserveGoodsOrder(reserveGoodsOrderPo);
 
         if (flag < 1) {