Browse Source

冲红接口传入客户编码

wangli 4 years ago
parent
commit
0c901e75a0

+ 1 - 1
smart-city-platform/src/main/java/com/bz/smart_city/controller/pay/PayPrintInvoiceController.java

@@ -59,7 +59,7 @@ public class PayPrintInvoiceController {
             @ApiParam(value = "水司ID", required = false) @RequestParam(required = false) String customerId,
             @ApiParam(value = "用户编号", required = true) @RequestParam(required = true) String userCode,
             @ApiParam(value = "票据ID", required = true) @RequestParam(required = true) String invoicePrintId) {
-        ReturnPrintResultDto returnPrintResultDto = issueElectronicInvoiceService.requestPrint(siteId, customerId, "2", null, null, invoicePrintId, null);
+        ReturnPrintResultDto returnPrintResultDto = issueElectronicInvoiceService.requestPrint(siteId, customerId, "2", userCode, null, invoicePrintId, null);
         return new AjaxMessage<>(ResultStatus.OK, returnPrintResultDto);
     }
     @ApiOperation(value = "发票列表")

+ 1 - 1
smart-city-platform/src/main/resources/mapper/PayBaseCustomerandmeterrelaMapper.xml

@@ -628,7 +628,7 @@
             <if test="customerId != null">
                 and  customer.customer_id = #{customerId}
             </if>
-            <if test="accountnumber != null">
+            <if test="accountnumber != null and  accountnumber != ''">
                 and  customer.accountnumber = #{accountnumber}
             </if>
         </where>

+ 1 - 1
smart-city-platform/src/main/resources/mapper/pay/PayInvoicePrintMapper.xml

@@ -176,7 +176,7 @@
 			or a.`name` like concat('%',#{condition},'%')
 			)
 		</if>
-		order by p.print_date
+		order by p.print_date desc
 	</select>
 
 </mapper>