From 946f257388c4d40c5ef1e0c6971f03820df13488 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Fri, 25 Sep 2020 10:41:06 +0800
Subject: [PATCH] 添加获取 验证码的功能
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/resources/application.yml | 17
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SaasClientPayController.java | 16 +
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/MyIWXPayDomain.java | 2
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WXPay.java | 2
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WXPayRequest.java | 2
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WXPayXmlUtil.java | 2
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java | 16
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/WxService.java | 26 ++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/AlipayServiceImpl.java | 81 ++++++++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java | 97 ++++++++-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WXPayUtil.java | 2
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/MyConfig.java | 21 +-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/ISaasClientPayService.java | 10 +
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/alipay/AlipayConfig.java | 2
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/IWXPayDomain.java | 3
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/weixin/WxController.java | 89 +++-----
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/WxServiceImpl.java | 86 ++++++++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WXPayReport.java | 2
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/alipay/AlipayController.java | 60 +++--
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/AlipayService.java | 17 +
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WXPayConstants.java | 2
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml | 12
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/alipay/AlipayProperties.java | 2
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WeiXinOfficPayProperties.java | 4
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WXPayConfig.java | 2
25 files changed, 434 insertions(+), 141 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java
index 3b524f6..c8788d2 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java
@@ -11,6 +11,7 @@
import org.hibernate.validator.constraints.NotEmpty;
import org.springframework.format.annotation.DateTimeFormat;
+import javax.validation.constraints.NotNull;
import java.util.Date;
/**
@@ -35,6 +36,7 @@
/**
* 诊断医生所在科室
*/
+ @NotEmpty(message = "科室的名称不能为空")
private String createHospitalDepartment;
/**
* 科室的唯一标识
@@ -44,28 +46,31 @@
/**
* 创建医院的唯一标识
*/
- @NotEmpty(message = "创建医院的唯一标识不能为空")
+ @NotNull(message = "创建医院的唯一标识不能为空")
private Long createHospitalId;
/**
* 创建医院名称
*/
+ @NotEmpty(message = "医院名称不能为空")
private String createHospitalName;
/**
* 医生id
*/
+ @NotEmpty(message = "医生id不能为空")
private String createDoctorId; /**
* 医生姓名
*/
+ @NotEmpty(message = "医生姓名不能为空")
private String createDoctorName;
/**
* 金额 （单位为分）
*/
- @NotEmpty(message = "金额 （单位为分）不能为空")
+
private Integer payPrice;
/**
* 内部订单号
*/
- @NotEmpty(message = "内部订单号不能为空")
+
private String outTradeNo;
/**
* 支付完成时间
@@ -85,11 +90,6 @@
@NotEmpty(message = "关联诊断记录ID不能为空")
private String diaId;
- /**
- * 诊断人姓名
- */
- @NotEmpty(message = "关联诊断记录ID不能为空")
- private String diaName;
/**
* 孩子的id
*/
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/alipay/AlipayConfig.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/alipay/AlipayConfig.java
similarity index 93%
rename from kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/alipay/AlipayConfig.java
rename to kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/alipay/AlipayConfig.java
index 330f9b5..e29b0a3 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/alipay/AlipayConfig.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/alipay/AlipayConfig.java
@@ -1,4 +1,4 @@
-package com.kidgrow.oprationcenter.config.alipay;
+package com.kidgrow.oprationcenter.alipay;
import com.alipay.api.AlipayClient;
import com.alipay.api.DefaultAlipayClient;
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/alipay/AlipayProperties.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/alipay/AlipayProperties.java
similarity index 90%
rename from kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/alipay/AlipayProperties.java
rename to kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/alipay/AlipayProperties.java
index 31fb6aa..feca4fc 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/alipay/AlipayProperties.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/alipay/AlipayProperties.java
@@ -1,4 +1,4 @@
-package com.kidgrow.oprationcenter.config.alipay;
+package com.kidgrow.oprationcenter.alipay;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/AlipayService.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/AlipayService.java
new file mode 100644
index 0000000..e01a618
--- /dev/null
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/AlipayService.java
@@ -0,0 +1,17 @@
+package com.kidgrow.oprationcenter.service;
+
+import com.kidgrow.oprationcenter.model.SaasClientPay;
+
+import java.util.Map;
+
+public interface AlipayService {
+ /**
+ * 获取支付宝的 预支付 base64 二维码
+ * @param saasClientPay
+ * @return
+ * @throws Exception
+ */
+ String getCode(SaasClientPay saasClientPay) throws Exception;
+
+ String notify( Map<String, String> requestMap);
+}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/ISaasClientPayService.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/ISaasClientPayService.java
index a5b7bfe..4e83c39 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/ISaasClientPayService.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/ISaasClientPayService.java
@@ -2,11 +2,13 @@
import com.kidgrow.common.model.PageResult;
+import com.kidgrow.common.model.ResultBody;
import com.kidgrow.common.service.ISuperService;
import com.kidgrow.oprationcenter.model.SaasClientPay;
import com.kidgrow.oprationcenter.vo.SaasClientPayExcel;
import com.kidgrow.oprationcenter.vo.SaasClientPayVo;
+import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
@@ -45,5 +47,13 @@
*/
List<SaasClientPayExcel> export(Map<String, Object> params);
+
+ /**
+ * 获取微信和支付宝的二维码
+ * @param saasClientPay
+ * @param request
+ * @return
+ */
+ ResultBody getCode(SaasClientPay saasClientPay,HttpServletRequest request) throws Exception;
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/WxService.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/WxService.java
new file mode 100644
index 0000000..a832879
--- /dev/null
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/WxService.java
@@ -0,0 +1,26 @@
+package com.kidgrow.oprationcenter.service;
+
+
+import com.kidgrow.oprationcenter.model.SaasClientPay;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+public interface WxService {
+ /**
+ * 获取支付宝的 微信 base64 二维码
+ * @param saasClientPay
+ * @param request
+ * @return
+ * @throws Exception
+ */
+ Map<String,String> getCode(SaasClientPay saasClientPay, HttpServletRequest request) throws Exception;
+
+ /**
+ * 微信的回调接口
+ * @param requestMap
+ * @return
+ * @throws Exception
+ */
+ String callback(Map<String, String> requestMap) throws Exception;
+}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/AlipayServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/AlipayServiceImpl.java
new file mode 100644
index 0000000..187ad45
--- /dev/null
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/AlipayServiceImpl.java
@@ -0,0 +1,81 @@
+package com.kidgrow.oprationcenter.service.impl;
+
+import com.alipay.api.AlipayClient;
+import com.alipay.api.domain.AlipayTradePrecreateModel;
+import com.alipay.api.request.AlipayTradePrecreateRequest;
+import com.alipay.api.response.AlipayTradePrecreateResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.kidgrow.common.utils.DateUtils;
+import com.kidgrow.common.utils.QRCodeUtil;
+import com.kidgrow.common.utils.StringUtils;
+import com.kidgrow.oprationcenter.alipay.AlipayProperties;
+import com.kidgrow.oprationcenter.model.SaasClientPay;
+import com.kidgrow.oprationcenter.service.AlipayService;
+import com.kidgrow.oprationcenter.service.ISaasClientPayService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Service
+public class AlipayServiceImpl implements AlipayService {
+ @Resource
+ private AlipayProperties alipayProperties;
+ @Resource
+ private AlipayClient alipayClient;
+ @Autowired
+ @Lazy
+ private ISaasClientPayService saasClientPayService;
+ @Override
+ public String getCode(SaasClientPay saasClientPay) throws Exception {
+ AlipayTradePrecreateModel model = new AlipayTradePrecreateModel();
+ model.setProductCode("FACE_TO_FACE_PAYMENT"); //销售产品码
+ model.setOutTradeNo(saasClientPay.getOutTradeNo()); //商户订单号
+ model.setSubject(saasClientPay.getChildName()+"的支付"); //订单标题
+ long l = Long.parseLong(saasClientPay.getPayPrice().toString()) / 100;
+ model.setTotalAmount(l+""); //订单总金额 单位为元
+ AlipayTradePrecreateRequest request = new AlipayTradePrecreateRequest();
+ request.setBizModel(model);
+ //兼容pkcs1 编码；
+ java.security.Security.addProvider(
+ new org.bouncycastle.jce.provider.BouncyCastleProvider()
+ );
+ request.setNotifyUrl(alipayProperties.getNotifyUrl());
+ request.setReturnUrl(alipayProperties.getReturnUrl());
+ AlipayTradePrecreateResponse alipayTradePrecreateResponse = alipayClient.execute(request);
+ if (StringUtils.isBlank(alipayTradePrecreateResponse.getQrCode())) {
+ return null;
+ }
+ String content = alipayTradePrecreateResponse.getQrCode();
+ String base64 = QRCodeUtil.creatRrCode(content, 200, 200, 0).replaceAll("\n", "").replaceAll("\r", "");
+ return base64;
+ }
+
+ @Override
+ public String notify(Map<String, String> requestMap) {
+ log.error("eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee");
+ log.error(requestMap.toString());
+ log.error("eeeeeeeeeeeeeeeewwwwwwwwwwww:"+requestMap.toString());
+ if(requestMap.get("trade_status").equals("TRADE_SUCCESS")){
+ QueryWrapper queryWrapper = new QueryWrapper();
+ queryWrapper.eq("out_trade_no",requestMap.get("out_trade_no"));
+ queryWrapper.eq("pay_status",0);
+ List<SaasClientPay> list = saasClientPayService.list(queryWrapper);
+ if(!list.isEmpty()){
+ SaasClientPay saasClientPay = list.get(0);
+ saasClientPay.setPayTime(DateUtils.parseDate(requestMap.get("time_end")));
+ saasClientPay.setPayStatus(2);
+ saasClientPay.setTradeNo(requestMap.get("trade_no"));
+ boolean b = saasClientPayService.saveOrUpdate(saasClientPay);
+ }
+ return "success";
+ }else {
+ return "fail";
+ }
+ }
+}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java
index ea78e78..78da321 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java
@@ -6,11 +6,14 @@
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.common.service.impl.SuperServiceImpl;
import com.kidgrow.oprationcenter.mapper.SaasClientPayMapper;
+import com.kidgrow.oprationcenter.model.PayManager;
import com.kidgrow.oprationcenter.model.SaasClientPay;
+import com.kidgrow.oprationcenter.service.AlipayService;
+import com.kidgrow.oprationcenter.service.IPayManagerService;
import com.kidgrow.oprationcenter.service.ISaasClientPayService;
+import com.kidgrow.oprationcenter.service.WxService;
import com.kidgrow.oprationcenter.vo.SaasClientPayExcel;
import com.kidgrow.oprationcenter.vo.SaasClientPayVo;
-//import com.kidgrow.recordcenter.feign.ChildService;
import com.kidgrow.usercenter.feign.SysDoctorService;
import com.kidgrow.usercenter.model.SysDoctor;
import lombok.extern.slf4j.Slf4j;
@@ -19,9 +22,13 @@
import org.springframework.cglib.beans.BeanCopier;
import org.springframework.stereotype.Service;
+import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.UUID;
+
+//import com.kidgrow.recordcenter.feign.ChildService;
/**
@@ -42,8 +49,12 @@
*/
@Autowired
private SysDoctorService sysDoctorService;
-// @Autowired
-// private ChildService childService;
+ @Autowired
+ WxService wxService;
+ @Autowired
+ AlipayService alipayService;
+ @Autowired
+ IPayManagerService payManagerService;
@Override
public PageResult<SaasClientPayVo> findList(Map<String, Object> params){
Long doctorId = MapUtils.getLong(params, "doctorId");
@@ -128,22 +139,76 @@
vo.setPayCustom(vc);
Double vk = Double.parseDouble(saasClientPay.getPayKidgrow().toString())/100;
vo.setPayKidgrow(vk);
-// if (StringUtils.isNotBlank(saasClientPay.getChildId())) {
-// Map<String,Object> map=new HashMap<>();
-// map.put("id",saasClientPay.getChildId());
-// ResultBody byId = childService.findById(map);
-// if(byId.getCode()==0){
-// Child parse = JSON.parseObject(JSON.toJSONString(byId.getData()), Child.class);
-// if(parse!=null){
-// vo.setChildName(parse.getChildName());
-// vo.setChildSex(parse.getChildSex());
-// vo.setChildBirthday(parse.getChildBirthday());
-// }
-// }
-// }
listVo.add(vo);
}
}
return listVo;
}
+
+ /**
+ * 获取微信和支付宝的二维码
+ * @param saasClientPay
+ * @return
+ */
+ @Override
+ public ResultBody getCode(SaasClientPay saasClientPay,HttpServletRequest request) throws Exception {
+ SaasClientPay modelByObject = findByObject(saasClientPay);
+ if(modelByObject!=null){
+ String str="";
+ Map<String, String> wxCode = this.getWxCode(modelByObject, request);
+ if(wxCode!=null){
+ saasClientPay.setPrepayId(wxCode.get("prepay_id"));
+ str=wxCode.get("code_url");
+ }
+ String aliCode = this.getaliPayCode(modelByObject);
+ List<String> list=new ArrayList<>();
+ list.add(str);
+ list.add(aliCode);
+ return ResultBody.ok().data(list);
+ }
+ saasClientPay.setId(UUID.randomUUID().toString().replace("-",""));
+ saasClientPay.setOutTradeNo(UUID.randomUUID().toString().replace("-",""));
+ PayManager payManager = new PayManager();
+ payManager.setDepartmentId(Long.valueOf(saasClientPay.getCreateHospitalDepartid()));
+ payManager.setHospitalId(saasClientPay.getCreateHospitalId());
+ payManager.setIsDel(false);
+ payManager.setEnabled(true);
+ PayManager byObject = payManagerService.findByObject(payManager);
+ if(byObject==null){
+ return ResultBody.failed().msg("该部门或医院没有开通单次支付");
+ }
+ saasClientPay.setPayPrice(byObject.getPayPrice()*100);
+ saasClientPay.setPayKidgrow(byObject.getPayKidgrow()*100);
+ saasClientPay.setPayCustom(byObject.getPayCustom()*100);
+ saasClientPay.setPayStatus(0);
+ String str="";
+ Map<String, String> wxCode = this.getWxCode(saasClientPay, request);
+ if(wxCode!=null){
+ saasClientPay.setPrepayId(wxCode.get("prepay_id"));
+ str=wxCode.get("code_url");
+ }
+ boolean b = this.saveOrUpdate(saasClientPay);
+ String aliCode = this.getaliPayCode(saasClientPay);
+ List<String> list=new ArrayList<>();
+ list.add(str);
+ list.add(aliCode);
+ return ResultBody.ok().data(list);
+ }
+ /**
+ * 获取微信的二维码
+ * @param saasClientPay
+ * @return
+ */
+ public Map<String,String> getWxCode(SaasClientPay saasClientPay, HttpServletRequest request) throws Exception{
+ return wxService.getCode(saasClientPay,request);
+
+ }
+ /**
+ * 获取支付宝的二维码
+ * @param saasClientPay
+ * @return
+ */
+ public String getaliPayCode(SaasClientPay saasClientPay) throws Exception{
+ return alipayService.getCode(saasClientPay);
+ }
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/WxServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/WxServiceImpl.java
new file mode 100644
index 0000000..8dd7189
--- /dev/null
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/WxServiceImpl.java
@@ -0,0 +1,86 @@
+package com.kidgrow.oprationcenter.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.kidgrow.common.utils.DateUtils;
+import com.kidgrow.common.utils.QRCodeUtil;
+import com.kidgrow.common.utils.StringUtils;
+import com.kidgrow.oprationcenter.model.SaasClientPay;
+import com.kidgrow.oprationcenter.service.ISaasClientPayService;
+import com.kidgrow.oprationcenter.service.WxService;
+import com.kidgrow.oprationcenter.weixin.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Service
+public class WxServiceImpl implements WxService {
+ @Resource
+ WeiXinOfficPayProperties weiXinOfficPayProperties;
+ @Autowired
+ @Lazy
+ ISaasClientPayService iSaasClientPayService;
+
+ @Override
+ public Map<String,String> getCode(SaasClientPay saasClientPay, HttpServletRequest request) throws Exception {
+ Map<String,String> jsonObject=new HashMap<>();
+ Map<String,Object> mapto=new HashMap<>();
+ jsonObject.put("body",saasClientPay.getChildName());//商品描述
+ jsonObject.put("out_trade_no", saasClientPay.getOutTradeNo());//商户订单号
+ jsonObject.put("total_fee",saasClientPay.getPayPrice().toString());//标价金额 单位为分
+ jsonObject.put("spbill_create_ip",request.getRequestURI());//终端IP
+ jsonObject.put("notify_url",weiXinOfficPayProperties.getPayNotifyUrl());//通知地址
+ jsonObject.put("trade_type","NATIVE");//交易类型
+ MyConfig wxPayConfig= new MyConfig(weiXinOfficPayProperties);
+ WXPay wxPay=new WXPay(wxPayConfig);
+ Map<String, String> stringStringMap = wxPay.fillRequestData(jsonObject);
+ Map<String, String> result = wxPay.unifiedOrder(stringStringMap);
+ String resultStr = result.get("code_url");
+ if(result.get("code_url")==null|| StringUtils.isBlank(resultStr)){
+ return null;
+ }
+ String s = QRCodeUtil.creatRrCode(resultStr, 200, 200, 0).replaceAll("\n","").replaceAll("\r","");
+ String prepay_id = result.get("prepay_id");
+ Map<String,String> map = new HashMap<>();
+ map.put("code_url",resultStr);
+ map.put("prepay_id",prepay_id);
+ return map;
+ }
+
+ @Override
+ public String callback(Map<String, String> requestMap) throws Exception {
+ Map<String,String> map=new HashMap<>();
+ map.put("return_code","FAIL");
+ map.put("return_msg","INVALID_REQUEST");
+ log.error("eeeeeeeeeeeeeee："+requestMap.toString());
+ boolean signatureValid = WXPayUtil.isSignatureValid(requestMap, weiXinOfficPayProperties.getKey(), WXPayConstants.SignType.HMACSHA256);
+ if(signatureValid){
+ log.error("wwwwwwwwwwwwweeeeeeeeeeeeeeeeeeeee");
+ //支付成功
+ if(WXPayConstants.SUCCESS.equals(requestMap.get("result_code"))){
+ //更新状态 out_trade_no
+ QueryWrapper queryWrapper = new QueryWrapper();
+ queryWrapper.eq("out_trade_no",requestMap.get("out_trade_no"));
+ queryWrapper.eq("pay_status",0);
+ List<SaasClientPay> list = iSaasClientPayService.list(queryWrapper);
+ if(!list.isEmpty()){
+ SaasClientPay saasClientPay = list.get(0);
+ saasClientPay.setPayTime(DateUtils.parseDate(requestMap.get("time_end")));
+ saasClientPay.setPayStatus(2);
+ saasClientPay.setTradeNo(requestMap.get("transaction_id"));
+ boolean b = iSaasClientPayService.saveOrUpdate(saasClientPay);
+ map.put("return_code","SUCCESS");
+ map.put("return_msg","OK");
+ }
+ }
+ }
+ return WXPayUtil.mapToXml(map);
+ }
+}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/IWXPayDomain.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/IWXPayDomain.java
similarity index 95%
rename from kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/IWXPayDomain.java
rename to kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/IWXPayDomain.java
index 0e0a07b..c1a6836 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/IWXPayDomain.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/IWXPayDomain.java
@@ -1,4 +1,5 @@
-package com.kidgrow.oprationcenter.config.weixin;
+package com.kidgrow.oprationcenter.weixin;
+
/**
* 域名管理，实现主备域名自动切换
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/MyConfig.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/MyConfig.java
similarity index 79%
rename from kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/MyConfig.java
rename to kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/MyConfig.java
index ab08742..3021519 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/MyConfig.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/MyConfig.java
@@ -1,8 +1,6 @@
-package com.kidgrow.oprationcenter.config.weixin;
+package com.kidgrow.oprationcenter.weixin;
import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
import java.io.InputStream;
public class MyConfig extends WXPayConfig{
@@ -15,14 +13,17 @@
private byte[] certData;
- public MyConfig() throws Exception {
- String certPath = "D:\\develop\\chengxu\\houtai\\3cc.txt";
- File file = new File(certPath);
- InputStream certStream = new FileInputStream(file);
- this.certData = new byte[(int) file.length()];
- certStream.read(this.certData);
- certStream.close();
+ public MyConfig() {
+
}
+// public MyConfig() throws Exception {
+// String certPath = "D:\\develop\\chengxu\\houtai\\3cc.txt";
+// File file = new File(certPath);
+// InputStream certStream = new FileInputStream(file);
+// this.certData = new byte[(int) file.length()];
+// certStream.read(this.certData);
+// certStream.close();
+// }
//wx84c77dcda51c612c
@Override
public String getAppID() {
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/MyIWXPayDomain.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/MyIWXPayDomain.java
similarity index 87%
rename from kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/MyIWXPayDomain.java
rename to kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/MyIWXPayDomain.java
index f32387d..936c589 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/MyIWXPayDomain.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/MyIWXPayDomain.java
@@ -1,4 +1,4 @@
-package com.kidgrow.oprationcenter.config.weixin;
+package com.kidgrow.oprationcenter.weixin;
public class MyIWXPayDomain implements IWXPayDomain {
@Override
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/WXPay.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WXPay.java
similarity index 99%
rename from kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/WXPay.java
rename to kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WXPay.java
index f8d17b6..6dd9882 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/WXPay.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WXPay.java
@@ -1,4 +1,4 @@
-package com.kidgrow.oprationcenter.config.weixin;
+package com.kidgrow.oprationcenter.weixin;
//import com.github.wxpay.sdk.WXPayConstants.SignType;
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/WXPayConfig.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WXPayConfig.java
similarity index 96%
rename from kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/WXPayConfig.java
rename to kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WXPayConfig.java
index 00b4678..33f19b4 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/WXPayConfig.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WXPayConfig.java
@@ -1,4 +1,4 @@
-package com.kidgrow.oprationcenter.config.weixin;
+package com.kidgrow.oprationcenter.weixin;
import java.io.InputStream;
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/WXPayConstants.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WXPayConstants.java
similarity index 98%
rename from kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/WXPayConstants.java
rename to kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WXPayConstants.java
index 71a5905..522ad74 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/WXPayConstants.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WXPayConstants.java
@@ -1,4 +1,4 @@
-package com.kidgrow.oprationcenter.config.weixin;
+package com.kidgrow.oprationcenter.weixin;
import org.apache.http.client.HttpClient;
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/WXPayReport.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WXPayReport.java
similarity index 99%
rename from kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/WXPayReport.java
rename to kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WXPayReport.java
index 965d759..481c845 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/WXPayReport.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WXPayReport.java
@@ -1,4 +1,4 @@
-package com.kidgrow.oprationcenter.config.weixin;
+package com.kidgrow.oprationcenter.weixin;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/WXPayRequest.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WXPayRequest.java
similarity index 99%
rename from kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/WXPayRequest.java
rename to kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WXPayRequest.java
index f59ff8a..2583228 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/WXPayRequest.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WXPayRequest.java
@@ -1,4 +1,4 @@
-package com.kidgrow.oprationcenter.config.weixin;
+package com.kidgrow.oprationcenter.weixin;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/WXPayUtil.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WXPayUtil.java
similarity index 99%
rename from kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/WXPayUtil.java
rename to kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WXPayUtil.java
index eb8dc9f..2d30a32 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/WXPayUtil.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WXPayUtil.java
@@ -1,4 +1,4 @@
-package com.kidgrow.oprationcenter.config.weixin;
+package com.kidgrow.oprationcenter.weixin;
//import com.github.wxpay.sdk.WXPayConstants.SignType;
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/WXPayXmlUtil.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WXPayXmlUtil.java
similarity index 95%
rename from kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/WXPayXmlUtil.java
rename to kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WXPayXmlUtil.java
index b4a6a7f..e38f5ef 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/WXPayXmlUtil.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WXPayXmlUtil.java
@@ -1,4 +1,4 @@
-package com.kidgrow.oprationcenter.config.weixin;
+package com.kidgrow.oprationcenter.weixin;
import org.w3c.dom.Document;
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/WeiXinOfficPayProperties.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WeiXinOfficPayProperties.java
similarity index 91%
rename from kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/WeiXinOfficPayProperties.java
rename to kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WeiXinOfficPayProperties.java
index 1dbded0..133ba4a 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/config/weixin/WeiXinOfficPayProperties.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/weixin/WeiXinOfficPayProperties.java
@@ -1,4 +1,4 @@
-package com.kidgrow.oprationcenter.config.weixin;
+package com.kidgrow.oprationcenter.weixin;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -26,7 +26,7 @@
/**
* API证书绝对路径 (本项目放在了 resources/cert/wxpay/apiclient_cert.p12")
*/
- private String certPath;
+// private String certPath;
/**
* HTTP(S) 连接超时时间，单位毫秒
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SaasClientPayController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SaasClientPayController.java
index b6f93e1..370f34e 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SaasClientPayController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SaasClientPayController.java
@@ -18,6 +18,7 @@
import org.springframework.validation.ObjectError;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
@@ -75,6 +76,21 @@
ExcelUtil.exportExcel(saasClientPayExcel, null, "支付导出", SaasClientPayExcel.class, "saas_client_pay", response);
return ResultBody.ok().msg("导出成功");
}
+ /**
+ * 获取微信和支付宝的二维码
+ */
+ @ApiOperation(value = "获取微信和支付宝的二维码")
+ @PostMapping("/getCode")
+ public ResultBody getCode(@Valid @RequestBody SaasClientPay saasClientPay, BindingResult bindingResult, HttpServletRequest request) throws Exception {
+ List<String> errMsg= new ArrayList<>();
+ if (bindingResult.hasErrors()) {
+ for (ObjectError error : bindingResult.getAllErrors()) {
+ errMsg.add(error.getDefaultMessage());
+ }
+ return ResultBody.failed().msg(errMsg.toString());
+ }
+ return saasClientPayService.getCode(saasClientPay,request);
+ }
/**
* 查询
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/alipay/AlipayController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/alipay/AlipayController.java
index 8628572..05a5fe7 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/alipay/AlipayController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/alipay/AlipayController.java
@@ -13,7 +13,7 @@
import com.kidgrow.common.utils.DateUtils;
import com.kidgrow.common.utils.QRCodeUtil;
import com.kidgrow.common.utils.StringUtils;
-import com.kidgrow.oprationcenter.config.alipay.AlipayProperties;
+import com.kidgrow.oprationcenter.alipay.AlipayProperties;
import com.kidgrow.oprationcenter.model.SaasClientPay;
import com.kidgrow.oprationcenter.service.ISaasClientPayService;
import io.swagger.annotations.Api;
@@ -35,7 +35,7 @@
@RequestMapping("alipay")
@Api(tags = "支付宝的支付controller")
public class AlipayController {
-
+
@Resource
private AlipayClient alipayClient;
@Resource
@@ -47,7 +47,7 @@
@PostMapping("/precreate")
public ResultBody precreate(HttpServletResponse response) throws Exception{ //商户预创建支付订单，生成二维码
- String outTradeNo = UUID.randomUUID().toString().replaceAll("_", "");
+ String outTradeNo = UUID.randomUUID().toString().replaceAll("-", "");
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("dia_id","1");
queryWrapper.eq("pay_status",0);
@@ -72,6 +72,8 @@
java.security.Security.addProvider(
new org.bouncycastle.jce.provider.BouncyCastleProvider()
);
+ request.setNotifyUrl(alipayProperties.getNotifyUrl());
+ request.setReturnUrl(alipayProperties.getReturnUrl());
AlipayTradePrecreateResponse alipayTradePrecreateResponse=alipayClient.execute(request);
if (StringUtils.isBlank(alipayTradePrecreateResponse.getQrCode())) {
return ResultBody.failed().data("生成二维码失败");
@@ -84,18 +86,13 @@
//数据封装
public SaasClientPay fengData(AlipayTradePrecreateModel model){
SaasClientPay saasClientPay = new SaasClientPay();
- saasClientPay.setCreateHospitalDepartment("");
- saasClientPay.setCreateHospitalDepartid("");
- saasClientPay.setCreateHospitalId(Long.valueOf(1L));
saasClientPay.setPayPrice(1);
saasClientPay.setOutTradeNo(model.getOutTradeNo());
saasClientPay.setPayStatus(0);
saasClientPay.setPayMethod(1);
saasClientPay.setDiaId("1");
- saasClientPay.setId( UUID.randomUUID().toString().replaceAll("_", ""));
+ saasClientPay.setId( UUID.randomUUID().toString().replaceAll("-", ""));
saasClientPay.setCreateTime(new Date());
- saasClientPay.setCreateUserId(Long.valueOf(1L));
- saasClientPay.setCreateUserName("");
return saasClientPay;
}
@ApiOperation(value = "取消订单，支付超时、支付结果未知是可撤销，超过24小时不可撤销-------暂时没有配置")
@@ -103,32 +100,37 @@
public ResultBody cancel() throws Exception{ //取消订单，支付超时、支付结果未知是可撤销，超过24小时不可撤销
AlipayTradeCancelModel model=new AlipayTradeCancelModel();
model.setOutTradeNo("300");
-
+
AlipayTradeCancelRequest request=new AlipayTradeCancelRequest();
request.setBizModel(model);
-
+
AlipayTradeCancelResponse response=alipayClient.execute(request);
return ResultBody.ok().data(response.getBody());
}
@ApiOperation(value = "trade_success状态下异步通知接口，端口异常的接口")
@PostMapping("/notify")
- public ResultBody notify(HttpServletRequest request) throws Exception{ //trade_success状态下异步通知接口
+ public String notify(HttpServletRequest request) throws Exception{ //trade_success状态下异步通知接口
if (check(request.getParameterMap())){
System.out.println(request.getParameter("trade_status"));
Map<String, String> requestMap = this.getRequestMap(request.getParameterMap());
log.error("eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee");
- log.error(request.toString());
+ log.error(requestMap.toString());
+ log.error("eeeeeeeeeeeeeeeewwwwwwwwwwww:");
+ if(requestMap.get("trade_status").equals("TRADE_SUCCESS")){
+ log.error("wwwwwwwwwww");
+ }
log.error("eeeeeeeeeeeeeeeeeeeeeeeeeeeeeee");
System.out.println("异步通知 "+ Instant.now());
}else {
System.out.println("验签失败");
+ return "fail";
}
- return ResultBody.ok().data("订单失败");
+ return "success";
}
@ApiOperation(value = "订单支付成功后同步返回地址")
@PostMapping("/return")
- public ResultBody returnUrl(HttpServletRequest request, Map<String,Object> map) throws Exception{ //订单支付成功后同步返回地址
+ public ResultBody returnUrl(HttpServletRequest request,Map<String,Object> map) throws Exception{ //订单支付成功后同步返回地址
if (check(request.getParameterMap())){
Map<String, String> requestMap = this.getRequestMap(request.getParameterMap());
log.error("wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww");
@@ -159,20 +161,20 @@
return ResultBody.failed().data("false");
}
}
- private Map<String,String> getRequestMap(Map<String,String[]> requestParams){
- Map<String,String> params = new HashMap<>();
- for (String name : requestParams.keySet()) {
- String[] values = requestParams.get(name);
- String valueStr = "";
- for (int i = 0; i < values.length; i++) {
- valueStr = (i == values.length - 1) ? valueStr + values[i]
- : valueStr + values[i] + ",";
- }
- params.put(name, valueStr);
- System.out.println(name+" ==> "+valueStr);
- }
- return params;
- }
+ private Map<String,String> getRequestMap(Map<String,String[]> requestParams){
+ Map<String,String> params = new HashMap<>();
+ for (String name : requestParams.keySet()) {
+ String[] values = requestParams.get(name);
+ String valueStr = "";
+ for (int i = 0; i < values.length; i++) {
+ valueStr = (i == values.length - 1) ? valueStr + values[i]
+ : valueStr + values[i] + ",";
+ }
+ params.put(name, valueStr);
+ System.out.println(name+" ==> "+valueStr);
+ }
+ return params;
+ }
private boolean check(Map<String,String[]> requestParams) throws Exception{ //对return、notify参数进行验签
Map<String, String> requestMap = this.getRequestMap(requestParams);
return AlipaySignature.rsaCheckV1(requestMap, alipayProperties.getAlipayPublicKey(),
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/weixin/WxController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/weixin/WxController.java
index 4f7da27..0b502ac 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/weixin/WxController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/weixin/WxController.java
@@ -1,16 +1,15 @@
package com.kidgrow.oprationcenter.controller.weixin;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.kidgrow.common.model.ResultBody;
-import com.kidgrow.common.utils.DateUtils;
import com.kidgrow.common.utils.QRCodeUtil;
import com.kidgrow.common.utils.StringUtils;
-import com.kidgrow.oprationcenter.config.weixin.MyConfig;
-import com.kidgrow.oprationcenter.config.weixin.WXPay;
-import com.kidgrow.oprationcenter.config.weixin.WXPayUtil;
-import com.kidgrow.oprationcenter.config.weixin.WeiXinOfficPayProperties;
import com.kidgrow.oprationcenter.model.SaasClientPay;
import com.kidgrow.oprationcenter.service.ISaasClientPayService;
+import com.kidgrow.oprationcenter.service.WxService;
+import com.kidgrow.oprationcenter.weixin.MyConfig;
+import com.kidgrow.oprationcenter.weixin.WXPay;
+import com.kidgrow.oprationcenter.weixin.WXPayUtil;
+import com.kidgrow.oprationcenter.weixin.WeiXinOfficPayProperties;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -24,6 +23,8 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
import java.util.*;
@@ -40,8 +41,16 @@
ISaasClientPayService iSaasClientPayService;
@Resource
WeiXinOfficPayProperties weiXinOfficPayProperties;
+ @Autowired
+ WxService wxService;
- @ApiOperation(value = "保存")
+ /**
+ * 测试微信的预支付接口
+ * @param map
+ * @return
+ * @throws Exception
+ */
+ @ApiOperation(value = "测试微信的预支付接口")
@PostMapping("pay")
public ResultBody save(@RequestBody Map<String,Object> map) throws Exception {
Long hospitalId = MapUtils.getLong(map, "hospitalId");
@@ -53,13 +62,14 @@
if (doctorId!=null) {
return ResultBody.failed().data("请输入医生id");
}
+
if (diaId!=null) {
return ResultBody.failed().data("请输入诊断记录ID");
}
Map<String,String> jsonObject=new HashMap<>();
Map<String,Object> mapto=new HashMap<>();
jsonObject.put("body","腾讯");//商品描述
- jsonObject.put("out_trade_no","20150806123434");//商户订单号
+ jsonObject.put("out_trade_no",UUID.randomUUID().toString().replaceAll("-",""));//商户订单号
jsonObject.put("total_fee","1");//标价金额
jsonObject.put("spbill_create_ip","192.168.2.240");//终端IP
// jsonObject.put("notify_url",myConfig.getPayNotifyUrl());//通知地址
@@ -76,9 +86,6 @@
}
SaasClientPay saasClientPay=new SaasClientPay();
saasClientPay.setId(UUID.randomUUID().toString().replaceAll("_", ""));
- saasClientPay.setCreateHospitalDepartment("");
- saasClientPay.setCreateHospitalDepartid("");
- saasClientPay.setCreateHospitalId(Long.valueOf(1L));
saasClientPay.setPayPrice(1);
saasClientPay.setCreateHospitalName("");
saasClientPay.setOutTradeNo(jsonObject.get("out_trade_no"));
@@ -86,52 +93,34 @@
saasClientPay.setPayStatus(0);
saasClientPay.setPayMethod(0);
saasClientPay.setDiaId("1");
+ saasClientPay.setCreateTime(new Date());
boolean save = iSaasClientPayService.saveOrUpdate(saasClientPay);
String s = QRCodeUtil.creatRrCode(resultStr, 200, 200, 0).replaceAll("\n","").replaceAll("\r","");
return ResultBody.ok().data(s);
}
+
+ /**
+ * 微信的回调接口
+ * @param request
+ * @param response
+ * @return
+ * @throws Exception
+ */
@RequestMapping("/callback")
- public void OrderCallBack(HttpServletRequest request, HttpServletResponse response,Map<String,Object> map) throws Exception {
- Map<String, String> requestMap = this.getRequestMap(request.getParameterMap());
- log.error("wwwwwwwwwwwwwwwwwwwwwwwwwwwwwww");
- log.error(requestMap.toString());
- log.error("wwwwwwwwwwwwwwwwwwwwwwwwwwwwwww");
- log.error(map.toString());
- log.error("eeeeeeeeeeeeeeeeeeeeee");
- if(WXPayUtil.isSignatureValid(requestMap, "GSFcX6WdgRTAS6154EW14WE3SGBSER49")){
- //支付成功
- if(requestMap.get("result_code").equals("SUCCESS")){
- //更新状态 out_trade_no
- QueryWrapper queryWrapper = new QueryWrapper();
- queryWrapper.eq("out_trade_no",requestMap.get("out_trade_no"));
- queryWrapper.eq("pay_status",0);
- List<SaasClientPay> list = iSaasClientPayService.list(queryWrapper);
- if(!list.isEmpty()){
- SaasClientPay saasClientPay = list.get(0);
- saasClientPay.setPayTime(DateUtils.parseDate(requestMap.get("time_end")));
- saasClientPay.setPayStatus(2);
- saasClientPay.setTradeNo(requestMap.get("transaction_id"));
- boolean b = iSaasClientPayService.saveOrUpdate(saasClientPay);
- }
- }
- }else {
- System.out.println("验签失败");
+ public String OrderCallBack(HttpServletRequest request, HttpServletResponse response) throws Exception {
+ InputStream inStream = request.getInputStream();
+ ByteArrayOutputStream outSteam = new ByteArrayOutputStream();
+ byte[] buffer = new byte[1024];
+ int len = 0;
+ while ((len = inStream.read(buffer)) != -1) {
+ outSteam.write(buffer, 0, len);
}
+ String resultxml = new String(outSteam.toByteArray(), "utf-8");
+ Map<String, String> requestMap = WXPayUtil.xmlToMap(resultxml);
+ String callback = wxService.callback(requestMap);
+ return callback;
}
- private Map<String,String> getRequestMap(Map<String,String[]> requestParams){
- Map<String,String> params = new HashMap<>();
- for (String name : requestParams.keySet()) {
- String[] values = requestParams.get(name);
- String valueStr = "";
- for (int i = 0; i < values.length; i++) {
- valueStr = (i == values.length - 1) ? valueStr + values[i]
- : valueStr + values[i] + ",";
- }
- params.put(name, valueStr);
- System.out.println(name+" ==> "+valueStr);
- }
- return params;
- }
+
public static void main(String[] args) throws Exception {
WxController weixinController=new WxController();
Map<String,Object> map=null;
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/resources/application.yml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/resources/application.yml
index e2fab01..3a72150 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/resources/application.yml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/resources/application.yml
@@ -100,12 +100,12 @@
pay:
#微信app支付
wxpay:
- app:
- appID: wx84c77dcda51c612c
- mchID: 1386873502
- key: GSFcX6WdgRTAS6154EW14WE3SGBSER49
- certPath: D:\develop\chengxu\houtai\3cc.txt # 从微信商户平台下载的安全证书存放的路径、我放在resources下面,切记一定要看看target目录下的class文件下有没有打包apiclient_cert.p12文件
- payNotifyUrl: http://open.zuul.kidgrow.cloud/api-record/wxController/callback # 微信支付成功的异步通知接口
+ appID: wx84c77dcda51c612c
+ mchID: 1386873502
+ key: GSFcX6WdgRTAS6154EW14WE3SGBSER49
+ # certPath: D:\develop\chengxu\houtai\3cc.txt # 从微信商户平台下载的安全证书存放的路径、我放在resources下面,切记一定要看看target目录下的class文件下有没有打包apiclient_cert.p12文件
+ payNotifyUrl: http://open.zuul.kidgrow.cloud/api-opration/wxController/callback # 微信支付成功的异步通知接口
+ domain: https://api.mch.weixin.qq.com
#支付宝app支付
alipay:
appId: 2017021705718280
@@ -113,10 +113,9 @@
format: JSON
charset: utf-8
signType: RSA2
- returnUrl: http://open.zuul.kidgrow.cloud/api-record/alipay/return
- notifyUrl: http://open.zuul.kidgrow.cloud/api-record/alipay/notify
+ returnUrl: http://open.zuul.kidgrow.cloud/api-opration/alipay/return
+ notifyUrl: http://open.zuul.kidgrow.cloud/api-opration/alipay/notify
app-private-key: MIIEowIBAAKCAQEA9wDq+cxVvN3q3sUdqku/vHGwddzj5a7Re1ixbDZUPX/8CLvMTPZo8qJ0j14HxnjgVMCX3Wo1u5L4zPlqXzW5UVhPuVUnr5VToRGrOspOZBfY81gj/fJGmF2Mln0XlSqeoPRAS9SGEdEa9S87mAX3BjtyZhU2a7gxnd1/ca2QJxwgMXLX00MJl3ZrpngVFYXR/s16MV87FVq+Gfhk8tTPT25PVfufUmS7RRbiZriirNQPOYgCKQ4mi03oAGXTZGS2I3V59iph2ui89IJm4iS11t4RLqQf8Yyr+Z0rTaIfqJPQ9QMaJdl1VRaFU2jGToGIWpVe7eP/mWfG4ZBYlrVvhQIDAQABAoIBADVgG2bTgwuHIQP2sIxmRg6gurMdgpnVhysSZXSu4NFRYNM6UdGnxdH4zRtWBHQdFsz5uVd9ZhMclWsl0pi0cVFktgWkoyjMKgA6YzgXE42JobYkK9LqkdrHDGRQr9HqHdFGNsasLDSZbSvigww87b6JBhWNK+9nJEGq5alZCjeI7bTK8YlFmOlgRJ6oe1tzmYOpQMDwsZoWFx9xN9+SHursZ8bQymTRLcfZIt6vMK8rv0L/MIhxCC51hxT88gyT5Pm4087c30qbS5IlpeKqPC0TkVuvRgASZ348dP09Lf6KpAf06cMixeu0SSCGVOGyqCDgI/yn2H9XCk6++HyyCNkCgYEA/fNmCoBMSbhayyAU9TF/UPF9Msyy465JuHp1yKYJaM1L/a2C3YG7gjO8tvVxq64qFH62b4XU+Qq/arIHHdiGObzLN101oRtAqCMG8IWgM1Rd66HvEwyOnroqZarSnSmg1Uwktz9qFdmRGhGB4ePGfDWQ6yxm7l9H/U/VHalFOF8CgYEA+P8rBSP7AyKDGOXiPRFFkuOK++bxWQ0yC0V7m/XYsihqEfhunMPoHlUDpHM6d571ftHXCljdQ+0hK7xGXAD4Tqyf9wsK+/oRwOrEdHCLU9k8iFVYbo5KO/IwqXpsrlrI2ragPod8xETIGzxqm9IsSDQNXcvnViZI09cxyj6OcpsCgYArK6ZsIJVXbuyYXVLSv+BZ3UOgUCYVCHrlzoOZYYh19Xh2nnmBuF0s7CinnZ/+RHRI2aWf3ctvrsENnUgSbc2boRmWxtSoF57tNk8mskCimTQCK5wdy+Ou3gz5DYoSR5Jc0D3pnPEm176QBOvkf7ktQlnpcLnqye3OBTVAfpcS1wKBgQCOm55pCE14YyjQdsFXlm/RjC8KzR9HkI4r9HSyQ2ED0K/HcRDxCicEUE6QvkorPsh+BPLzgyffAo4v/VoS0Z9ld+r6U8HLxVKrugogYmD5+f54WuEWGLqdkL2cI3jhdy94TIaEqZak1nwBVV39tqcUB3PsV588MRse8S4cFi4BpwKBgEZTMUcEQ2pHIrcVZXHSp5GTBXY70J5xCh+uO5F4iBhmVWaqOECi1/c6Nz3SYyizsIspZG3gzYvEoe7KVaMmkCWlRW0NcXMuN0KnE70J4YoFw3WhWKNh0zQAL57lMAQkPoZVusYePCQyct9j7EboNoPgyB2CvKU152FJkkl1c4XB
alipay-public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlxD+qCFXTnJrwbGgKPNEcZqrPpHnNoJDTdP+zhWI7ABv/rASfOhWZi56vyQhKldgbc01VBFa0myTpECHlPMZn32DGNg8DIxuV+LEIT+l2Lqjn4wQtX3zUNPHR3bTZlMEVw9JYQZI+XR2i4ZWoOszo6ahAO9SxEuNUlsCSBDMEIPaEjGJmu57X+os8TRlgj8Mxo90JVqSZlRq7eFc7wVTMe5e9p9ITctdiB+utkO0/rSh4T+VUaV1zNk8/n5jh0xDSXL4QdEe832Naeu67Y6w6vezkvF9GUwEmfJqs6PH3sF1gOKgjakbFXauEOJXnXEdyMmOKhG93jT+9GtvV/ywmwIDAQAB
-
diff --git a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
index d9a35c2..332f7ac 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
+++ b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
@@ -228,9 +228,9 @@
- /api-file/baseUplaod
- /api-user/users/python
- /api-evaluation/evaluationxrayinfo/checkQRCode
- - /api-record/wxController/callback
- - /api-record/alipay/return
- - /api-record/alipay/notify
+ - /api-opration/wxController/callback
+ - /api-opration/alipay/notify
+ - /api-opration/alipay/return
# - /api-user/syshospital/findAllByMap
# - /api-user/sysdictionaries/findAll
# - /api-user/sysdepartment/findListByHospitalId
@@ -265,9 +265,9 @@
/api-file/baseUplaod,
/api-user/users/python,
/api-evaluation/evaluationxrayinfo/checkQRCode,
- /api-record/wxController/callback,
- /api-record/alipay/return,
- /api-record/alipay/notify
+ /api-opration/wxController/callback,
+ /api-opration/alipay/return,
+ /api-opration/alipay/notify
# /api-user/syshospital/findAllByMap,
# /api-user/sysdictionaries/findAll,
# /api-user/sysdepartment/findListByHospitalId
--
Gitblit v1.8.0