分账100%

src/main/java/com/poteviohealth/ym/ipos/controller/app/SettlementAppController.java

@@ -52,6 +52,10 @@ public class SettlementAppController extends BaseWebController {
     @ApiOperation(value = "结算查询")
     @OperationLog(type = OperateType.SELECT, description ="结算查询")
     public VaultsResponse<SettlementQueryBack> merchantQuery(@RequestBody SettlementQueryDetail detail) {
+        String ipos = TokenContext.cureMiniUser().getIposMerchantId();
+        if(StringUtils.isEmpty(ipos)){
+            return VaultsResponse.failed("账户未激活,请联系管理员");
+        }
         return splitService.merchantSettlementQuery(detail);
     }
 
@@ -61,6 +65,10 @@ public class SettlementAppController extends BaseWebController {
     public VaultsResponse<AccountBalanceBack> accountBalanceQuery(@RequestBody StringParams params) {
 
         if(StringUtils.isEmpty(params.getId())){
+            String ipos = TokenContext.cureMiniUser().getIposMerchantId();
+            if(StringUtils.isEmpty(ipos)){
+                return VaultsResponse.failed("账户未激活,请联系管理员");
+            }
             params.setId(TokenContext.cureMiniUser().getIposMerchantId());
         }
 
@@ -99,18 +107,24 @@ public class SettlementAppController extends BaseWebController {
     @ApiOperation(value = "取现")
     @OperationLog(type = OperateType.SELECT, description ="取现")
     public VaultsResponse<WithdrawBack> withdraw(@RequestBody WithdrawDto dto) {
+        if(StringUtils.isEmpty(dto.getMerchantId())){
+            String ipos = TokenContext.cureMiniUser().getIposMerchantId();
+            if(StringUtils.isEmpty(ipos)){
+                return VaultsResponse.failed("账户未激活,请联系管理员");
+            }
+            dto.setMerchantId(TokenContext.cureMiniUser().getIposMerchantId());
+        }
         GroupLeaderParams groupLeaderParams = new GroupLeaderParams();
         groupLeaderParams.setOperatorId(TokenContext.cureOperatorId());
         groupLeaderParams.setGroupLeaderId(Integer.parseInt(TokenContext.cureMiniUser().getGroupLeaderId().toString()));
         VaultsResponse<GroupLeaderDTO>  vaultsResponse = customerFeignClient.getGroupLeaderById(groupLeaderParams);
         GroupLeaderDTO groupLeaderDTO = vaultsResponse.getData();
+
         if(groupLeaderDTO.getRemainedAmt()>=dto.getAmount()){
             DecimalFormat df = new DecimalFormat("#0.00");
             return VaultsResponse.failed("留存保证金为:"+new BigDecimal(df.format(groupLeaderDTO.getRemainedAmt() / 100.0))+"元,可提现金额不足");
         }
-        if(StringUtils.isEmpty(dto.getMerchantId())){
-            dto.setMerchantId(TokenContext.cureMiniUser().getIposMerchantId());
-        }
+
         dto.setAmount(dto.getAmount()-groupLeaderDTO.getRemainedAmt());
         return splitService.withdraw(dto);
     }
@@ -120,13 +134,23 @@ public class SettlementAppController extends BaseWebController {
     @ApiOperation(value = "取现查询")
     @OperationLog(type = OperateType.SELECT, description ="取现查询")
     public VaultsResponse<WithdrawBack> withdrawQuery(@RequestBody StringParams params) {
+            String ipos = TokenContext.cureMiniUser().getIposMerchantId();
+            if(StringUtils.isEmpty(ipos)){
+                return VaultsResponse.failed("账户未激活,请联系管理员");
+            }
         return splitService.withdrawQuery(params.getId());
     }
 
     @PostMapping("/list")
     @ApiOperation(value = "取现记录",notes = "list")
     public VaultsResponse<CommonPage<SplitWithdraw>> list(@RequestBody SplitWithdrawDto dto){
-        dto.setIposMerchantId(TokenContext.cureMiniUser().getIposMerchantId());
+        if(StringUtils.isEmpty(dto.getIposMerchantId())){
+            String ipos = TokenContext.cureMiniUser().getIposMerchantId();
+            if(StringUtils.isEmpty(ipos)){
+                return VaultsResponse.failed("账户未激活,请联系管理员");
+            }
+            dto.setIposMerchantId(TokenContext.cureMiniUser().getIposMerchantId());
+        }
         return VaultsResponse.success(splitWithdrawService.pageList(dto));
     }
 }