From 7a50ab251493b23fe50247a483fc0e2b0c39e67b Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期三, 23 十一月 2022 09:51:08 +0800
Subject: [PATCH] #feat 提交联调问题修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerRefundOrderServiceImpl.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerRefundOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerRefundOrderServiceImpl.java
index b6595b3..e6f555f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerRefundOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerRefundOrderServiceImpl.java
@@ -8,6 +8,7 @@
import com.panzhihua.common.model.dtos.shop.PageComOrderRefundDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.ComShopFlowerRefundOrderVO;
+import com.panzhihua.common.model.vos.shop.ComShopOrderCountVO;
import com.panzhihua.common.utlis.OrderNoUtils;
import com.panzhihua.common.utlis.WxPayUtils;
import com.panzhihua.common.utlis.wx.WXPayUtil;
@@ -24,9 +25,8 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.Date;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* @ClassName: ComShopFlowerRefundOrderServiceImpl
@@ -118,6 +118,9 @@
// orderPayDO.setWxTradeNo(wxPayNotifyOrderDTO.getWxTradeNo());
orderPayDO.setPayStatus(ComShopFlowerOrderPayDO.payStatus.yes);
orderPayDO.setRefundStatus(ComShopFlowerOrderPayDO.refundStatus.tkcg);
+ //更新订单状态
+ comShopFlowerOrderDO.setStatus(ComShopFlowerOrderDO.status.ytk);
+ comShopFlowerOrderDAO.updateById(comShopFlowerOrderDO);
}else {
//退款失败
comShopFlowerRefundOrderDO.setStatus(ComShopFlowerRefundOrderDO.status.tksb);
@@ -141,4 +144,23 @@
this.baseMapper.updateById(comShopFlowerRefundOrderDO);
return R.ok();
}
+
+ public R selectCountGroupStatus(Long storeId){
+ String[] statusStr = {"clz","tkcg","tksb","yqx","tkz"};
+ List<ComShopOrderCountVO> comShopOrderCountVOS = this.baseMapper.selectCountGroupStatus(storeId);
+ Map<Integer, Integer> collect = comShopOrderCountVOS.stream().collect(Collectors.toMap(ComShopOrderCountVO::getStatus, ComShopOrderCountVO::getAmount));
+ Map<String,Integer> retMap = new HashMap<>();
+ int amountTotal = 0;
+ for (int i = 0; i < statusStr.length; i++) {
+ if (collect.containsKey(i)) {
+ Integer amount = collect.get(i);
+ amountTotal = amountTotal + amount;
+ retMap.put(statusStr[i],amount);
+ }else {
+ retMap.put(statusStr[i],0);
+ }
+ }
+ retMap.put("zdd",amountTotal);
+ return R.ok(retMap);
+ }
}
--
Gitblit v1.7.1