From d56a4ae3aded7fecbecf98d33557f28dedc3abc6 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 05 十二月 2022 16:57:43 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderDeliveryServiceImpl.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderDeliveryServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderDeliveryServiceImpl.java
index 6580e80..fb02a2a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderDeliveryServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderDeliveryServiceImpl.java
@@ -1,10 +1,12 @@
package com.panzhihua.service_community.service.impl;
+import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.model.dtos.shop.ComShopFlowerOrderDeliveryDTO;
import com.panzhihua.common.model.dtos.shop.PageComFlowerOrderDeliveryDTO;
import com.panzhihua.common.model.dtos.shop.PageComFlowerOrderListDTO;
@@ -13,15 +15,21 @@
import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO;
import com.panzhihua.common.model.vos.shop.ComShopFlowerOrderDeliveryVO;
import com.panzhihua.common.model.vos.shop.ComShopFlowerOrderPageVO;
+import com.panzhihua.common.model.vos.user.SysUserVO;
+import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.OrderNoUtils;
+import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.service_community.dao.ComShopFlowerOrderDAO;
import com.panzhihua.service_community.dao.ComShopFlowerOrderDeliveryDAO;
import com.panzhihua.service_community.dao.ConvenientElevatingPointDAO;
+import com.panzhihua.service_community.entity.SysUser;
import com.panzhihua.service_community.model.dos.ComShopFlowerOrderDO;
import com.panzhihua.service_community.model.dos.ComShopFlowerOrderDeliveryDO;
import com.panzhihua.service_community.model.dos.ConvenientElevatingPointDO;
import com.panzhihua.service_community.service.ComShopFlowerOrderDeliveryService;
+import com.panzhihua.service_community.util.WxMaConfiguration;
import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.error.WxErrorException;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -30,6 +38,7 @@
import java.util.Date;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
import static java.util.Objects.nonNull;
@@ -47,7 +56,10 @@
private ComShopFlowerOrderDAO comShopFlowerOrderDAO;
@Resource
private ConvenientElevatingPointDAO convenientElevatingPointDAO;
-
+ @Resource
+ private WxMaConfiguration wxMaConfiguration;
+ @Resource
+ private UserService userService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -66,9 +78,27 @@
List<Long> orderIds = comShopFlowerOrderDeliveryDTO.getOrderIds();
if (CollUtil.isNotEmpty(orderIds)){
comShopFlowerOrderDAO.updateOrder(orderIds,deliveryId,comShopFlowerOrderDeliveryDO.getDeliveryNo(), ComShopFlowerOrderDO.status.psz,comShopFlowerOrderDeliveryDO.getDeliveryTime());
+
+ //订单配送通知
+ WxMaService maService = wxMaConfiguration.getMaService(Constants.HC_APP_ID);
+ List<ComShopFlowerOrderDO> comShopFlowerOrderDOS = comShopFlowerOrderDAO.selectList(new LambdaQueryWrapper<ComShopFlowerOrderDO>().in(ComShopFlowerOrderDO::getId, orderIds));
+ for (ComShopFlowerOrderDO comShopFlowerOrderDO : comShopFlowerOrderDOS) {
+ Long userId = comShopFlowerOrderDO.getUserId();
+ R userOpenId = userService.getUserOpenId(userId);
+ if (R.isOk(userOpenId)) {
+ String openid = userOpenId.getData().toString();
+ try {
+ WxUtil.sendStartShipping(openid,maService.getAccessToken(),comShopFlowerOrderDO.getOrderNo());
+ } catch (WxErrorException e) {
+ e.printStackTrace();
+ }
+ }
+
+
+ }
}
}
- return R.ok();
+ return R.ok(comShopFlowerOrderDeliveryDO.getId());
}
@Override
@@ -86,7 +116,29 @@
comShopFlowerOrderDeliveryDO.setDeliveryStatus(ComShopFlowerOrderDeliveryDO.deliveryStatus.ysd);
int update = this.baseMapper.updateById(comShopFlowerOrderDeliveryDO);
if (update > 0){
+ //一个自提订单算一个货
+ ConvenientElevatingPointDO convenientElevatingPointDO = convenientElevatingPointDAO.selectById(comShopFlowerOrderDeliveryDO.getPointId());
+
+ convenientElevatingPointDO.setCumulativeGoodsNum(convenientElevatingPointDO.getCumulativeGoodsNum() + comShopFlowerOrderDeliveryDO.getDeliveryOrderNum());
+ convenientElevatingPointDO.setPrepareGoodsNum(convenientElevatingPointDO.getPrepareGoodsNum()+comShopFlowerOrderDeliveryDO.getDeliveryOrderNum());
+ convenientElevatingPointDAO.updateById(convenientElevatingPointDO);
+
comShopFlowerOrderDAO.updateOrderStatus(comShopFlowerOrderDeliveryDO.getId(),comShopFlowerOrderDeliveryDO.getServiceTime(),ComShopFlowerOrderDO.status.dsh);
+ WxMaService maService = wxMaConfiguration.getMaService(Constants.HC_APP_ID);
+ List<ComShopFlowerOrderDO> comShopFlowerOrderDOS = comShopFlowerOrderDAO.selectList(new LambdaQueryWrapper<ComShopFlowerOrderDO>().eq(ComShopFlowerOrderDO::getDeliveryId, id));
+ for (ComShopFlowerOrderDO comShopFlowerOrderDO : comShopFlowerOrderDOS) {
+ Long userId = comShopFlowerOrderDO.getUserId();
+ R userOpenId = userService.getUserOpenId(userId);
+ if (R.isOk(userOpenId)) {
+ String openid = userOpenId.getData().toString();
+ try {
+ WxUtil.sendService(openid,maService.getAccessToken(),comShopFlowerOrderDeliveryDO.getPointName());
+ } catch (WxErrorException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
}
return R.ok();
}
--
Gitblit v1.7.1