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

增加反扫分润，优化ordertest

Browse Source
This commit is contained in:
liuyingfang
2023-08-30 09:40:55 +08:00
parent b00222821a
commit 12eb6f7b5b
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -557,7 +557,13 @@ public class MerchantOrderController {
merchantOrder.setTransDt(new Date());
merchantOrder.setCreateDt(new Date());
merchantOrder.setStatus("1");
merchantOrder.setEnterFee(merchantOrder.getConsumeFee()-(merchantOrder.getConsumeFee()*0.0038));
//BigDecimal e=new BigDecimal(merchantOrder.getConsumeFee()).subtract(new BigDecimal(merchantOrder.getConsumeFee()).multiply(new BigDecimal("0.0038")).setScale(2,BigDecimal.ROUND_DOWN)).setScale(2,BigDecimal.ROUND_DOWN);
BigDecimal bigDecimal = new BigDecimal(merchantOrder.getConsumeFee()).multiply(new BigDecimal("0.0038")).setScale(2, BigDecimal.ROUND_DOWN);
BigDecimal subtract = new BigDecimal(merchantOrder.getConsumeFee()).subtract(bigDecimal);
BigDecimal bigDecimal1 = new BigDecimal(String.valueOf(merchantOrder.getConsumeFee()));
BigDecimal subtract1 = bigDecimal1.subtract(bigDecimal);
merchantOrder.setEnterFee(subtract1.doubleValue());
merchantOrder.setAisleSwitch("0");
merchantOrder.setRate(new BigDecimal("38.00"));
merchantOrder.setSettlementType(1);
@@ -578,12 +584,12 @@ 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);
BigDecimal s = new BigDecimal("0.0038");
BigDecimal a = new BigDecimal("77.77");
BigDecimal multiply = s.multiply(a).setScale(2,BigDecimal.ROUND_DOWN);
BigDecimal bigDecimal = a.subtract(multiply).setScale(2, BigDecimal.ROUND_DOWN);
System.out.println(multiply);
System.out.println(bigDecimal);
}
/**

6
pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java
View File

@@ -5,6 +5,7 @@ import cn.hutool.crypto.SecureUtil;
import cn.hutool.json.JSONUtil;
import cn.pluss.platform.IdCardService;
import cn.pluss.platform.PushService;
import cn.pluss.platform.UserMakerQuota.UserMakerQuotaService;
import cn.pluss.platform.activityConsumReturn.ActivityConsumReturnService;
import cn.pluss.platform.activityRecharge.ActivityRechargeService;
import cn.pluss.platform.api.PageInfo;
@@ -225,6 +226,8 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
@Resource
private MerchantOrderSplitService merchantOrderSplitService;
@Resource
private UserMakerQuotaService userMakerQuotaService;
@Override
@@ -1239,9 +1242,12 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
try {
merchantProfitService.createOrderProfitV2(order,"1");
log.info("【主扫支付】插入分润成功，订单号:{}",order.getOrderNumber());
//若是小微创客增加额度
userMakerQuotaService.quotaInfo(order);
}catch (Exception e){
log.error("【主扫支付】插入分润异常，订单号:{}，异常信息:{}",order.getOrderNumber(),e.getMessage());
}
this.baseMapper.updateById(order);
//添加积分记录
//TODO 添加判断是否满足条件返积分

1
pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/audit/SxfMerchantAuditServiceImpl.java
View File

@@ -232,6 +232,7 @@ public class SxfMerchantAuditServiceImpl extends BaseMerchantAuditService {
// step 1、组合请求数据
reqData.putAll(getMerchantAuditInfo(userId, merchantBaseInfo, mcs));
reqData.put("callbackUrl", ParametersUtil.domain + "/api/auditCallback/sxf");
reqData.put("specifyALiPayChannel", "2088441721243954");

2
pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java
View File

@@ -802,7 +802,7 @@ public class UserAppServiceImpl extends ServiceImpl<UserAppMapper, UserApp> impl
break;
case "4":
// 银盛
//ysAuditServiceV2.merchantAudit(userId, false);
//ysAuditServiceV2.merchantAudiRt(userId, false);
ysAuditServiceV3.merchantAuditV3(userId, false, 4);
break;
case "5":