|
@@ -33,7 +33,9 @@ import lombok.AllArgsConstructor;
|
|
import me.chanjar.weixin.common.error.WxErrorException;
|
|
import me.chanjar.weixin.common.error.WxErrorException;
|
|
import me.chanjar.weixin.mp.api.WxMpService;
|
|
import me.chanjar.weixin.mp.api.WxMpService;
|
|
import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
|
|
import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
|
|
|
|
+import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
|
|
import me.chanjar.weixin.mp.bean.template.WxMpTemplateIndustry;
|
|
import me.chanjar.weixin.mp.bean.template.WxMpTemplateIndustry;
|
|
|
|
+import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage;
|
|
import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
|
|
import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
@@ -179,29 +181,31 @@ public class PayController extends HttpServlet {
|
|
@GetMapping("/weixin/callback/openidCode")
|
|
@GetMapping("/weixin/callback/openidCode")
|
|
public void handleWeixinCallback(@RequestParam("code") String code, @RequestParam("state") String state, HttpSession session, HttpServletResponse response) throws Exception {
|
|
public void handleWeixinCallback(@RequestParam("code") String code, @RequestParam("state") String state, HttpSession session, HttpServletResponse response) throws Exception {
|
|
System.out.println("授权回调来了啊 code=" + code + "-111111111111111111111111111111111111111111111state=" + state);
|
|
System.out.println("授权回调来了啊 code=" + code + "-111111111111111111111111111111111111111111111state=" + state);
|
|
- String[] split = state.split("--");
|
|
|
|
- String orderId = split[0];
|
|
|
|
- String ip = split[1];
|
|
|
|
- if (!state.equals((String) session.getAttribute("WEIXIN_OAUTH_STATE"))) {
|
|
|
|
- log.error("用户授权,state错误");
|
|
|
|
- }
|
|
|
|
- OrderDO aDo = orderManager.getById(Long.valueOf(orderId));
|
|
|
|
- if (ObjectUtil.isNull(aDo)) {
|
|
|
|
- log.error("用户授权完成后未找到订单信息:" + state);
|
|
|
|
- }
|
|
|
|
|
|
+// String[] split = state.split("--");
|
|
|
|
+// String orderId = split[0];
|
|
|
|
+// String ip = split[1];
|
|
|
|
+// if (!state.equals((String) session.getAttribute("WEIXIN_OAUTH_STATE"))) {
|
|
|
|
+// log.error("用户授权,state错误");
|
|
|
|
+// }
|
|
|
|
+// AdminUser user = adminUserMapper.selectById(1811346086600843265L);
|
|
|
|
+// if (ObjectUtil.isNull(aDo)) {
|
|
|
|
+// log.error("用户授权完成后未找到订单信息:" + state);
|
|
|
|
+// }
|
|
String openId = wxPayServiceMy.getOpenId(code);
|
|
String openId = wxPayServiceMy.getOpenId(code);
|
|
- aDo.setOpenId(openId);
|
|
|
|
- orderManager.updateById(aDo);
|
|
|
|
|
|
+// user.setOpenid(openId);
|
|
|
|
+// adminUserMapper.updateById(user);
|
|
|
|
|
|
- double price;
|
|
|
|
- List<OrderCustomerFee> list = orderCustomerFeeManager.list(new LambdaQueryWrapper<OrderCustomerFee>().eq(OrderCustomerFee::getOrderId, aDo.getId()));
|
|
|
|
- if (CollectionUtil.isNotEmpty(list)) {
|
|
|
|
- price = new BigDecimal(aDo.getRealPrice()).add(list.stream().map(OrderCustomerFee::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add)).multiply(new BigDecimal(1 + aDo.getTaxRate() * 0.01)).doubleValue();
|
|
|
|
- } else {
|
|
|
|
- price = aDo.getRealPrice() * (1 + aDo.getTaxRate() * 0.01);
|
|
|
|
- }
|
|
|
|
- String url = ip + "#/payType?id=" + aDo.getId() + "&sn=" + aDo.getSn() + "&price=" + price + "&openid=" + openId;
|
|
|
|
- response.sendRedirect(url);
|
|
|
|
|
|
+ sendMsg(openId);
|
|
|
|
+
|
|
|
|
+// double price;
|
|
|
|
+// List<OrderCustomerFee> list = orderCustomerFeeManager.list(new LambdaQueryWrapper<OrderCustomerFee>().eq(OrderCustomerFee::getOrderId, aDo.getId()));
|
|
|
|
+// if (CollectionUtil.isNotEmpty(list)) {
|
|
|
|
+// price = new BigDecimal(aDo.getRealPrice()).add(list.stream().map(OrderCustomerFee::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add)).multiply(new BigDecimal(1 + aDo.getTaxRate() * 0.01)).doubleValue();
|
|
|
|
+// } else {
|
|
|
|
+// price = aDo.getRealPrice() * (1 + aDo.getTaxRate() * 0.01);
|
|
|
|
+// }
|
|
|
|
+// String url = ip + "#/payType?id=" + aDo.getId() + "&sn=" + aDo.getSn() + "&price=" + price + "&openid=" + openId;
|
|
|
|
+// response.sendRedirect(url);
|
|
}
|
|
}
|
|
|
|
|
|
// @PostMapping("/aliReturnCall/createCompany")
|
|
// @PostMapping("/aliReturnCall/createCompany")
|
|
@@ -260,5 +264,27 @@ public class PayController extends HttpServlet {
|
|
return wxService.getTemplateMsgService().getIndustry();
|
|
return wxService.getTemplateMsgService().getIndustry();
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @GetMapping("/sendMsg")
|
|
|
|
+ public void sendMsg(String openid) throws WxErrorException {
|
|
|
|
+// AdminUser user = adminUserMapper.selectById(1811346086600843265L);
|
|
|
|
+ WxMpTemplateMessage templateMessage = WxMpTemplateMessage.builder()
|
|
|
|
+ .toUser(openid)
|
|
|
|
+ .templateId("BmtA7g2Z2KomlIvNS0OtmEVu4ySqPUlSYZNo9zBZxtc")
|
|
|
|
+ .build();
|
|
|
|
+
|
|
|
|
+ templateMessage.addData(new WxMpTemplateData("thing3", "黄理志"))
|
|
|
|
+ .addData(new WxMpTemplateData("time4", "2022-11-17 22:04:40", "#173177"))
|
|
|
|
+ .addData(new WxMpTemplateData("character_string6", "A14010001688", "#173177"))
|
|
|
|
+ .addData(new WxMpTemplateData("thing8", "贸易通订单流程待处理通知", "#173177"))
|
|
|
|
+ .addData(new WxMpTemplateData("character_string13", "202308060001!", "#173177"));
|
|
|
|
+ WxMpService wxService = new WxMpServiceImpl();
|
|
|
|
+ wxService.getTemplateMsgService().sendTemplateMsg(templateMessage);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
|
|
}
|
|
}
|