From 36e556587fc44cd9f613b10873d15a5f9cdf2fc6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 10 Aug 2022 14:25:48 +0800
Subject: [PATCH] 20220810
---
src/main/java/cc/mrbird/febs/pay/model/OrderStateMsgVo.java | 18 +++
src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java | 19 +++
src/main/java/cc/mrbird/febs/mall/quartz/WxxcxJob.java | 59 +++++++++++
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 64 ++++++++++++
src/main/java/cc/mrbird/febs/pay/service/IXcxPayService.java | 6 +
src/main/java/cc/mrbird/febs/pay/model/WxTemplateData.java | 10 ++
src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java | 32 ++++++
src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 3
src/main/java/cc/mrbird/febs/pay/model/OrderStateDto.java | 26 +++++
src/main/java/cc/mrbird/febs/pay/util/WechatConfigure.java | 20 ++-
10 files changed, 245 insertions(+), 12 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
index cfd5b69..af091f8 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
@@ -48,6 +48,7 @@
public class AdminMallOrderController extends BaseController {
private final IAdminMallOrderService adminMallOrderService;
+ private final MallOrderInfoMapper mallOrderInfoMapper;
/**
* 订单列表
@@ -283,7 +284,7 @@
ExcelUtil.createWorkbookAtOutStream(ExcelVersion.V2007, res, os, true);
return null;
}
- private final MallOrderInfoMapper mallOrderInfoMapper;
+
@GetMapping("exportOrderListOne")
@ControllerEndpoint(operation = "订单列表", exceptionMessage = "导出失败")
public FebsResponse exportOrderListOne(MallOrderInfo mallOrderInfo, HttpServletResponse response) throws IOException {
diff --git a/src/main/java/cc/mrbird/febs/mall/quartz/WxxcxJob.java b/src/main/java/cc/mrbird/febs/mall/quartz/WxxcxJob.java
new file mode 100644
index 0000000..a301c09
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/quartz/WxxcxJob.java
@@ -0,0 +1,59 @@
+package cc.mrbird.febs.mall.quartz;
+
+import cc.mrbird.febs.common.properties.XcxProperties;
+import cc.mrbird.febs.common.utils.HttpCurlUtil;
+import cc.mrbird.febs.common.utils.RedisUtils;
+import cc.mrbird.febs.common.utils.SpringContextHolder;
+import cc.mrbird.febs.pay.util.WechatConfigure;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.exceptions.ApiException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+@Component
+public class WxxcxJob {
+
+ private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
+
+ @Autowired
+ private RedisUtils redisUtils;
+ /**
+ * 获取access_token
+ * 有效期两小时
+ */
+ @Scheduled(cron = "0 0/5 * * * ? ")
+ public void getAccessToken() throws IOException {
+
+ String appId = xcxProperties.getXcxAppid();
+ String appSecret = xcxProperties.getXcxSecret();
+
+ Map<String,String> params = new HashMap<>();
+ params.put("grant_type","client_credential");
+ params.put("appid",appId);
+ params.put("secret",appSecret);
+
+ //发送请求
+ String result = HttpCurlUtil.sendGetHttp(WechatConfigure.WX_ACCESS_TOKEN , params);
+
+ String accessTokenKey = WechatConfigure.WX_ACCESS_TOKEN_REDIS_KEY;
+ JSONObject jsonObject = JSONObject.parseObject(result);
+ String accessToken = jsonObject.getString(accessTokenKey);
+ if (StrUtil.isEmpty(accessToken)) {
+ log.error("获取access token失败: {}" , jsonObject.getString("errmsg"));
+ throw new ApiException("获取access token失败");
+ } else {
+ log.info("wx access_token : {}",accessToken);
+ redisUtils.set(accessTokenKey,accessToken);
+ }
+
+ }
+
+}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
index 842a9c0..29ab13b 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
@@ -8,17 +8,19 @@
import cc.mrbird.febs.mall.conversion.MallOrderInfoConversion;
import cc.mrbird.febs.mall.conversion.MallTeamLeaderConversion;
import cc.mrbird.febs.mall.dto.*;
-import cc.mrbird.febs.mall.entity.MallExpressInfo;
-import cc.mrbird.febs.mall.entity.MallMember;
-import cc.mrbird.febs.mall.entity.MallOrderInfo;
-import cc.mrbird.febs.mall.entity.MallTeamLeader;
+import cc.mrbird.febs.mall.entity.*;
+import cc.mrbird.febs.mall.mapper.MallMemberMapper;
import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
import cc.mrbird.febs.mall.mapper.MallTeamLeaderMapper;
+import cc.mrbird.febs.mall.service.IAdminMallOrderService;
import cc.mrbird.febs.mall.service.IApiMallTeamLeaderService;
import cc.mrbird.febs.mall.vo.ApiLeaderInfoVo;
import cc.mrbird.febs.mall.vo.ApiLeaderListVo;
import cc.mrbird.febs.mall.vo.ApiMallleaderStateVo;
import cc.mrbird.febs.mall.vo.OrderListVo;
+import cc.mrbird.febs.pay.model.OrderStateDto;
+import cc.mrbird.febs.pay.service.IXcxPayService;
+import cc.mrbird.febs.pay.util.WechatConfigure;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -27,6 +29,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -113,6 +116,9 @@
}
private final MallOrderInfoMapper mallOrderInfoMapper;
+ private final MallTeamLeaderMapper mallTeamLeaderMapper;
+ private final MallMemberMapper mallMemberMapper;
+ private final IXcxPayService iXcxPayService;
@Override
@Transactional
@@ -131,9 +137,59 @@
}
mallOrderInfo.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_FINISH.getValue());
mallOrderInfoMapper.updateById(mallOrderInfo);
+
+ OrderStateDto orderStateDto = new OrderStateDto();
+ orderStateDto.setOrderNo(mallOrderInfo.getOrderNo());
+ orderStateDto.setGoodsName(getProductNames(mallOrderInfo.getMemberId(),mallOrderInfo.getId()));
+ orderStateDto.setOrderState("已送达自提点，请提取");
+ String takeUniqueCode = mallOrderInfo.getTakeUniqueCode();
+ MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(takeUniqueCode);
+ orderStateDto.setAddressArea(mallTeamLeader.getAddressArea());
+ orderStateDto.setOpenId(mallMemberMapper.selectById(mallOrderInfo.getMemberId()).getOpenId());
+ orderStateDto.setTemplateId(WechatConfigure.WX_ORDER_STATEMSG_TEMPLATE_ID);
+ iXcxPayService.pushOrderToAddress(orderStateDto);
+
return new FebsResponse().success().message("确认成功");
}
+ /**
+ * 根据用户ID和订单ID获取所购买商品名称
+ * @return 所含商品名称（多个以"，"隔开）
+ */
+ public String getProductNames(Long memberId, Long orderId) {
+ MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectOrderByMemberIdAndId(memberId, orderId);
+ List<MallOrderItem> details = mallOrderInfo.getItems();
+ if (CollectionUtils.isEmpty(details)) {
+ return "";
+ }
+ StringBuffer productNameBuffer = new StringBuffer();
+ Integer maxLength = 30;
+ for (int i = 0; i< details.size(); i++) {
+ MallOrderItem mallOrderItem = details.get(i);
+ String goodsName = mallOrderItem.getGoodsName();
+ if (goodsName == null) {
+ continue;
+ }
+ if (i == 0 && goodsName.length() > maxLength) {
+ productNameBuffer.append(goodsName.substring(0, maxLength) + "...");
+ break;
+ }
+ if ((productNameBuffer.length() + goodsName.length()) > maxLength) {
+ productNameBuffer.append("等");
+ break;
+ }
+ productNameBuffer.append(goodsName + ",");
+ }
+ String productNames = productNameBuffer.toString();
+ if (productNames.endsWith(",")) {
+ productNames = productNames.substring(0, productNames.length() - 1);
+ }
+ if (productNames.endsWith(",等")) {
+ productNames = productNames.substring(0, productNames.length() - 2) + "等";
+ }
+ return productNames;
+ }
+
@Override
public FebsResponse leaderTitle(ApiLeaderTitleDto apiLeaderTitleDto) {
String uniqueCode = apiLeaderTitleDto.getUniqueCode();
diff --git a/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java b/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
index 518328c..5a770c1 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
@@ -3,9 +3,15 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.enumerates.OrderDeliveryStateEnum;
import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
+import cc.mrbird.febs.common.properties.XcxProperties;
+import cc.mrbird.febs.common.utils.RedisUtils;
+import cc.mrbird.febs.common.utils.SpringContextHolder;
import cc.mrbird.febs.mall.entity.MallOrderInfo;
import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
import cc.mrbird.febs.pay.model.NotifyData;
+import cc.mrbird.febs.pay.model.OrderStateDto;
+import cc.mrbird.febs.pay.model.OrderStateMsgVo;
+import cc.mrbird.febs.pay.model.WxTemplateData;
import cc.mrbird.febs.pay.util.PayThreadPool;
import cc.mrbird.febs.pay.util.Signature;
import cc.mrbird.febs.pay.util.Util;
@@ -13,9 +19,12 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
+import org.thymeleaf.engine.TemplateData;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
@@ -24,6 +33,8 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
@Slf4j
@RestController
@@ -32,6 +43,10 @@
@Autowired
MallOrderInfoMapper mallOrderInfoMapper;
+ @Autowired
+ RedisUtils redisUtils;
+
+ private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
/**
* 微信支付回调接口
*/
@@ -70,7 +85,8 @@
MallOrderInfo order = mallOrderInfoMapper.selectById(Long.valueOf(orderId));
// 校验签名
- String paySecret = WechatConfigure.WECHARPAY_SECRET;
+// String paySecret = WechatConfigure.WECHARPAY_SECRET;
+ String paySecret = xcxProperties.getWecharpaySecret();
if (Signature.checkIsSignValidFromResponseString(notityXml.toString(),paySecret)) {
// 校验业务结果
if (WechatConfigure.CODE_SUCCESS.equals(data.getResult_code())) {
@@ -133,4 +149,5 @@
out.flush();
out.close();
}
+
}
diff --git a/src/main/java/cc/mrbird/febs/pay/model/OrderStateDto.java b/src/main/java/cc/mrbird/febs/pay/model/OrderStateDto.java
new file mode 100644
index 0000000..58b2446
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/pay/model/OrderStateDto.java
@@ -0,0 +1,26 @@
+package cc.mrbird.febs.pay.model;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "OrderStateDto", description = "订单状态通知")
+public class OrderStateDto {
+
+ //订单号
+ private String orderNo;
+ //商品名称
+ private String goodsName;
+ //订单状态
+ private String orderState;
+ //自提点名称
+ private String addressArea;
+ //取货号
+ private String takeCode;
+ //用户openId
+ private String openId;
+ //订阅消息模版id
+ private String templateId;
+ //默认跳到小程序首页
+ private String page = "pages/index/index";
+}
diff --git a/src/main/java/cc/mrbird/febs/pay/model/OrderStateMsgVo.java b/src/main/java/cc/mrbird/febs/pay/model/OrderStateMsgVo.java
new file mode 100644
index 0000000..b589957
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/pay/model/OrderStateMsgVo.java
@@ -0,0 +1,18 @@
+package cc.mrbird.febs.pay.model;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import org.thymeleaf.engine.TemplateData;
+
+import java.util.Map;
+
+@Data
+@ApiModel(value = "OrderStateMsgVo", description = "订单状态通知")
+public class OrderStateMsgVo {
+
+ private String toUser;//用户openid
+ private String templateId;//订阅消息模版id
+ private String page = "pages/index/index";//默认跳到小程序首页
+ private Map<String, WxTemplateData> data;//推送文字
+
+}
diff --git a/src/main/java/cc/mrbird/febs/pay/model/WxTemplateData.java b/src/main/java/cc/mrbird/febs/pay/model/WxTemplateData.java
new file mode 100644
index 0000000..1918cda
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/pay/model/WxTemplateData.java
@@ -0,0 +1,10 @@
+package cc.mrbird.febs.pay.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@AllArgsConstructor
+@Data
+public class WxTemplateData {
+ private String value;
+}
diff --git a/src/main/java/cc/mrbird/febs/pay/service/IXcxPayService.java b/src/main/java/cc/mrbird/febs/pay/service/IXcxPayService.java
index a55f404..80adfbb 100644
--- a/src/main/java/cc/mrbird/febs/pay/service/IXcxPayService.java
+++ b/src/main/java/cc/mrbird/febs/pay/service/IXcxPayService.java
@@ -2,6 +2,7 @@
import cc.mrbird.febs.mall.entity.MallOrderInfo;
import cc.mrbird.febs.pay.model.BrandWCPayRequestData;
+import cc.mrbird.febs.pay.model.OrderStateDto;
public interface IXcxPayService {
@@ -9,4 +10,9 @@
* 发起支付（创建预付订单）
*/
BrandWCPayRequestData startPayment(MallOrderInfo mallOrderInfo) throws Exception;
+
+ /**
+ * 发送订单送达消息
+ */
+ String pushOrderToAddress(OrderStateDto info);
}
diff --git a/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java b/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java
index 6ee06f2..6fcd151 100644
--- a/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java
@@ -1,6 +1,7 @@
package cc.mrbird.febs.pay.service.impl;
import cc.mrbird.febs.common.properties.XcxProperties;
+import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.common.utils.SpringContextHolder;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallOrderInfo;
@@ -8,17 +9,25 @@
import cc.mrbird.febs.mall.mapper.MallMemberMapper;
import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
import cc.mrbird.febs.pay.model.BrandWCPayRequestData;
+import cc.mrbird.febs.pay.model.OrderStateDto;
+import cc.mrbird.febs.pay.model.OrderStateMsgVo;
+import cc.mrbird.febs.pay.model.WxTemplateData;
import cc.mrbird.febs.pay.service.IXcxPayService;
+import cc.mrbird.febs.pay.util.WechatConfigure;
import cc.mrbird.febs.pay.util.WeixinServiceUtil;
import cn.hutool.log.Log;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
import java.math.BigDecimal;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
@Slf4j
@Service
@@ -30,6 +39,8 @@
MallMemberMapper mallMemberMapper;
@Autowired
WeixinServiceUtil weixinServiceUtil;
+ @Autowired
+ RedisUtils redisUtils;
private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
@@ -53,6 +64,27 @@
return payData;
}
+ @Override
+ public String pushOrderToAddress(OrderStateDto info) {
+ RestTemplate restTemplate = new RestTemplate();
+ String url = WechatConfigure.SEND_INFO_URL + redisUtils.get(WechatConfigure.WX_ACCESS_TOKEN_REDIS_KEY);
+ //拼接推送的模版
+ OrderStateMsgVo orderStateMsgVo = new OrderStateMsgVo();
+ orderStateMsgVo.setToUser(info.getOpenId());//用户的openId
+ orderStateMsgVo.setTemplateId(info.getTemplateId());//订阅消息模板id
+// wxMssVo.setPage("pages/appointment/line_up?"+"shopId="+info.getShopId());
+
+ Map<String, WxTemplateData> m = new HashMap<>(5);
+ m.put("character_string1", new WxTemplateData(info.getOrderNo()));
+ m.put("thing9", new WxTemplateData(info.getGoodsName()));
+ m.put("phrase2", new WxTemplateData(info.getOrderState()));
+ m.put("thing13", new WxTemplateData(info.getAddressArea()));
+ m.put("thing16", new WxTemplateData(info.getTakeCode()));
+ orderStateMsgVo.setData(m);
+ ResponseEntity<String> responseEntity = restTemplate.postForEntity(url, orderStateMsgVo, String.class);
+ return responseEntity.getBody();
+ }
+
/**
* 根据用户ID和订单ID获取所购买商品名称
* @return 所含商品名称（多个以"，"隔开）
diff --git a/src/main/java/cc/mrbird/febs/pay/util/WechatConfigure.java b/src/main/java/cc/mrbird/febs/pay/util/WechatConfigure.java
index ab2a6ef..f8a8bfc 100644
--- a/src/main/java/cc/mrbird/febs/pay/util/WechatConfigure.java
+++ b/src/main/java/cc/mrbird/febs/pay/util/WechatConfigure.java
@@ -2,22 +2,30 @@
public class WechatConfigure {
- public static String UNIFIEDORDER = "https://api.mch.weixin.qq.com/pay/unifiedorder";
+ public static final String WX_ORDER_STATEMSG_TEMPLATE_ID = "Yk3_M11Pw5rablln7kQBpasfG9ynRNwD9OKsyvUSoWg";
+
+ public static final String SEND_INFO_URL = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=";
+
+ public static final String WX_ACCESS_TOKEN_REDIS_KEY = "access_token";
+
+ public static final String WX_ACCESS_TOKEN = "https://api.weixin.qq.com/cgi-bin/token?grant_type={grant_type}&appid={appid}&secret={secret}";
+
+ public static final String UNIFIEDORDER = "https://api.mch.weixin.qq.com/pay/unifiedorder";
/**
* 发送http请求类
*/
- public static String HttpsRequestClassName = "cc.mrbird.febs.pay.util.HttpsRequest";
+ public static final String HttpsRequestClassName = "cc.mrbird.febs.pay.util.HttpsRequest";
public static final String TRADE_TYPE_JSAPI = "JSAPI";
/**
* 发送 SSL请求,企业付款，退款用
*/
- public static String HttpsRequestClassName2 = "cc.mrbird.febs.pay.util.HttpsRequest2";
+ public static final String HttpsRequestClassName2 = "cc.mrbird.febs.pay.util.HttpsRequest2";
// 被扫支付查询API
- public static String PAY_QUERY_API = "https://api.mch.weixin.qq.com/pay/orderquery";
+ public static final String PAY_QUERY_API = "https://api.mch.weixin.qq.com/pay/orderquery";
/**
* 微信商户号
@@ -35,10 +43,10 @@
public static final String MINIPROGRAM_APPID = "wx5cc58f796224af61";
// 企业付款API
- public static String COM_PAY_API="https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers";
+ public static final String COM_PAY_API="https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers";
// 退款API
- public static String REFUND_API = "https://api.mch.weixin.qq.com/secapi/pay/refund";
+ public static final String REFUND_API = "https://api.mch.weixin.qq.com/secapi/pay/refund";
/**
* 成功
--
Gitblit v1.9.1