From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderPayServiceImpl.java | 132 +++++++++++++++++++++++++++++++++++++------
1 files changed, 112 insertions(+), 20 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderPayServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderPayServiceImpl.java
index 3a5bd18..3aa632a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderPayServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderPayServiceImpl.java
@@ -16,16 +16,24 @@
import com.google.gson.Gson;
import com.yeshi.fanli.dto.mq.order.OrderTopicTagEnum;
import com.yeshi.fanli.dto.mq.order.body.BanLiShopOrderMQMsg;
+import com.yeshi.fanli.dto.msg.MsgRedPackUseContentDTO;
+import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail.MsgTypeMoneyTypeEnum;
+import com.yeshi.fanli.entity.common.AdminUser;
+import com.yeshi.fanli.entity.common.Config;
import com.yeshi.fanli.entity.redpack.RedPackDetail;
import com.yeshi.fanli.entity.shop.BanLiShopGoods;
import com.yeshi.fanli.entity.shop.BanLiShopGoodsClass;
import com.yeshi.fanli.entity.shop.BanLiShopGoodsSets;
import com.yeshi.fanli.entity.shop.BanLiShopOrder;
import com.yeshi.fanli.entity.shop.ChargeTypeEnum;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.exception.redpack.RedPackBalanceException;
import com.yeshi.fanli.exception.redpack.RedPackDetailException;
import com.yeshi.fanli.exception.shop.BanLiShopOrderException;
import com.yeshi.fanli.exception.shop.FuLuChargeException;
+import com.yeshi.fanli.service.AdminUserService;
+import com.yeshi.fanli.service.inter.config.ConfigService;
+import com.yeshi.fanli.service.inter.money.msg.UserMoneyMsgNotificationService;
import com.yeshi.fanli.service.inter.redpack.RedPackBalanceService;
import com.yeshi.fanli.service.inter.redpack.RedPackDetailService;
import com.yeshi.fanli.service.inter.shop.BanLiShopGoodsClassService;
@@ -35,8 +43,11 @@
import com.yeshi.fanli.service.inter.shop.BanLiShopOrderService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.charge.FuLuChargeApiUtil;
+import com.yeshi.fanli.util.email.MailSenderUtil;
import com.yeshi.fanli.util.factory.RedPackDetailFactory;
+import com.yeshi.fanli.util.rocketmq.MQMsgBodyFactory;
import com.yeshi.fanli.util.rocketmq.MQTopicName;
import com.yeshi.fanli.util.wx.BanLiShopWXPayUtil;
@@ -60,10 +71,19 @@
@Resource
private RedPackDetailService redPackDetailService;
+ @Resource
+ private UserMoneyMsgNotificationService userMoneyMsgNotificationService;
+
+ @Resource
+ private ConfigService configService;
+
+ @Resource
+ private AdminUserService adminUserService;
+
@Resource(name = "producer")
private Producer producer;
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
@Override
public void payOrderByHongBao(Long orderId) throws BanLiShopOrderException, RedPackBalanceException {
BanLiShopOrder order = banLiShopOrderService.selectByPrimaryKeyForUpdate(orderId);
@@ -112,7 +132,7 @@
}
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
@Override
public void payOrderByMoney(Long orderId, BigDecimal money) throws BanLiShopOrderException {
BanLiShopOrder order = banLiShopOrderService.selectByPrimaryKeyForUpdate(orderId);
@@ -155,21 +175,26 @@
* 鏀粯鎴愬姛
*/
private void paySuccess(BanLiShopOrder order) {
- // 灏嗙孩鍖呮槑缁嗗鏄�
- RedPackDetail detail = null;
- try {
- detail = RedPackDetailFactory.createUseByShopOrder(order.getId(), order.getUid(), "", "",
- order.getHongBaoPayment());
- } catch (RedPackDetailException e) {
- e.printStackTrace();
- }
+ ThreadUtil.run(new Runnable() {
- if (detail != null) {
- redPackDetailService.changeDisplayByIdentifyCode(detail.getIdentifyCode(), true);
- }
+ @Override
+ public void run() {
+ long[] targetUids = new long[] { 3L, 4L };
+ Config config = configService.getConfig(ConfigKeyEnum.extractCodeEmailFrom.getKey());
+ String[] sts = config.getValue().split(",");
+ String account = sts[0];
+ String pwd = sts[1];
+ for (long adminId : targetUids) {
+ AdminUser adminUser = adminUserService.selectByPrimaryKey(adminId);
+ String msg = "鏈夋柊鐨勭孩鍖呭晢鍩庤鍗�";
+ boolean isS = MailSenderUtil.sendEmail(adminUser.getEmail(), account, pwd, "鏈夋柊鐨勭孩鍖呭晢鍩庤鍗�", msg);
+ }
+ }
+ });
+
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
@Override
public void refund(Long orderId) throws BanLiShopOrderException {
// 璁㈠崟閫�娆�
@@ -216,8 +241,8 @@
order.setMoneyPaymentState(BanLiShopOrder.PAY_STATE_REFUNDING);
// 鍙戦�侀��娆炬秷鎭�
BanLiShopOrderMQMsg msg = new BanLiShopOrderMQMsg(order.getId(), order.getUid());
- Message message = new Message(MQTopicName.TOPIC_ORDER.name(),
- OrderTopicTagEnum.banLiShopOrderRefund.name(), new Gson().toJson(msg).getBytes());
+ Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER,
+ OrderTopicTagEnum.banLiShopOrderRefund, msg);
message.setStartDeliverTime(System.currentTimeMillis() + 1000 * 60 * 5L);// 寤舵椂24灏忔椂閫氱煡妫�娴嬪井淇￠��娆剧姸鎬�
SendResult result = producer.send(message);
if (result == null) {
@@ -229,10 +254,9 @@
throw new BanLiShopOrderException(6, "寰俊鏀粯閫�娆惧け璐�");
}
}
-
// 妫�鏌� 鏄惁閫�娆炬垚鍔�
- if (update.getMoneyPaymentState() != null
- && update.getMoneyPaymentState() == BanLiShopOrder.PAY_STATE_REFUNDING) {
+ if (order.getMoneyPaymentState() != null
+ && order.getMoneyPaymentState() == BanLiShopOrder.PAY_STATE_REFUNDING) {
try {
boolean isS = BanLiShopWXPayUtil.isRefundSuccess(order.getOrderNo());
if (isS) {
@@ -293,7 +317,7 @@
}
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
@Override
public void charge(Long orderId) throws BanLiShopOrderException {
BanLiShopOrder order = banLiShopOrderService.selectByPrimaryKey(orderId);
@@ -331,6 +355,30 @@
update.setSuccessTime(new Date());
banLiShopOrderService.udpateSelectiveByPrimaryKey(update);
+ if (order.getHongBaoPayment() != null && order.getHongBaoPayment().compareTo(new BigDecimal(0)) > 0) {
+ // 灏嗙孩鍖呮槑缁嗗鏄�
+ RedPackDetail detail = null;
+ try {
+ detail = RedPackDetailFactory.createUseByShopOrder(order.getId(), order.getUid(), "", "",
+ order.getHongBaoPayment());
+ } catch (RedPackDetailException e) {
+ e.printStackTrace();
+ }
+
+ if (detail != null) {
+ redPackDetailService.changeDisplayByIdentifyCode(detail.getIdentifyCode(), true);
+ }
+ }
+
+ // 娑堟伅鍙戦��
+ MsgRedPackUseContentDTO dto = new MsgRedPackUseContentDTO();
+ dto.setGoodsSetName(order.getOrderGoods().getSetName());
+ dto.setHongBao(order.getHongBaoPayment());
+ dto.setMoney(order.getMoneyPayment());
+ dto.setTime(new Date());
+ userMoneyMsgNotificationService.redPackMsg(order.getUid(), MsgTypeMoneyTypeEnum.redPackUseSuccess,
+ new Gson().toJson(dto), null);
+
try {
if (Constant.IS_TEST) {
FuLuChargeApiUtil.shaXiangCharge(set.getChargeFuLuNum(), "banlishop" + order.getOrderNo(),
@@ -343,4 +391,48 @@
}
}
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public void invalidOrderByOrderId(Long orderId, String stateDesc) throws BanLiShopOrderException {
+
+ BanLiShopOrder order = banLiShopOrderService.selectByPrimaryKeyForUpdate(orderId);
+ if (order == null)
+ return;
+ // 閫�娆�
+ if (order.getState() == BanLiShopOrder.STATE_NO_PAY) {// 鐘舵�佽繕鏄湭鏀粯
+ // 閫�娆剧孩鍖�
+ if (order.getHongBaoPaymentState() != null
+ && order.getHongBaoPaymentState() == BanLiShopOrder.PAY_STATE_PAID) {
+ BanLiShopGoods goods = banLiShopGoodsService.selectByPrimaryKey(order.getGoods().getId());
+ BanLiShopGoodsClass goodsClass = banLiShopGoodsClassService
+ .selectByPrimaryKey(goods.getGoodsClass().getId());
+ BanLiShopGoodsSets set = banLiShopGoodsSetService.selectByPrimaryKey(order.getGoodsSet().getId());
+ // 绾㈠寘閫�娆�
+ RedPackDetail detail = null;
+ try {
+ detail = RedPackDetailFactory.createShopOrderDrawBack(orderId, order.getUid(), goodsClass.getName(),
+ set.getName(), order.getHongBaoPayment());
+ } catch (RedPackDetailException e) {
+ e.printStackTrace();
+ }
+
+ if (detail == null)
+ throw new BanLiShopOrderException(4, "绾㈠寘璇︽儏澶辫触");
+ try {
+ redPackBalanceService.addRedPack(order.getUid(), order.getHongBaoPayment(), detail);
+ } catch (RedPackBalanceException e) {
+ throw new BanLiShopOrderException(5, "绾㈠寘閫�娆惧け璐�");
+ }
+
+ BanLiShopOrder update = new BanLiShopOrder(order.getId());
+ update.setHongBaoPaymentState(BanLiShopOrder.PAY_STATE_REFUND);
+ update.setUpdateTime(new Date());
+ banLiShopOrderService.udpateSelectiveByPrimaryKey(update);
+ }
+
+ banLiShopOrderService.invalidOrderByOrderId(orderId, stateDesc);
+ }
+
+ }
+
}
--
Gitblit v1.8.0