From c0150e494eca9fefcb20a1aee8c284e9d194ebbe Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 28 十一月 2022 13:39:46 +0800
Subject: [PATCH] #feat 发货啊
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java | 50 +++++++++++++++++++++++---------------------------
1 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java
index 5d352c7..de16879 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java
@@ -386,16 +386,16 @@
* @return 订单详情
*/
@Override
- public R orderDetail(Long orderId,String phone) {
+ public R orderDetail(Long orderId, String phone) {
ComShopFlowerOrderPageVO orderVO = new ComShopFlowerOrderPageVO();
ComShopFlowerOrderDO shopOrderDO = null;
- if (StrUtil.isEmpty(phone)){
+ if (StrUtil.isEmpty(phone)) {
// 查询订单信息
shopOrderDO = this.baseMapper.selectById(orderId);
- }else {
+ } else {
//查询自提点信息
ConvenientElevatingPointDO convenientElevatingPointDO = convenientElevatingPointDAO.selectOne(new LambdaQueryWrapper<ConvenientElevatingPointDO>().eq(ConvenientElevatingPointDO::getWechatAccount, phone));
- if (isNull(convenientElevatingPointDO)){
+ if (isNull(convenientElevatingPointDO)) {
return R.fail("自提点不存在");
}
Long pointDOId = convenientElevatingPointDO.getId();
@@ -480,19 +480,19 @@
}
//已完成、已退款才有评论 TODO
// if (ComShopFlowerOrderDO.status.ywc == shopOrderDO.getStatus() || ComShopFlowerOrderDO.status.ytk == shopOrderDO.getStatus()) {
- ComShopFlowerEvaluateVO comShopFlowerEvaluateVO = comShopFlowerEvaluateDAO.selectByOrderNo(shopOrderDO.getOrderNo());
- if (nonNull(comShopFlowerEvaluateVO)) {
- orderVO.setComShopFlowerEvaluateVO(comShopFlowerEvaluateVO);
- }
+ ComShopFlowerEvaluateVO comShopFlowerEvaluateVO = comShopFlowerEvaluateDAO.selectByOrderNo(shopOrderDO.getOrderNo());
+ if (nonNull(comShopFlowerEvaluateVO)) {
+ orderVO.setComShopFlowerEvaluateVO(comShopFlowerEvaluateVO);
+ }
// }
//设置退款金额
ComShopFlowerRefundOrderDO comShopFlowerRefundOrderDO = comShopFlowerRefundOrderDAO.selectOne(new LambdaQueryWrapper<ComShopFlowerRefundOrderDO>().eq(ComShopFlowerRefundOrderDO::getOrderId, shopOrderDO.getOrderNo()));
- if (nonNull(comShopFlowerRefundOrderDO)){
+ if (nonNull(comShopFlowerRefundOrderDO)) {
orderVO.setRefundAmount(comShopFlowerRefundOrderDO.getRefundAmount());
}
//如果状态时取消状态，更新时间为去取消时间
- if (shopOrderDO.getStatus() == ComShopFlowerOrderDO.status.yqx){
+ if (shopOrderDO.getStatus() == ComShopFlowerOrderDO.status.yqx) {
orderVO.setCancelTime(shopOrderDO.getUpdateAt());
}
@@ -681,13 +681,9 @@
orderOperateDO.setOrderNo(comShopOrderDO.getOrderNo());
orderOperateDO.setOperationType(ComShopFlowerOrderOperateDO.operationType.deliver);
orderOperateDO.setOperationTime(new Date());
- if (orderShipDTO.getIsAdmin()) {
- orderOperateDO.setOperationContent(orderShipDTO.getOperUserAccount() + "已发货");
- orderOperateDO.setOperationBy(orderShipDTO.getOperUserAccount());
- } else {
- orderOperateDO.setOperationContent(orderShipDTO.getOperUserAccount() + "已发货");
- orderOperateDO.setOperationBy(orderShipDTO.getOperUserAccount());
- }
+
+ orderOperateDO.setOperationContent(orderShipDTO.getOperUserAccount() + "已发货");
+ orderOperateDO.setOperationBy(orderShipDTO.getOperUserAccount());
int inserted = comShopFlowerOrderOperateDAO.insert(orderOperateDO);
if (inserted != 1) {
log.error("订单发货日志保存错误");
@@ -814,9 +810,9 @@
log.error("未查询到支付订单,订单回调失败,订单号:" + wxPayNotifyOrderDTO.getOrderTradeNo());
return;
}
- if (ComShopFlowerOrderDO.deliveryType.store == shopOrderDO.getDeliveryType()){
+ if (ComShopFlowerOrderDO.deliveryType.store == shopOrderDO.getDeliveryType()) {
shopOrderDO.setStatus(ComShopFlowerOrderDO.status.ddps);
- }else {
+ } else {
shopOrderDO.setStatus(ComShopFlowerOrderDO.status.dfh);
}
@@ -928,10 +924,10 @@
IPage<ComShopFlowerOrderStoreListVO> orderPageVOIPage = this.baseMapper.pageOrderByStoreId(page, pageComFlowerOrderListDTO);
if (!orderPageVOIPage.getRecords().isEmpty()) {
orderPageVOIPage.getRecords().forEach(orderVo -> {
- if (null!=orderVo.getPointId()){
+ if (null != orderVo.getPointId()) {
ConvenientElevatingPointDO convenientElevatingPointDO = convenientElevatingPointDAO.selectById(orderVo.getPointId());
ConvenientElevatingPointVO convenientElevatingPointVO = new ConvenientElevatingPointVO();
- BeanUtils.copyProperties(convenientElevatingPointDO,convenientElevatingPointVO);
+ BeanUtils.copyProperties(convenientElevatingPointDO, convenientElevatingPointVO);
orderVo.setConvenientElevatingPointVO(convenientElevatingPointVO);
}
});
@@ -942,7 +938,7 @@
@Override
public R selectCountByDeliveryType(Integer deliveryType, Long userId) {
//1.等待配送 2.配送中 3.待收货 4.待评价 5.已完成 6.已取消 7.已退款 8.待发货
- String[] statusStr = {"ddps", "psz", "dsh", "dpj", "ywc", "yqx", "ytk","dfh"};
+ String[] statusStr = {"ddps", "psz", "dsh", "dpj", "ywc", "yqx", "ytk", "dfh"};
ConvenientMerchantVO convenientMerchantVO = convenientMerchantDAO.selectMerchantByUserId(userId);
List<ComShopOrderCountVO> comShopOrderCountVOS = this.baseMapper.selectCountByDeliveryType(deliveryType, convenientMerchantVO.getId());
Map<Integer, Integer> collect = comShopOrderCountVOS.stream().collect(Collectors.toMap(ComShopOrderCountVO::getStatus, ComShopOrderCountVO::getAmount));
@@ -1030,8 +1026,8 @@
return R.ok(retMap);
}
- public R selectOrderLineChart(Long storeId, Integer type,Integer tab) {
- if (tab == 1){
+ public R selectOrderLineChart(Long storeId, Integer type, Integer tab) {
+ if (tab == 1) {
if (1 == type) {
//近15天的订单量
int days = 15;
@@ -1052,7 +1048,7 @@
}
return R.ok(retMap);
}
- }else if (2==tab){
+ } else if (2 == tab) {
if (1 == type) {
//近15天的营收
int days = 15;
@@ -1109,12 +1105,12 @@
ComShopFlowerOrderDeliveryNoListVO comShopFlowerOrderDeliveryNoListVO = new ComShopFlowerOrderDeliveryNoListVO();
ComShopFlowerOrderDeliveryDO comShopFlowerOrderDeliveryDO = comShopFlowerOrderDeliveryDAO.selectById(pageComFlowerOrderListDTO.getDeliveryId());
ComShopFlowerOrderDeliveryVO comShopFlowerOrderDeliveryVO = new ComShopFlowerOrderDeliveryVO();
- BeanUtils.copyProperties(comShopFlowerOrderDeliveryDO,comShopFlowerOrderDeliveryVO);
+ BeanUtils.copyProperties(comShopFlowerOrderDeliveryDO, comShopFlowerOrderDeliveryVO);
Long pointId = comShopFlowerOrderDeliveryDO.getPointId();
ConvenientElevatingPointDO convenientElevatingPointDO = convenientElevatingPointDAO.selectById(pointId);
ConvenientElevatingPointVO convenientElevatingPointVO = new ConvenientElevatingPointVO();
- BeanUtils.copyProperties(convenientElevatingPointDO,convenientElevatingPointVO);
+ BeanUtils.copyProperties(convenientElevatingPointDO, convenientElevatingPointVO);
comShopFlowerOrderDeliveryVO.setConvenientElevatingPointVO(convenientElevatingPointVO);
comShopFlowerOrderDeliveryNoListVO.setComShopFlowerOrderDeliveryVO(comShopFlowerOrderDeliveryVO);
comShopFlowerOrderDeliveryNoListVO.setPage(orderPageVOIPage);
--
Gitblit v1.7.1