增加imgurl

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

@@ -55,6 +55,8 @@ public class PayfeeInvoicePrintDto {
     private String pdfUrl;
     @ApiModelProperty(value = "发票JPG路径")
     private String jpgUrl;
+    @ApiModelProperty(value = "发票JPG路径")
+    private String imgUrl;
 
 //    @ApiModelProperty(value = "作废人")
 //    private String canceledBy;

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/pay/PayFeeServiceImp.java

@@ -58,7 +58,7 @@ public class PayFeeServiceImp implements PayFeeService {
             throw new ServiceException(ResultStatus.PAYFEE_TRANSAMOUNT_BELOW_ZERO);
         }
 //        String result="";   //执行结果描述
-        String result="<br>实收金额："+String.format("%.2f",transAmount)+"元";
+        String result="实收金额："+String.format("%.2f",transAmount)+"元";
         BigDecimal fees=BigDecimal.ZERO;    //抵扣金额
         LoginUser loginUser = UserUtil.getCurrentUser();
 
@@ -220,10 +220,10 @@ public class PayFeeServiceImp implements PayFeeService {
                 }
             }
         }
-        result+="&emsp;&emsp;支付金额抵扣："+String.format("%.2f",fees)+"元";
+        result+=" 支付金额抵扣："+String.format("%.2f",fees)+"元";
         //余额充值或划扣有余额
         if(balancetype == 1 && transAmount.compareTo(BigDecimal.ZERO) == 1){
-            result+="&emsp;&emsp;余额转预存："+String.format("%.2f",transAmount)+"元";
+            result+=" 余额转预存："+String.format("%.2f",transAmount)+"元";
             //修改余额
             remaining=remaining.add(transAmount);
             //生成交易明细
@@ -233,7 +233,7 @@ public class PayFeeServiceImp implements PayFeeService {
             payTransactiondetails.setTranstypeLabel("账户转预存");
             transactiondetailsDtoList.add(payTransactiondetails);
         }else{
-            result+="&emsp;&emsp;余额找零："+String.format("%.2f", transAmount)+"元";
+            result+=" 余额找零："+String.format("%.2f", transAmount)+"元";
         }
 
         //修改预存账户
@@ -562,7 +562,7 @@ public class PayFeeServiceImp implements PayFeeService {
         payfeeResult.setPayseriesno(payseriesno);
         payfeeResult.setTransType(1);
         payfeeResult.setPayway(payway);
-        payfeeResult.setMsg("<br>充值金额："+String.format("%.2f", transAmount)+"元");
+        payfeeResult.setMsg("充值金额："+String.format("%.2f", transAmount)+"元");
         return payfeeResult;
     }
 

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

@@ -150,6 +150,7 @@
 		when p.invoice_type=2 then "红票" end) as "invoiceTypeLabel",
 		p.pdf_url as "pdfUrl",
 		p.jpg_url as "jpgUrl",
+		p.img_url as "imgUrl",
 		(select name from sc_user where id=p.create_by) as "createBy",
 		p.cancelinvoice_id as "cancelInvoiceId"
 		from pay_invoice_printed p