Skip to content

GitLab

Q
qk_backend
Commit a87507d4 authored by shiyu's avatar shiyu
Browse files
Options

订单详情新增团购进度信息

parent 4bd10991
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 93 deletions
ch-dao/src/main/java/com/wwdz/ch/db/domain/distribution/DistributionOrder.java
View file @ a87507d4
...@@ -177,6 +177,8 @@ public class DistributionOrder implements Entity { ...@@ -177,6 +177,8 @@ public class DistributionOrder implements Entity {
*/ */
private BigDecimal channelRebate; private BigDecimal channelRebate;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Override @Override
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/vo/distribution/DistributionOrderDetailVo.java
View file @ a87507d4
package com.wwdz.ch.wx.entity.vo.distribution; package com.wwdz.ch.wx.entity.vo.distribution;
import com.wwdz.ch.wx.entity.GroupPurchaseInfo;
import com.xxdxxs.entity.Entity; import com.xxdxxs.entity.Entity;
import lombok.Data; import lombok.Data;
...@@ -275,4 +276,6 @@ public class DistributionOrderDetailVo implements Entity { ...@@ -275,4 +276,6 @@ public class DistributionOrderDetailVo implements Entity {
* 团购状态 * 团购状态
*/ */
private String groupPurchaseStateName; private String groupPurchaseStateName;
private GroupPurchaseInfo groupPurchaseInfo;
} }
ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/vo/distribution/DistributionOrderVo.java
View file @ a87507d4
package com.wwdz.ch.wx.entity.vo.distribution; package com.wwdz.ch.wx.entity.vo.distribution;
import com.wwdz.ch.wx.entity.GroupPurchaseInfo;
import com.xxdxxs.entity.Entity; import com.xxdxxs.entity.Entity;
import lombok.Data; import lombok.Data;
...@@ -208,5 +209,10 @@ public class DistributionOrderVo implements Entity { ...@@ -208,5 +209,10 @@ public class DistributionOrderVo implements Entity {
* 团购状态 * 团购状态
*/ */
private String groupPurchaseStateName; private String groupPurchaseStateName;
/**
* 团购相关信息
*/
private GroupPurchaseInfo groupPurchaseInfo;
} }
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/DistributionOrderServiceImpl.java
View file @ a87507d4
...@@ -824,63 +824,6 @@ public class DistributionOrderServiceImpl implements DistributionOrderService { ...@@ -824,63 +824,6 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
//创建鉴定单 //创建鉴定单
identifyOrderService.createIdentifyOrder(dto); identifyOrderService.createIdentifyOrder(dto);
/*IdentifyOrder identifyOrder = identifyOrderDao.findByDistributionOrderId(distributionOrderId);
//修改鉴定单状态。待平台收货
IdentifyOrder updateDto = new IdentifyOrder();
updateDto.setIdentifyOrderId(identifyOrder.getIdentifyOrderId());
updateDto.setFromLogisticsCode(dto.getLogisticsCode());
updateDto.setFromWaybill(dto.getWaybill());
updateDto.setReturnName(dto.getReturnName());
updateDto.setReturnAddress(dto.getReturnAddress());
updateDto.setReturnPhone(dto.getReturnPhone());
updateDto.setState(DistributionEnum.IdentifyOrderStateEnum.CHANNEL_WAIT_RECEIVE.getCode());
identifyOrderDao.update(updateDto);*/
/* Date now = new Date();
DistributionOrder orderUpdateDto = new DistributionOrder();
orderUpdateDto.setDistributionOrderId(distributionOrderId);
orderUpdateDto.setLogisticsCode(dto.getLogisticsCode());
orderUpdateDto.setWaybill(dto.getWaybill());
orderUpdateDto.setDeliveryTime(now);
orderUpdateDto.setState(DistributionEnum.DistributionOrderStateEnum.PRE_SIGNED.getCode());
distributionOrderDao.update(orderUpdateDto);
//发货成功，发送模板信息通知分销商和用户
try {
DeliveryNoticeMsg deliveryNoticeMsg = new DeliveryNoticeMsg();
deliveryNoticeMsg.setDistributionOrderId(distributionOrderId);
deliveryNoticeMsg.setWaybill(dto.getWaybill());
deliveryNoticeMsg.setAddress(distributionOrder.getReceiverName() + " " + distributionOrder.getReceiverPhone() + " " + distributionOrder.getReceiverAddress());
SupplierItem supplierItem = supplierItemDao.findById(distributionOrder.getItemId());
deliveryNoticeMsg.setItemName(supplierItem.getName());
deliveryNoticeMsg.setDeliveryTime(now);
//发送给卖家
if (dto.getUserId() == null || distributionOrder.getSellerId().longValue() != dto.getUserId()) {
String sellerOpenId = sendMsgService.getOpenIdByUserId(distributionOrder.getSellerId());
if (com.xxdxxs.utils.StringUtils.hasLength(sellerOpenId)) {
if (distributionOrder.getType().intValue() == DistributionEnum.DistributionTypeEnum.COLLECT.getCode()) {
deliveryNoticeMsg.setShopState(2);
} else {
deliveryNoticeMsg.setShopState(1);
}
sendMsgService.sendDeliveryTempletMsg(sellerOpenId, deliveryNoticeMsg);
} else {
logger.info(">>>>> 卖家id :{}, 获取openid失败 <<<<<", distributionOrder.getSellerId());
}
}
//发送给买家
String buyerOpenId = sendMsgService.getOpenIdByUserId(distributionOrder.getBuyerId());
if (com.xxdxxs.utils.StringUtils.hasLength(buyerOpenId)) {
deliveryNoticeMsg.setShopState(0);
sendMsgService.sendDeliveryTempletMsg(buyerOpenId, deliveryNoticeMsg);
} else {
logger.info(">>>>> 买家openid为空, 发送消息失败 <<<<<");
}
} catch (Exception e) {
logger.info("分销订单发货通知模板信息发送失败:{}", e);
}*/
return Result.success(); return Result.success();
} catch (Exception e) { } catch (Exception e) {
logger.info("发货失败 error: {}", e); logger.info("发货失败 error: {}", e);
...@@ -1047,8 +990,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService { ...@@ -1047,8 +990,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
//查询用户的购买订单 //查询用户的购买订单
List<DistributionOrder> distributionOrderList = distributionOrderDao.findByPage(dto); List<DistributionOrder> distributionOrderList = distributionOrderDao.findByPage(dto);
PageInfo pageInfo = new PageInfo<>(distributionOrderList); PageInfo pageInfo = new PageInfo<>(distributionOrderList);
for (DistributionOrder distributionOrder : distributionOrderList) {
distributionOrderList.forEach(distributionOrder -> {
DistributionOrderVo distributionOrderVo = new DistributionOrderVo(); DistributionOrderVo distributionOrderVo = new DistributionOrderVo();
EntityMapper.copyAttribute(distributionOrder, distributionOrderVo); EntityMapper.copyAttribute(distributionOrder, distributionOrderVo);
SupplierItem supplierItem = supplierItemDao.findById(distributionOrder.getItemId()); SupplierItem supplierItem = supplierItemDao.findById(distributionOrder.getItemId());
...@@ -1059,17 +1001,14 @@ public class DistributionOrderServiceImpl implements DistributionOrderService { ...@@ -1059,17 +1001,14 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
distributionOrderVo.setStateName(DistributionEnum.DistributionOrderStateEnum.getNameByCode(distributionOrder.getState())); distributionOrderVo.setStateName(DistributionEnum.DistributionOrderStateEnum.getNameByCode(distributionOrder.getState()));
distributionOrderVo.setTypeName(DistributionEnum.DistributionTypeEnum.getNameByCode(distributionOrder.getType())); distributionOrderVo.setTypeName(DistributionEnum.DistributionTypeEnum.getNameByCode(distributionOrder.getType()));
distributionOrderVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos())); distributionOrderVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.GROUP_PURCHASE.getCode()) { if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.GROUP_PURCHASE.getCode()) {
GroupPurchaseConfig groupPurchaseConfig = groupPurchaseConfigDao.findByItemId(distributionOrder.getItemId()); GroupPurchaseRecordRequestDto groupPurchaseRecordRequestDto = new GroupPurchaseRecordRequestDto();
distributionOrderVo.setGroupPurchaseEndTime(groupPurchaseConfig.getEndTime()); groupPurchaseRecordRequestDto.setItemId(distributionOrder.getItemId());
if (groupPurchaseConfig.getEndTime().before(new Date())) { Result<GroupPurchaseInfo> result = groupPurchaseService.checkGroupPurchase(groupPurchaseRecordRequestDto);
distributionOrderVo.setGroupPurchaseState(GroupPurchaseEnum.ItemStateEnum.END.getCode()); if (!result.getSuccess()) {
distributionOrderVo.setGroupPurchaseStateName(GroupPurchaseEnum.ItemStateEnum.END.getDes()); continue;
} else {
distributionOrderVo.setGroupPurchaseState(GroupPurchaseEnum.ItemStateEnum.PROCESSING.getCode());
distributionOrderVo.setGroupPurchaseStateName(GroupPurchaseEnum.ItemStateEnum.PROCESSING.getDes());
} }
distributionOrderVo.setGroupPurchaseInfo(result.getData());
} }
Date date = distributionOrder.getCreateTime(); Date date = distributionOrder.getCreateTime();
if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode() || distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.GROUP_PURCHASE.getCode()) { if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode() || distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.GROUP_PURCHASE.getCode()) {
...@@ -1082,7 +1021,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService { ...@@ -1082,7 +1021,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
distributionOrderVo.setPayEndTime(time); distributionOrderVo.setPayEndTime(time);
} }
distributionOrderVoList.add(distributionOrderVo); distributionOrderVoList.add(distributionOrderVo);
}); }
return Result.success(PageSearchResult.of(pageInfo, distributionOrderVoList)); return Result.success(PageSearchResult.of(pageInfo, distributionOrderVoList));
} catch (Exception e) { } catch (Exception e) {
logger.error("查询用户订单列表失败 error : {}", e); logger.error("查询用户订单列表失败 error : {}", e);
...@@ -1112,14 +1051,11 @@ public class DistributionOrderServiceImpl implements DistributionOrderService { ...@@ -1112,14 +1051,11 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
distributionOrderDetailVo.setTypeName(DistributionEnum.DistributionTypeEnum.getNameByCode(distributionOrder.getType())); distributionOrderDetailVo.setTypeName(DistributionEnum.DistributionTypeEnum.getNameByCode(distributionOrder.getType()));
distributionOrderDetailVo.setLogisticsName(LogisticsEnum.getNameByCode(distributionOrder.getLogisticsCode())); distributionOrderDetailVo.setLogisticsName(LogisticsEnum.getNameByCode(distributionOrder.getLogisticsCode()));
if (type == DistributionEnum.DistributionTypeEnum.GROUP_PURCHASE.getCode()) { if (type == DistributionEnum.DistributionTypeEnum.GROUP_PURCHASE.getCode()) {
GroupPurchaseConfig groupPurchaseConfig = groupPurchaseConfigDao.findByItemId(distributionOrder.getItemId()); GroupPurchaseRecordRequestDto groupPurchaseRecordRequestDto = new GroupPurchaseRecordRequestDto();
distributionOrderDetailVo.setGroupPurchaseEndTime(groupPurchaseConfig.getEndTime()); groupPurchaseRecordRequestDto.setItemId(distributionOrder.getItemId());
if (groupPurchaseConfig.getEndTime().before(new Date())) { Result<GroupPurchaseInfo> result = groupPurchaseService.checkGroupPurchase(groupPurchaseRecordRequestDto);
distributionOrderDetailVo.setGroupPurchaseState(GroupPurchaseEnum.ItemStateEnum.END.getCode()); if (result.getSuccess()) {
distributionOrderDetailVo.setGroupPurchaseStateName(GroupPurchaseEnum.ItemStateEnum.END.getDes()); distributionOrderDetailVo.setGroupPurchaseInfo(result.getData());
} else {
distributionOrderDetailVo.setGroupPurchaseState(GroupPurchaseEnum.ItemStateEnum.PROCESSING.getCode());
distributionOrderDetailVo.setGroupPurchaseStateName(GroupPurchaseEnum.ItemStateEnum.PROCESSING.getDes());
} }
} }
if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.COLLECT.getCode() if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.COLLECT.getCode()
...@@ -1198,15 +1134,13 @@ public class DistributionOrderServiceImpl implements DistributionOrderService { ...@@ -1198,15 +1134,13 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
distributionOrderVo.setTypeName(DistributionEnum.DistributionTypeEnum.getNameByCode(distributionOrder.getType())); distributionOrderVo.setTypeName(DistributionEnum.DistributionTypeEnum.getNameByCode(distributionOrder.getType()));
if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.GROUP_PURCHASE.getCode()) { if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.GROUP_PURCHASE.getCode()) {
GroupPurchaseConfig groupPurchaseConfig = groupPurchaseConfigDao.findByItemId(distributionOrder.getItemId()); GroupPurchaseRecordRequestDto groupPurchaseRecordRequestDto = new GroupPurchaseRecordRequestDto();
distributionOrderVo.setGroupPurchaseEndTime(groupPurchaseConfig.getEndTime()); groupPurchaseRecordRequestDto.setItemId(distributionOrder.getItemId());
if (groupPurchaseConfig.getEndTime().before(new Date())) { Result<GroupPurchaseInfo> result = groupPurchaseService.checkGroupPurchase(groupPurchaseRecordRequestDto);
distributionOrderVo.setGroupPurchaseState(GroupPurchaseEnum.ItemStateEnum.END.getCode()); if (!result.getSuccess()) {
distributionOrderVo.setGroupPurchaseStateName(GroupPurchaseEnum.ItemStateEnum.END.getDes()); continue;
} else {
distributionOrderVo.setGroupPurchaseState(GroupPurchaseEnum.ItemStateEnum.PROCESSING.getCode());
distributionOrderVo.setGroupPurchaseStateName(GroupPurchaseEnum.ItemStateEnum.PROCESSING.getDes());
} }
distributionOrderVo.setGroupPurchaseInfo(result.getData());
} }
//如果藏家订单是取消状态，查询对应鉴定单状态 //如果藏家订单是取消状态，查询对应鉴定单状态
...@@ -1271,14 +1205,11 @@ public class DistributionOrderServiceImpl implements DistributionOrderService { ...@@ -1271,14 +1205,11 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
} }
if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.GROUP_PURCHASE.getCode()) { if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.GROUP_PURCHASE.getCode()) {
GroupPurchaseConfig groupPurchaseConfig = groupPurchaseConfigDao.findByItemId(distributionOrder.getItemId()); GroupPurchaseRecordRequestDto groupPurchaseRecordRequestDto = new GroupPurchaseRecordRequestDto();
distributionOrderDetailVo.setGroupPurchaseEndTime(groupPurchaseConfig.getEndTime()); groupPurchaseRecordRequestDto.setItemId(distributionOrder.getItemId());
if (groupPurchaseConfig.getEndTime().before(new Date())) { Result<GroupPurchaseInfo> result = groupPurchaseService.checkGroupPurchase(groupPurchaseRecordRequestDto);
distributionOrderDetailVo.setGroupPurchaseState(GroupPurchaseEnum.ItemStateEnum.END.getCode()); if (result.getSuccess()) {
distributionOrderDetailVo.setGroupPurchaseStateName(GroupPurchaseEnum.ItemStateEnum.END.getDes()); distributionOrderDetailVo.setGroupPurchaseInfo(result.getData());
} else {
distributionOrderDetailVo.setGroupPurchaseState(GroupPurchaseEnum.ItemStateEnum.PROCESSING.getCode());
distributionOrderDetailVo.setGroupPurchaseStateName(GroupPurchaseEnum.ItemStateEnum.PROCESSING.getDes());
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment