elink-star
/
esua-epdc-js
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1、顺道捎列表新增订单状态 

2、拼团购新增取货状态字段
feature/syp_points
liuchuang 5 years ago
parent
684ea9fed4
commit
c1f44181d2
11 changed files with 77 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/GroupBuyInfoDTO.java
  2. 8
      esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAddGroupBuyInfoFormDTO.java
  3. 7
      esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectGroupBuyDetailResultDTO.java
  4. 7
      esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectGroupBuyInfoListResultDTO.java
  5. 7
      esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectMyGroupBuyJoinInfoListResultDTO.java
  6. 6
      esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectMyGroupBuyPublishInfoListResultDTO.java
  7. 7
      esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectSdsInfoListResultDTO.java
  8. 6
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/entity/GroupBuyInfoEntity.java
  9. 20
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuyInfoServiceImpl.java
  10. 24
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/groupBuy/GroupBuyInfoDao.xml
  11. 5
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/sds/SdsInfoDao.xml

5
esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/GroupBuyInfoDTO.java
View File

@ -207,4 +207,9 @@ public class GroupBuyInfoDTO implements Serializable {
*/
List<String> images;
/**
* 取货方式：1-包邮，2-自提
*/
private Integer pickupMethod;
}

8
esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAddGroupBuyInfoFormDTO.java
View File

@ -140,4 +140,10 @@ public class EpdcAddGroupBuyInfoFormDTO implements Serializable {
private Boolean isConReview = false;
}
/**
* 取货方式：1-包邮，2-自提
*/
@NotNull(message = "取货方式不能为空")
private Integer pickupMethod;
}

7
esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectGroupBuyDetailResultDTO.java
View File

@ -93,4 +93,9 @@ public class EpdcSelectGroupBuyDetailResultDTO implements Serializable {
*/
private List<GroupBuyPriceNumberDTO> groupBuyPriceNumber;
}
/**
* 取货方式：1-包邮，2-自提
*/
private Integer pickupMethod;
}

7
esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectGroupBuyInfoListResultDTO.java
View File

@ -65,6 +65,9 @@ public class EpdcSelectGroupBuyInfoListResultDTO implements Serializable {
*/
private String topFlag;
/**
* 取货方式：1-包邮，2-自提
*/
private Integer pickupMethod;
}
}

7
esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectMyGroupBuyJoinInfoListResultDTO.java
View File

@ -65,4 +65,9 @@ public class EpdcSelectMyGroupBuyJoinInfoListResultDTO implements Serializable {
*/
private List<String> groupBuyImg;
}
/**
* 取货方式：1-包邮，2-自提
*/
private Integer pickupMethod;
}

6
esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectMyGroupBuyPublishInfoListResultDTO.java
View File

@ -65,5 +65,9 @@ public class EpdcSelectMyGroupBuyPublishInfoListResultDTO implements Serializabl
*/
private List<String> groupBuyImg;
/**
* 取货方式：1-包邮，2-自提
*/
private Integer pickupMethod;
}
}

7
esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectSdsInfoListResultDTO.java
View File

@ -53,4 +53,9 @@ public class EpdcSelectSdsInfoListResultDTO implements Serializable {
* 出发时间
*/
private Date departureTime;
}
/**
* 订单状态：0-进行中，1-已结束
*/
private Integer status;
}

6
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/entity/GroupBuyInfoEntity.java
View File

@ -22,6 +22,7 @@ import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
import java.util.Date;
/**
@ -165,6 +166,9 @@ public class GroupBuyInfoEntity extends BaseEpdcEntity {
*/
private String cancelReason;
/**
* 取货方式：1-包邮，2-自提
*/
private Integer pickupMethod;
}

20
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuyInfoServiceImpl.java
View File

@ -198,6 +198,16 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl<GroupBuyInfoDao, Gr
@Override
@Transactional(rollbackFor = Exception.class)
public Result publishOrUpdate(EpdcAddGroupBuyInfoFormDTO formDTO) {
if(formDTO.getGroupBuyPriceNumber().size()==0){
return new Result().error("人数价格信息至少填写一条");
}
if(formDTO.getGroupBuyPriceNumber().size()>5){
return new Result().error("人数价格信息最多填写五条");
}
if(formDTO.getGroupBuyImg()!=null && formDTO.getGroupBuyImg().size()>3){
return new Result().error("图片最多上传三张");
}
//内容审核 - start
Boolean isConReview = formDTO.getIsConReview();
List<String> textList = new ArrayList<>();
@ -223,15 +233,7 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl<GroupBuyInfoDao, Gr
//新增
insert(groupBuyInfoEntity);
}
if(formDTO.getGroupBuyPriceNumber().size()==0){
return new Result().error("人数价格信息至少填写一条");
}
if(formDTO.getGroupBuyPriceNumber().size()>5){
return new Result().error("人数价格信息最多填写五条");
}
if(formDTO.getGroupBuyImg()!=null && formDTO.getGroupBuyImg().size()>3){
return new Result().error("图片最多上传三张");
}
//插入或更新后插入价格人数和图片表
insertPriceNumAndImgs(groupBuyInfoEntity.getId(),formDTO.getGroupBuyImg(),formDTO.getGroupBuyPriceNumber());

24
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/groupBuy/GroupBuyInfoDao.xml
View File

@ -8,13 +8,14 @@
<result property="groupBuyStatus" column="groupBuyStatus"/>
<result property="groupBuyPublishTime" column="groupBuyPublishTime"/>
<result property="topFlag" column="TOP_FLAG"/>
<result property="pickupMethod" column="PICKUP_METHOD"/>
<collection property="groupBuyImg" ofType="java.lang.String">
<result property="image" column="IMG_URL"/>
</collection>
</resultMap>
<select id="getGroupBuyList"
resultMap="getGroupBuyListMap">
select egbi.ID, egbi.GROUP_BUY_TITLE, egbi.groupBuyStatus, egbi.groupBuyPublishTime, egbi.TOP_FLAG,t1.IMG_URL
select egbi.ID, egbi.GROUP_BUY_TITLE, egbi.groupBuyStatus, egbi.groupBuyPublishTime, egbi.TOP_FLAG,egbi.PICKUP_METHOD,t1.IMG_URL
from (
select t.ID,
t.GROUP_BUY_TITLE,
@ -22,7 +23,8 @@
t.CREATED_TIME as groupBuyPublishTime,
t.TOP_FLAG,
t.TOP_TIME,
t.CREATED_TIME
t.CREATED_TIME,
t.PICKUP_METHOD
from epdc_group_buy_info t
where t.DEL_FLAG = '0'
and t.SHIELD_FLAG = '0'
@ -43,6 +45,7 @@
<result property="cancelReason" column="CANCEL_REASON"/>
<result property="groupBuyStatus" column="groupBuyStatus"/>
<result property="groupBuyEndTime" column="GROUP_BUY_END_TIME"/>
<result property="pickupMethod" column="PICKUP_METHOD"/>
<collection property="groupBuyImg" ofType="java.lang.String">
<result property="image" column="IMG_URL"/>
</collection>
@ -74,7 +77,8 @@
t2.GROUP_BUY_NUMBER,
t2.GROUP_BUY_PRICE,
t1.IMG_URL,
t.GROUP_BUY_END_TIME
t.GROUP_BUY_END_TIME,
t.PICKUP_METHOD
from epdc_group_buy_info t
left join
epdc_custom_img t1
@ -103,6 +107,7 @@
<result property="groupBuyStatus" column="groupBuyStatus"/>
<result property="groupBuyPublishTime" column="groupBuyPublishTime"/>
<result property="isEvaluation" column="isEvaluation"/>
<result property="pickupMethod" column="PICKUP_METHOD"/>
<collection property="groupBuyImg" ofType="java.lang.String">
<result property="image" column="IMG_URL"/>
</collection>
@ -114,6 +119,7 @@
egbi.groupBuyStatus,
egbi.groupBuyPublishTime,
egbi.isEvaluation,
egbi.PICKUP_METHOD,
t1.IMG_URL
from (
select t.ID,
@ -125,7 +131,8 @@
where egbe.DEL_FLAG = '0'
and egbe.USER_ID = t2.USER_ID
and egbe.GROUP_BUY_ID = t.ID) = 0, 0, 1) isEvaluation,
t.CREATED_TIME
t.CREATED_TIME,
t.PICKUP_METHOD
from epdc_group_buy_info t
left join epdc_group_buy_sign_up t2 on t2.GROUP_BUY_ID = t.ID and t2.DEL_FLAG = '0'
where t.DEL_FLAG = '0'
@ -146,6 +153,7 @@
<result property="groupBuyStatus" column="groupBuyStatus"/>
<result property="groupBuyPublishTime" column="groupBuyPublishTime"/>
<result property="isEdit" column="isEdit"/>
<result property="pickupMethod" column="PICKUP_METHOD"/>
<collection property="groupBuyImg" ofType="java.lang.String">
<result property="image" column="IMG_URL"/>
</collection>
@ -157,6 +165,7 @@
egbi.groupBuyStatus,
egbi.groupBuyPublishTime,
egbi.isEdit,
egbi.PICKUP_METHOD,
t1.IMG_URL
from(
select t.ID,
@ -164,7 +173,8 @@
if(t.GROUP_BUY_STATUS = '0' and t.GROUP_BUY_END_TIME is not null and t.GROUP_BUY_END_TIME &lt; now(),4,t.GROUP_BUY_STATUS) as groupBuyStatus,
t.CREATED_TIME as groupBuyPublishTime,
if(t.GROUP_BUY_STATUS = 10 or t.GROUP_BUY_STATUS = 5 or t2.ID is not null,0,1)isEdit,
t.CREATED_TIME
t.CREATED_TIME,
t.PICKUP_METHOD
from epdc_group_buy_info t
left join
(select * from epdc_group_buy_sign_up where DEL_FLAG = '0' and SIGN_UP_STATUS != 10 group by GROUP_BUY_ID)t2
@ -224,6 +234,7 @@
<result property="cancelReason" column="CANCEL_REASON"/>
<result property="createdTime" column="CREATED_TIME"/>
<result property="groupBuyEndTime" column="GROUP_BUY_END_TIME"/>
<result property="pickupMethod" column="PICKUP_METHOD"/>
<collection property="prices" ofType="com.elink.esua.epdc.dto.GroupBuyPriceNumberDTO">
<result property="groupBuyNumber" column="GROUP_BUY_NUMBER"/>
<result property="groupBuyPrice" column="GROUP_BUY_PRICE"/>
@ -249,7 +260,8 @@
n.GROUP_BUY_NUMBER,
n.GROUP_BUY_PRICE,
img.IMG_URL,
i.GROUP_BUY_END_TIME
i.GROUP_BUY_END_TIME,
i.PICKUP_METHOD
FROM
`epdc_group_buy_info` i
LEFT JOIN epdc_group_buy_price_number n ON n.GROUP_BUY_ID = i.ID

5
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/sds/SdsInfoDao.xml
View File

@ -40,7 +40,8 @@
t.ID,
t.DEPARTURE,
t.DESTINATION,
t.DEPARTURE_TIME
t.DEPARTURE_TIME,
CASE WHEN DEPARTURE_TIME > NOW() THEN 0 ELSE 1 END AS `STATUS`
from epdc_sds_info t
where t.DEL_FLAG = '0' and t.SHIELD_FLAG = '0'
<if test="type!=null and type!='' and type == '0'.toString()">
@ -82,4 +83,4 @@
<update id="updateGridByDeptId">
UPDATE epdc_sds_info SET GRID = #{newDeptName}, UPDATED_TIME = NOW() WHERE GRID_ID = #{deptId}
</update>
</mapper>
</mapper>

Write Preview
Loading…
Cancel
Save