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

Merge branch 'adapay' into dev

Browse Source 
# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
This commit is contained in:
autumn.g@foxmail.com
2023-08-14 11:31:03 +08:00
parent 4edaef6661 0382fe1edd
commit 1acf05432f
15 changed files with 719 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -269,7 +269,7 @@ public class PayController extends BaseController {
}
/**
* 汇付支付退款/用户余额退款/汇付余额退款
* 汇付支付退款/汇付支付余额退款/用户余额退款
* https://api.jsowellcloud.com/uniapp/pay/refundBalance
*/
@PostMapping("/refundBalance")

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

@@ -107,6 +107,9 @@ public class OrderService {
@Autowired
private ClearingWithdrawInfoService clearingWithdrawInfoService;
@Autowired
private MemberAdapayRecordService memberAdapayRecordService;
/**
* 生成订单
*
@@ -136,8 +139,7 @@ public class OrderService {
* @param dto
*/
public Map<String, Object> payOrder(PayOrderDTO dto) throws Exception {
Map<String, Object> resultMap = orderBasicInfoService.payOrder(dto);
return resultMap;
return orderBasicInfoService.payOrder(dto);
}
/**
@@ -1009,6 +1011,18 @@ public class OrderService {
dto.setUpdatePrincipalBalance(amount);
memberBasicInfoService.updateMemberBalance(dto);
}
// 保存MemberAdapayRecord
MemberAdapayRecord memberAdapayRecord = new MemberAdapayRecord();
memberAdapayRecord.setMemberId(memberId);
memberAdapayRecord.setPaymentId(adapayCallbackRecord.getPaymentId());
memberAdapayRecord.setPaymentOrderNo(adapayCallbackRecord.getOutTransId());
memberAdapayRecord.setScenarioType(ScenarioEnum.BALANCE.getValue());
memberAdapayRecord.setPayAmt(amount);
memberAdapayRecord.setRefundAmt(BigDecimal.ZERO);
memberAdapayRecord.setSpendAmt(BigDecimal.ZERO);
memberAdapayRecord.setBalanceAmt(amount);
memberAdapayRecordService.insertSelective(memberAdapayRecord);
}
/**

9
jsowell-admin/src/test/java/SpringBootTestController.java
View File

@@ -43,6 +43,7 @@ import com.jsowell.pile.mapper.PileBillingTemplateMapper;
import com.jsowell.pile.service.*;
import com.jsowell.pile.vo.base.PileInfoVO;
import com.jsowell.pile.vo.uniapp.MemberVO;
import com.jsowell.pile.vo.web.BalanceDeductionAmountVO;
import com.jsowell.pile.vo.web.BillingTemplateVO;
import com.jsowell.pile.vo.web.OrderListVO;
import com.jsowell.pile.vo.web.PileDetailVO;
@@ -192,6 +193,14 @@ public class SpringBootTestController {
@Autowired
private OrderPileOccupyService orderPileOccupyService;
@Test
public void testCalculateTheBalanceDeductionAmount() {
String memberId = "123456";
BigDecimal amount = new BigDecimal("99.9");
List<BalanceDeductionAmountVO> list = orderBasicInfoService.calculateTheBalanceDeductionAmount(memberId, amount);
System.out.println(JSON.toJSONString(list));
}
@Test
public void testGenerateOccupyPileOrder() {
String memberId = "67569684";