autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-22 03:55:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Lemon
2023-07-27 16:45:25 +08:00
parent dfe027a7f2 36aa58bd6b
commit f062841473
6 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
View File

@@ -18,7 +18,7 @@ import com.jsowell.pile.dto.WeixinPayDTO;
import com.jsowell.pile.vo.uniapp.PayModeVO;
import com.jsowell.service.MemberService;
import com.jsowell.service.OrderService;
import com.jsowell.pile.dto.WeChatRefundDTO;
import com.jsowell.pile.dto.ApplyRefundDTO;
import com.jsowell.wxpay.response.WechatPayNotifyParameter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -239,7 +239,7 @@ public class PayController extends BaseController {
* https://api.jsowellcloud.com/uniapp/pay/refund
*/
@PostMapping("/refund")
public RestApiResponse<?> weChatRefund(HttpServletRequest request, @RequestBody WeChatRefundDTO dto) {
public RestApiResponse<?> weChatRefund(HttpServletRequest request, @RequestBody ApplyRefundDTO dto) {
RestApiResponse<?> response;
try {
if (dto.getRefundAmount() == null) {
@@ -269,7 +269,7 @@ public class PayController extends BaseController {
* https://api.jsowellcloud.com/uniapp/pay/adapayRefund
*/
@PostMapping("/adapayRefund")
public RestApiResponse<?> adapayRefund(HttpServletRequest request, @RequestBody WeChatRefundDTO dto) {
public RestApiResponse<?> adapayRefund(HttpServletRequest request, @RequestBody ApplyRefundDTO dto) {
RestApiResponse<?> response;
try {
if (dto.getRefundAmount() == null) {

6
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -40,7 +40,7 @@ import com.jsowell.pile.vo.web.OrderDetailInfoVO;
import com.jsowell.pile.vo.web.PileStationVO;
import com.jsowell.pile.vo.web.PlatformTesterVO;
import com.jsowell.pile.vo.web.UpdateMemberBalanceDTO;
import com.jsowell.pile.dto.WeChatRefundDTO;
import com.jsowell.pile.dto.ApplyRefundDTO;
import com.jsowell.wxpay.response.WechatPayNotifyParameter;
import org.apache.commons.collections4.CollectionUtils;
import org.slf4j.Logger;
@@ -335,7 +335,7 @@ public class OrderService {
* 微信退款
* @param dto
*/
public void weChatRefund(WeChatRefundDTO dto) {
public void weChatRefund(ApplyRefundDTO dto) {
log.info("微信退款接口 param:{}", JSONObject.toJSONString(dto));
orderBasicInfoService.weChatRefund(dto);
}
@@ -344,7 +344,7 @@ public class OrderService {
* 汇付退款
* @param dto
*/
public void adapayRefund(WeChatRefundDTO dto) {
public void adapayRefund(ApplyRefundDTO dto) {
log.info("汇付退款 param:{}", JSON.toJSONString(dto));
// 退款有两种情况 1-订单结算退款 2-用户余额退款
String refundType = dto.getRefundType();