提交代码

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HygfIcbcController.java

@@ -174,14 +174,21 @@ public class HygfIcbcController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @ApiOperation(httpMethod = "GET",value = "查询代扣协议",   notes = "查询代扣协议")
     @GetMapping(value = "/signQuery")
-    public ResponseModel<Object> signQuery(String busiCode){
+    public ResponseModel<Object> signQuery(@RequestParam(required = true)String busiCode){
         return ResponseHelper.buildResponse(hygfIcbcService.signQuery(busiCode));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @ApiOperation(httpMethod = "GET",value = "余额查询",   notes = "余额查询")
     @GetMapping(value = "/balanceQuery")
-    public ResponseModel<Object> balanceQuery(String mediumId){
+    public ResponseModel<Object> balanceQuery(@RequestParam(required = true)String mediumId){
         return ResponseHelper.buildResponse(hygfIcbcService.balanceQuery(mediumId));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @ApiOperation(httpMethod = "GET",value = "余额查询通过农户id",   notes = "余额查询通过农户id")
+    @GetMapping(value = "/balanceQueryById")
+    public ResponseModel<Object> balanceQueryById(@RequestParam(required = true)String id){
+        return ResponseHelper.buildResponse(hygfIcbcService.balanceQueryById(id));
+    }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/HygfIcbcServiceImpl.java

@@ -910,7 +910,7 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
         String apiUrl = serviceUrl + "/api/settlement/account/balance/V1/query";
         request.setServiceUrl(apiUrl);
         SettlementAccountBalanceQueryRequestV1.SettlementAccountBalanceQueryRequestV1Biz bizContent = new SettlementAccountBalanceQueryRequestV1.SettlementAccountBalanceQueryRequestV1Biz();
-        bizContent.setCorpNo("88888888");//合作方机构编号
+        bizContent.setCorpNo(corpNo);//合作方机构编号
         LocalDateTime today = LocalDateTime.now();
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         String formattedDate = today.format(formatter);
@@ -942,4 +942,20 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
         }
         return response;
     }
+
+    public Object balanceQueryById(String id)
+    {
+        HygfIcbcRecord hygfIcbcRecord = this.getById(id);
+        if(hygfIcbcRecord!=null)
+        {
+            SettlementAccountBalanceQueryResponseV1 response = (SettlementAccountBalanceQueryResponseV1) balanceQuery(hygfIcbcRecord.getMediumId());
+            JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(response));
+            jsonObject.put("custName",hygfIcbcRecord.getCustName());
+            jsonObject.put("mediumId",hygfIcbcRecord.getMediumId());
+            return jsonObject;
+        }else
+        {
+            return null;
+        }
+    }
 }
\ No newline at end of file