客户详情返回客户id

smart-city-platform/src/main/java/com/bz/smart_city/controller/pay/PayFeeController.java

@@ -92,7 +92,7 @@ public class PayFeeController {
     @ApiOperation(value="收费界面查询客户信息，客户id是在查询出多用户时，选择某个用户")
     public AjaxMessage<List<PayfeeAccountInfoDto>> findPayfeeAccountInfo(
             @ApiParam(value = "开户id,查询多用户时，再次查询用id查询") @RequestParam(required = false)BigInteger id,
-            @ApiParam(value = "查询内容") @RequestParam(required = false)String condition ){
+            @ApiParam(value = "查询内容,户编、户名、手机、地址") @RequestParam(required = false)String condition ){
 
         return new AjaxMessage<List<PayfeeAccountInfoDto>>(ResultStatus.OK, payFeeService.findPayfeeAccountInfo(id , condition ));
     }

smart-city-platform/src/main/java/com/bz/smart_city/controller/pay/PayInvoiceController.java

@@ -38,8 +38,8 @@ public class PayInvoiceController {
     @GetMapping("/getPrintInfoListPage")
     @ApiOperation("查询收据")
     public AjaxMessage<Pagination<PayInvoiceDto>> getPrintInfoListPage(
-            @ApiParam(value = "查询条件", required = false) @RequestParam(required = false) String condition,
-            @ApiParam(value = "收据状态", required = false) @RequestParam(required = false) Integer state,
+            @ApiParam(value = "查询条件，户编、户名、流水号", required = false) @RequestParam(required = false) String condition,
+            @ApiParam(value = "收据状态，2已使用 3作废", required = false) @RequestParam(required = false) Integer state,
             @ApiParam(value = "开票时间开始 yyyyMMddHHmmss", required = false) @RequestParam(required = false) String startTime,
             @ApiParam(value = "开票时间结束 yyyyMMddHHmmss", required = false) @RequestParam(required = false) String endTime,
             @ApiParam(value = "页数,非必传，默认第一页", required = false, defaultValue = "1") @RequestParam(required = false, defaultValue = "1") int pageNum,
@@ -65,7 +65,7 @@ public class PayInvoiceController {
     public AjaxMessage< PrintInvoiceData> getPrintData(
             @ApiParam(value = "缴费批次号", required = true) @RequestParam(required = true) String payseriesno,
             @ApiParam(value = "交易类型，实收打印时为空", required = false) @RequestParam(required = false) Integer transType,
-            @ApiParam(value = "支付方式", required = true) @RequestParam(required = true) Integer payway ) {
+            @ApiParam(value = "支付方式，查询返回信息的payway", required = true) @RequestParam(required = true) Integer payway ) {
         if(transType !=null && transType==1 && payway == 4){	//单纯充值
             return  new AjaxMessage<>(ResultStatus.OK,payinvoiceService.getPrintDataOfTrans(payseriesno));
 
@@ -108,8 +108,4 @@ public class PayInvoiceController {
         payinvoiceService.cancelPrintInfo(id);
         return new AjaxMessage<>(ResultStatus.OK);
     }
-
-    public static void main(String[] args) {
-        System.out.println(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS").format(LocalDateTime.now())+""+(int)(Math.random()*1000));
-    }
 }

smart-city-platform/src/main/java/com/bz/smart_city/dto/pay/PayBaseAccountSelectAccountnumberDto.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.util.List;
 
 /**
@@ -13,6 +14,8 @@ import java.util.List;
 @Data
 @ApiModel(value = "开户管理-客户信息-按客户编号查询")
 public class PayBaseAccountSelectAccountnumberDto {
+    @ApiModelProperty(example = "0",notes = "客户id")
+    private BigInteger accountId	;
     @ApiModelProperty(example = "1",notes = "客户编号")
     private String	accountnumber	;
     @ApiModelProperty(example = "1",notes = "客户名称")

smart-city-platform/src/main/resources/mapper/pay/PayBaseAccountMapper.xml

@@ -343,7 +343,8 @@
             pba.name,
             pba.telephone,
             pba.idcardno,
-            pba.address
+            pba.address,
+            pba.id as "accountId"
         from pay_base_account pba
         left join pay_sys_dict psd on pba.idtype=psd.`value` and psd.type='证件类型' and psd.site_id=#{siteId} and psd.customer_id=#{customerId}
         left join pay_pay_rechargeaccount ppr on pba.accountnumber=ppr.accountnumber and ppr.site_id=#{siteId} and ppr.customer_id=#{customerId}