From 3ad4b75ed464d8bfb2c567803569cc27e68d804a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期日, 08 十月 2023 15:03:57 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/core/utils/DateUtil.java | 16 ++
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 2
server/services/src/main/java/com/doumee/core/wx/WxMiniConfig.java | 23 ---
server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java | 7
server/web/src/main/java/com/doumee/api/web/PaymentCallback.java | 76 ++++++++++
server/pom.xml | 1
server/services/src/main/java/com/doumee/core/constants/Constants.java | 6
server/services/src/main/java/com/doumee/service/business/GoodsorderService.java | 23 +++
server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java | 55 +++++++
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 160 +++++++++++++++++++++-
server/services/src/main/java/com/doumee/dao/business/web/response/RidesDetailResponse.java | 33 ++++
server/services/src/main/java/com/doumee/core/Jwt/WebMvcConfig.java | 2
12 files changed, 370 insertions(+), 34 deletions(-)
diff --git a/server/pom.xml b/server/pom.xml
index 9510e74..64899f2 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -136,7 +136,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
-
<!-- swagger -->
<!-- <dependency>
<groupId>io.springfox</groupId>
diff --git a/server/services/src/main/java/com/doumee/core/Jwt/WebMvcConfig.java b/server/services/src/main/java/com/doumee/core/Jwt/WebMvcConfig.java
index 5040cd4..0025d16 100644
--- a/server/services/src/main/java/com/doumee/core/Jwt/WebMvcConfig.java
+++ b/server/services/src/main/java/com/doumee/core/Jwt/WebMvcConfig.java
@@ -90,7 +90,7 @@
if(isForbidden.equals(Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
}
- Integer count = dao.queryForObject("select count(1) from `member` where id = ?", Integer.class, memberId);
+ Integer count = dao.queryForObject("select count(1) from member where id = ?", Integer.class, memberId);
if (count != null && count > 0) {
request.setAttribute(JwtTokenUtil.UserId_Name, memberId);
return true;
diff --git a/server/services/src/main/java/com/doumee/core/constants/Constants.java b/server/services/src/main/java/com/doumee/core/constants/Constants.java
index 2b89f14..072f1cb 100644
--- a/server/services/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/services/src/main/java/com/doumee/core/constants/Constants.java
@@ -45,6 +45,12 @@
int fail = 3;
int over = 4;
}
+ public interface goodsorderPayStatus{
+ int waitPay =0;
+ int pay =1;
+ }
+
+
public static String getUUID(){
return UUID.randomUUID().toString().replace("-","");
}
diff --git a/server/services/src/main/java/com/doumee/core/utils/DateUtil.java b/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
index c101128..d51d0f6 100644
--- a/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -10,6 +10,7 @@
import java.text.DateFormatSymbols;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.time.Duration;
import java.util.Date;
import java.util.*;
@@ -3003,6 +3004,21 @@
return cal.getTime();
}
+
+ /**
+ * 2涓棩鏈熶箣闂寸浉宸垎閽熸暟
+ * @param begin
+ * @param end
+ * @return
+ */
+ public static long betweenMin(Date begin, Date end) {
+ long createTime =begin.getTime();//鑾峰彇鍒涘缓鏃堕棿鐨勬椂闂存埑
+ long currentTime =Objects.isNull(end)?System.currentTimeMillis():end.getTime();//鑾峰彇褰撳墠鏃堕棿鐨勬椂闂存埑
+ long diff=(currentTime-createTime)/1000/60;//鑾峰彇涓や釜鏃堕棿鐩稿樊鐨勫垎閽�
+ return diff;
+ }
+
+
/**
* 璁＄畻鑰楁椂
* @param start
diff --git a/server/services/src/main/java/com/doumee/core/wx/WxMiniConfig.java b/server/services/src/main/java/com/doumee/core/wx/WxMiniConfig.java
index 237c8fd..454c54e 100644
--- a/server/services/src/main/java/com/doumee/core/wx/WxMiniConfig.java
+++ b/server/services/src/main/java/com/doumee/core/wx/WxMiniConfig.java
@@ -3,6 +3,7 @@
import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
+import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.mybatis.SpringUtils;
import com.github.binarywang.wxpay.config.WxPayConfig;
import com.github.binarywang.wxpay.constant.WxPayConstants;
@@ -22,9 +23,6 @@
/********寰俊灏忕▼搴忔湇鍔�**********/
public static WxMaService wxMaService;
/********寰俊灏忕▼搴忔敮浠�**********/
- /********寰俊APP鏀粯**********/
- public static WxPayService wxAppPayService;
-
public static WxPayService wxPayService;
@Autowired
@@ -38,7 +36,6 @@
void init() {
this.load_WxMaService();
this.load_wxPayService();
-// this.load_wxAppPayService();
}
/**
* 鍒濆鍖栧井淇″皬绋嬪簭
@@ -72,23 +69,5 @@
this.wxPayService = wxPayService;
}
-
-
-// /**
-// * 鍒濆鍖朅pp鏀粯
-// */
-// public void load_wxAppPayService() {
-// WxPayConfig payConfig = new WxPayConfig();
-// payConfig.setTradeType(WxPayConstants.TradeType.APP);
-// payConfig.setSignType(WxPayConstants.SignType.MD5);
-// payConfig.setAppId("");
-// payConfig.setMchId(StringUtils.trimToNull(sysDictService.getSysDictValue(SysDictEnum.WX_MINI_MchId.getCode())));
-// payConfig.setMchKey(StringUtils.trimToNull(sysDictService.getSysDictValue(SysDictEnum.WX_MINI_MchKey.getCode())));
-// payConfig.setKeyPath(StringUtils.trimToNull(sysDictService.getSysDictValue(SysDictEnum.WX_MINI_KeyPath.getCode())));
-// payConfig.setNotifyUrl(StringUtils.trimToNull(sysDictService.getSysDictValue(SysDictEnum.WX_MINI_NotifyUrl.getCode())));
-// WxPayService wxPayService = new WxPayServiceImpl();
-// wxPayService.setConfig(payConfig);
-// this.wxAppPayService = wxPayService;
-// }
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java b/server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java
index 9af9f65..bd03383 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/HomeResponse.java
@@ -41,9 +41,10 @@
@ApiModelProperty(value = "鎶奸噾鐘舵�侊細0=鏈敮浠樻娂閲戯紱1=宸叉敮浠樻娂閲戯紱")
private Integer depositStatus;
- @ApiModelProperty(value = "楠戣鐘舵�侊細2=楠戣涓紱3=宸茶繕杞︼紱锛�")
- private String rideStatus;
+ @ApiModelProperty(value = "楠戣鐘舵�侊細-1=鏈獞琛岋紱0=璇锋眰寮�閿佷腑 ;1=楠戣涓�; 2=宸茶繕杞�; 3=寮�閿佸け璐ワ紱")
+ private Integer rideStatus;
-
+ @ApiModelProperty(value = "楠戣鎯呭喌")
+ private MemberRidesResponse memberRidesResponse;
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java b/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java
new file mode 100644
index 0000000..83fc050
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesResponse.java
@@ -0,0 +1,55 @@
+package com.doumee.dao.business.web.response;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.doumee.core.annotation.excel.ExcelColumn;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2023/10/8 13:53
+ */
+@Data
+@ApiModel("楠戣璁板綍杩斿洖绫�")
+public class MemberRidesResponse {
+
+
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "楠戣寮�濮嬫椂闂�")
+ private Date rideStartTime;
+
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "楠戣缁撴潫鏃堕棿")
+ private Date rideEndTime;
+
+ @ApiModelProperty(value = "楠戣鏃堕暱")
+ private long rideTime;
+
+ @ApiModelProperty(value = "璁¤垂鏃堕暱")
+ private long duration;
+
+ @ApiModelProperty(value = "杞﹀瀷")
+ private String bikeType;
+
+ @ApiModelProperty(value = "缂栧彿")
+ private String bikeCode;
+
+ @ApiModelProperty(value = "璧锋浠�", example = "1")
+ private BigDecimal basePrice;
+
+ @ApiModelProperty(value = "璧锋浠锋椂闂�", example = "1")
+ private Integer baseTime;
+
+ @ApiModelProperty(value = "瓒呭嚭鍗曚环", example = "1")
+ private Integer unitPrice;
+
+ @ApiModelProperty(value = "瓒呭嚭鏃堕棿鍗曚綅", example = "1")
+ private Integer unitTime;
+}
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/RidesDetailResponse.java b/server/services/src/main/java/com/doumee/dao/business/web/response/RidesDetailResponse.java
new file mode 100644
index 0000000..8520aef
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/RidesDetailResponse.java
@@ -0,0 +1,33 @@
+package com.doumee.dao.business.web.response;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2023/10/8 13:53
+ */
+@Data
+@ApiModel("楠戣璁板綍璇︽儏杩斿洖绫�")
+public class RidesDetailResponse {
+
+ @ApiModelProperty(value = "棰勮娑堣垂閲戦")
+ private long amount;
+
+ @ApiModelProperty(value = "杞﹀瀷")
+ private String bikeType;
+
+ @ApiModelProperty(value = "璁¤垂鏃堕暱")
+ private long duration;
+
+ @ApiModelProperty(value = "楠戣璁板綍")
+ private List<MemberRidesResponse> memberRidesResponseList;
+}
diff --git a/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java b/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
index 05c955e..c599567 100644
--- a/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
+++ b/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
@@ -5,6 +5,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Bikes;
import com.doumee.dao.business.model.Goodsorder;
+import com.doumee.dao.business.web.response.HomeResponse;
import com.doumee.dao.business.web.response.GoodsorderDetailDTO;
import java.util.List;
@@ -102,6 +103,28 @@
/**
+ * 棣栭〉鏁版嵁
+ * @param memberId
+ * @return
+ */
+ HomeResponse getHome(String memberId);
+
+ /**
+ * 鎶奸噾鏀粯涓氬姟
+ * @param memberId
+ * @return
+ */
+ Object createGoodsOrderPay(String memberId);
+
+ /**
+ * 鎶奸噾鏀粯鍥炶皟涓氬姟
+ * @param preOrderId
+ * @return
+ */
+ String payNotify(String preOrderId,String paymentNo);
+
+
+ /**
* 鏌ヨ璁㈠崟璇︽儏
* @param id
* @return
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index 65d33fa..888b31f 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -7,13 +7,16 @@
import com.doumee.core.constants.Constants;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.Constants;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.DateUtil;
+import com.doumee.core.utils.ID;
import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.GoodsorderMapper;
+import com.doumee.core.wx.WxMiniConfig;
+import com.doumee.dao.business.*;
import com.doumee.dao.business.MemberRidesMapper;
-import com.doumee.dao.business.MemberRidesMapper;
-import com.doumee.dao.business.RefundMapper;
import com.doumee.dao.business.join.GoodsorderJoinMapper;
import com.doumee.dao.business.model.Bikes;
import com.doumee.dao.business.model.Goodsorder;
@@ -23,18 +26,29 @@
import com.doumee.dao.business.join.MemberRidesJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.web.response.GoodsorderDetailDTO;
+import com.doumee.dao.business.web.response.MemberRidesResponse;
import com.doumee.dao.business.web.response.PayOrderDTO;
import com.doumee.service.business.GoodsorderService;
+import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
+import com.github.binarywang.wxpay.bean.request.BaseWxPayRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
+import com.github.binarywang.wxpay.exception.WxPayException;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -54,6 +68,11 @@
@Autowired
private MemberRidesMapper memberRidesMapper;
+
+ @Autowired
+ private MemberMapper memberMapper;
+ @Autowired
+ private BaseParamMapper baseParamMapper;
@@ -160,6 +179,7 @@
+ @Override
public HomeResponse getHome(String memberId){
HomeResponse homeResponse = new HomeResponse();
homeResponse.setParkName(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.PROJECT_NAME).getCode());
@@ -175,19 +195,32 @@
.eq("member_id",memberId)
.eq("status",Constants.goodsorderStatus.pay));
homeResponse.setDepositStatus(status);
+ homeResponse.setRideStatus(-1);
if(homeResponse.getDepositStatus()==Constants.goodsorderStatus.pay) {
//鏌ヨ褰撳墠楠戣鐘舵��
MemberRides memberRides = memberRidesMapper.selectOne(new QueryWrapper<MemberRides>().eq("member_id", memberId)
.orderByDesc(" create_date ")
.last(" limit 1 "));
- if (Objects.isNull(memberRides)) {
-
+ if (!Objects.isNull(memberRides)) {
+ homeResponse.setRideStatus(memberRides.getStatus());
+ MemberRidesResponse memberRidesResponse = new MemberRidesResponse();
+ BaseParam baseParam = baseParamMapper.selectById(memberRides.getParamId());
+ if(!Objects.isNull(baseParam)){
+ memberRidesResponse.setBikeType(baseParam.getName());
+ }
+ memberRidesResponse.setRideStartTime(memberRides.getRentDate());
+ memberRidesResponse.setRideEndTime(memberRides.getBackDate());
+ memberRidesResponse.setRideTime(DateUtil.betweenMin(memberRidesResponse.getRideStartTime(),memberRidesResponse.getRideEndTime()));
+ memberRidesResponse.setBikeCode(memberRides.getBikeCode());
+ memberRidesResponse.setBasePrice(memberRides.getBasePrice());
+ memberRidesResponse.setBaseTime(memberRides.getBaseTime());
+ memberRidesResponse.setUnitTime(memberRidesResponse.getUnitTime());
+ memberRidesResponse.setUnitPrice(memberRidesResponse.getUnitPrice());
+ homeResponse.setMemberRidesResponse(memberRidesResponse);
}
}
return homeResponse;
}
-
-
@@ -237,4 +270,117 @@
return null;
}
+
+
+ @Override
+ public Object createGoodsOrderPay(String memberId){
+ Member member = memberMapper.selectById(memberId);
+ if(Objects.isNull(member)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鐢ㄦ埛瀵硅薄淇℃伅");
+ }
+ Goodsorder qry = new Goodsorder();
+ qry.setStatus(Constants.goodsorderStatus.pay);
+ qry.setMemberId(memberId);
+ qry.setIsdeleted(Constants.ZERO);
+ if(goodsorderMapper.selectCount(new QueryWrapper<>(qry))>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"宸叉敮浠樿繃瀹氶噾锛屾棤娉曢噸澶嶈鎿嶄綔");
+ }
+ Goodsorder goodsorder = new Goodsorder();
+ goodsorder.setId(Constants.getUUID());
+ goodsorder.setCreateDate(new Date());
+ goodsorder.setIsdeleted(Constants.ZERO);
+ goodsorder.setMemberId(memberId);
+ goodsorder.setMoney(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()));
+ goodsorder.setStatus(Constants.goodsorderStatus.waitPay);
+ goodsorder.setPreOrderid(goodsorder.getId());
+ goodsorder.setPayStatus(Constants.goodsorderPayStatus.waitPay);
+ goodsorder.setPayWay(Constants.ZERO);
+ this.goodsorderMapper.insert(goodsorder);
+ //璋冭捣鏀粯
+ try {
+ Object response = null;
+ WxPayUnifiedOrderRequest request = new WxPayUnifiedOrderRequest();
+ request.setBody("鏀粯鎶奸噾");
+ request.setAttach("createGoodsOrder");
+ request.setOutTradeNo(goodsorder.getId());
+// request.setTotalFee(BaseWxPayRequest.yuanToFen(goodsorder.getMoney().toString()));
+ request.setTotalFee(1);
+ request.setSpbillCreateIp(this.getIpAddr());
+ request.setTimeStart(DateUtil.DateToString(new Date(), "yyyyMMddHHmmss"));
+ request.setOpenid(member.getOpenid());
+ response = WxMiniConfig.wxPayService.createOrder(request);
+ return response;
+ } catch (WxPayException e) {
+ e.printStackTrace();
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),e.getMessage());
+ }
+ }
+
+ @Override
+ public String payNotify(String preOrderId,String paymentNo){
+ Goodsorder goodsorder = this.goodsorderMapper.selectById(preOrderId);
+ if(goodsorder.getStatus()==Constants.goodsorderStatus.pay){
+ return WxPayNotifyResponse.success("澶勭悊鎴愬姛!");
+ }
+ goodsorder.setOnlineOrderid(paymentNo);
+ goodsorder.setPayStatus(Constants.goodsorderPayStatus.pay);
+ goodsorder.setStatus(Constants.goodsorderStatus.pay);
+ goodsorder.setPayDate(new Date());
+ goodsorder.setEditDate(new Date());
+ goodsorderMapper.updateById(goodsorder);
+ return WxPayNotifyResponse.success("澶勭悊鎴愬姛!");
+ }
+
+
+
+ /**
+ * 寰楀埌request瀵硅薄
+ *
+ * @return
+ */
+ public HttpServletRequest getRequest() {
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ return request;
+ }
+
+ public String getIpAddr() {
+ HttpServletRequest request = this.getRequest();
+ String ipAddress = null;
+ try {
+ ipAddress = request.getHeader("x-forwarded-for");
+ if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+ ipAddress = request.getHeader("Proxy-Client-IP");
+ }
+ if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+ ipAddress = request.getHeader("WL-Proxy-Client-IP");
+ }
+ if (ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+ ipAddress = request.getRemoteAddr();
+ if (ipAddress.equals("127.0.0.1")) {
+ // 鏍规嵁缃戝崱鍙栨湰鏈洪厤缃殑IP
+ InetAddress inet = null;
+ try {
+ inet = InetAddress.getLocalHost();
+ } catch (UnknownHostException e) {
+ e.printStackTrace();
+ }
+ ipAddress = inet.getHostAddress();
+ }
+ }
+ // 瀵逛簬閫氳繃澶氫釜浠ｇ悊鐨勬儏鍐碉紝绗竴涓狪P涓哄鎴风鐪熷疄IP,澶氫釜IP鎸夌収','鍒嗗壊
+ if (ipAddress != null && ipAddress.length() > 15) { // "***.***.***.***".length()
+ // = 15
+ if (ipAddress.indexOf(",") > 0) {
+ ipAddress = ipAddress.substring(0, ipAddress.indexOf(","));
+ }
+ }
+ } catch (Exception e) {
+ ipAddress = "47.111.178.164";
+ }
+ // ipAddress = this.getRequest().getRemoteAddr();
+
+ return ipAddress;
+ }
+
+
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
index 87628f5..d5aa6e3 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -220,4 +220,6 @@
QueryWrapper<MemberRides> wrapper = new QueryWrapper<>(memberRides);
return memberRidesMapper.selectCount(wrapper);
}
+
+
}
diff --git a/server/web/src/main/java/com/doumee/api/web/PaymentCallback.java b/server/web/src/main/java/com/doumee/api/web/PaymentCallback.java
new file mode 100644
index 0000000..ebf0845
--- /dev/null
+++ b/server/web/src/main/java/com/doumee/api/web/PaymentCallback.java
@@ -0,0 +1,76 @@
+package com.doumee.api.web;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.doumee.core.wx.WxMiniConfig;
+import com.doumee.service.business.GoodsorderService;
+import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
+import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
+import com.github.binarywang.wxpay.config.WxPayConfig;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by IntelliJ IDEA.
+ * 鏀粯鍥炶皟
+ * @Author : Rk
+ * @create 2023/2/23 13:49
+ */
+@Slf4j
+@RestController
+@CrossOrigin
+public class PaymentCallback {
+
+ @Autowired
+ private GoodsorderService goodsorderService;
+
+ /**
+ * 銆愬井淇℃敮浠樸�戝紓姝ラ�氱煡
+ *
+ * @param xmlResult
+ * @return
+ */
+ @PostMapping("/api/wxPayNotify")
+ public String wxPay_notify(@RequestBody String xmlResult) {
+ log.info(xmlResult);
+ if (StringUtils.isBlank(xmlResult)) return null;
+ try {
+ WxPayOrderNotifyResult result = WxMiniConfig.wxPayService.parseOrderNotifyResult(xmlResult);
+ //鑷畾涔夎鍗曞彿
+ String outTradeNo = result.getOutTradeNo();
+ //寰俊璁㈠崟鍙�
+ String paymentNo = result.getTransactionId();
+ if ("SUCCESS".equals(result.getReturnCode())) {
+ // 鏀粯鎴愬姛
+ switch (result.getAttach()) {
+ //瀹堕暱鏀粯璁㈠崟
+ case "createGoodsOrder": {
+ goodsorderService.payNotify(outTradeNo,paymentNo);
+ break;
+ }
+ }
+ } else {
+ // 鏀粯澶辫触
+ switch (result.getAttach()) {
+ //瀹堕暱鏀粯璁㈠崟
+ case "createOrder": {
+
+ break;
+ }
+ }
+ return WxPayNotifyResponse.fail(result.getReturnMsg());
+ }
+ return WxPayNotifyResponse.success("澶勭悊鎴愬姛!");
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("寰俊鍥炶皟缁撴灉寮傚父,寮傚父鍘熷洜{}", e.getLocalizedMessage());
+ return WxPayNotifyResponse.fail(e.getMessage());
+ }
+ }
+
+
+}
--
Gitblit v1.9.3