From f220a26f4b47dc5b681906238a9f716a64bce1e1 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 19 八月 2024 11:16:22 +0800
Subject: [PATCH] 花城 修改添加社区宣传
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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 300f88e..17e2145 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
@@ -22,7 +22,6 @@
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.*;
import com.panzhihua.common.utlis.wx.WXPayUtil;
-import com.panzhihua.service_community.config.RabbitmqConfig;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComShopFlowerOrderService;
@@ -37,6 +36,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -342,15 +342,12 @@
log.error("调用微信支付异常,异常原因：" + e.getMessage());
}
//发送消息到mq
- rabbitTemplate.convertAndSend(RabbitmqConfig.SHOP_ORDER_EXCHANGE, RabbitmqConfig.SHOP_ORDER_ROUTING_KEY, shopOrderVO, message -> {
- message.getMessageProperties().setHeader("x-delay", dateToSecond(DateUtil.endOfDay(DateUtil.date())) * 1000 * 60);
+ rabbitTemplate.convertAndSend("huacheng.shop.order.exchange", "huacheng.shop.order.key", shopOrderVO, message -> {
+ //30分钟后
+ message.getMessageProperties().setHeader("x-delay", 1800*1000);
return message;
});
return R.ok(shopOrderVO);
- }
-
- private Long dateToSecond(Date expireTime){
- return DateUtil.between(new Date(),expireTime, DateUnit.MS);
}
/**
@@ -709,10 +706,12 @@
comShopFlowerOrderOperateDAO.insert(orderOperateDO);
//一个自提订单算一个货
- ConvenientElevatingPointDO convenientElevatingPointDO = convenientElevatingPointDAO.selectById(shopOrderDO.getPointId());
- convenientElevatingPointDO.setPrepareGoodsNum(convenientElevatingPointDO.getPrepareGoodsNum() - 1);
- convenientElevatingPointDO.setAlreadyGoodsNum(convenientElevatingPointDO.getAlreadyGoodsNum() + 1);
- convenientElevatingPointDAO.updateById(convenientElevatingPointDO);
+ if (ComShopFlowerOrderDO.deliveryType.store == shopOrderDO.getDeliveryType()){
+ ConvenientElevatingPointDO convenientElevatingPointDO = convenientElevatingPointDAO.selectById(shopOrderDO.getPointId());
+ convenientElevatingPointDO.setPrepareGoodsNum(convenientElevatingPointDO.getPrepareGoodsNum() - 1);
+ convenientElevatingPointDO.setAlreadyGoodsNum(convenientElevatingPointDO.getAlreadyGoodsNum() + 1);
+ convenientElevatingPointDAO.updateById(convenientElevatingPointDO);
+ }
return R.ok();
} else {
return R.fail("确认收货失败");
@@ -971,9 +970,11 @@
if (R.isOk(sysUserVOR)) {
SysUserVO sysUserVO = JSONObject.parseObject(JSONObject.toJSONString(sysUserVOR.getData()), SysUserVO.class);
try {
+ DecimalFormat df = new DecimalFormat("#.00");
WxUtil.sendNewOrderNotice(sysUserVO.getOpenid(),maService.getAccessToken(),shopOrderDO.getOrderNo(),
shopOrderDO.getDeliveryType()==1?"拼单订单":"快递订单",orderGoodsList.get(0).getGoodsName(),
- shopOrderDO.getTotalAmount().toString(),DateUtil.format(shopOrderDO.getCreateAt(),"yyyy-MM-dd HH:mm"));
+ df.format(shopOrderDO.getTotalAmount()),
+ DateUtil.format(shopOrderDO.getCreateAt(),"yyyy-MM-dd HH:mm"));
} catch (WxErrorException e) {
e.printStackTrace();
}
--
Gitblit v1.7.1