czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

余额相关改动，创客改动，订单相关

Browse Source
This commit is contained in:
liuyingfang
2023-08-26 16:46:50 +08:00
parent 01e435f575
commit af9cc1484e
17 changed files with 125 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java
View File

@@ -557,7 +557,7 @@ public class MerchantOrderController {
merchantOrder.setTransDt(new Date());
merchantOrder.setCreateDt(new Date());
merchantOrder.setStatus("1");
merchantOrder.setEnterFee(merchantOrder.getConsumeFee());
merchantOrder.setEnterFee(merchantOrder.getConsumeFee()-(merchantOrder.getConsumeFee()*0.0038));
merchantOrder.setAisleSwitch("0");
merchantOrder.setRate(new BigDecimal("38.00"));
merchantOrder.setSettlementType(1);
@@ -577,6 +577,15 @@ public class MerchantOrderController {
}
public static void main(String[] args) {
Double a = 1000.00D;
Double s = 0.0038;
double v = a * s;
System.out.println("利率"+v);
double v1 = a - (a * s);
System.out.println("剩余"+v1);
}
/**
* 主扫会员支付
* @param memberScanPayDTO
@@ -1445,8 +1454,8 @@ public class MerchantOrderController {
}
@GetMapping("/couponList")
public Result<List<Map<String, Object>>> getCouponListByOrderNumber(String orderNumber) {
List<Map<String, Object>> couponList = merchantOrderService.getCouponList(orderNumber);
public Result<List<Map<String, Object>>> getCouponListByOrderNumber(String orderNumber,Long id) {
List<Map<String, Object>> couponList = merchantOrderService.getCouponList(orderNumber,id);
return ResultGenerator.genSuccessResult(couponList);
}

4
pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java
View File

@@ -528,13 +528,13 @@ public class UserAppController {
examineMoney = BigDecimal.ZERO;
}else {
// 累计总分润
totalAccumulateShareMoney = userAccountByUserId.getBalance();
totalAccumulateShareMoney = userAccountByUserId.getBalance().add(userAccountByUserId.getOutBalance());
//今日分润总额
totalShareMoneyToday = userAccountFlowMapper.selectSumByUserId(userId, DateUtils.getDayBegin(), DateUtils.getDayEnd());
// 可提现分润
allowCashMoney = userAccountByUserId.getBalance();
allowCashMoney = userAccountByUserId.getBalance().subtract(userAccountByUserId.getFreezeBalance());
//审核中的提现金额
examineMoney = userAccountByUserId.getFreezeBalance();

8
pluss-api-page/src/main/resources/log4j2-dev.xml
View File

@@ -52,12 +52,12 @@
<!--然后定义logger，只有定义了logger并引入的appender，appender才会生效-->
<loggers>
<!--过滤掉spring和mybatis的一些无用的DEBUG信息-->
<logger name="cn.pluss.platform.mapper" level="DEBUG"></logger>
<logger name="cn.pluss.platform.ryx" level="DEBUG"></logger>
<logger name="cn.pluss.platform.ys" level="DEBUG"></logger>
<logger name="cn.pluss.platform.mapper" level="WARN"></logger>
<logger name="cn.pluss.platform.ryx" level="WARN"></logger>
<logger name="cn.pluss.platform.ys" level="WARN"></logger>
<logger name="org.apache.http.impl.conn.PoolingHttpClientConnectionManager" level="INFO"></logger>
<root level="DEBUG">
<root level="WARN">
<appender-ref ref="Console"/>
<appender-ref ref="RollingFileInfo"/>
<appender-ref ref="RollingFileWarn"/>