发票状态修改

smart-city-platform/src/main/java/com/bz/smart_city/commom/util/BigDecimalConvString.java

@@ -0,0 +1,23 @@
+package com.bz.smart_city.commom.util;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.JsonSerializer;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+
+/**
+ * @description
+ * @auto wangli
+ * @data 2020-08-21 15:21
+ */
+public class BigDecimalConvString extends JsonSerializer<BigDecimal> {
+
+    public void serialize(BigDecimal bigDecimal, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
+        jsonGenerator.writeString(new DecimalFormat("#0.00").format(bigDecimal));
+    }
+
+}

smart-city-platform/src/main/java/com/bz/smart_city/dao/pay/PayInvoiceParamMapper.java

@@ -16,6 +16,8 @@ import java.util.List;
  **/
 @Mapper
 public interface PayInvoiceParamMapper {
+    int insert(PayInvoiceParam payInvoiceParam);
+
     int batchInsert(@Param("list") List<PayInvoiceParam> list);
 
     int update(@Param("payInvoiceParam") PayInvoiceParam payInvoiceParam);

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

@@ -1,10 +1,13 @@
 package com.bz.smart_city.dto.pay.payfee;
 
+import com.bz.smart_city.commom.util.BigDecimalConvString;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.time.LocalDateTime;
 
@@ -36,7 +39,8 @@ public class PayfeeInvoicePrintDto {
     @ApiModelProperty(value = "开票时间")
     private LocalDateTime printDate;
     @ApiModelProperty(value = "价税合计")
-    private Double totalPrintAmount;
+    @JsonSerialize(using = BigDecimalConvString.class )
+    private BigDecimal totalPrintAmount;
     @ApiModelProperty(value = "发票状态 0:待生成 1:正常 2: 开票中(待生成) 3:已冲红 4：开票失败  5:已作废")
     private Integer state;
     @ApiModelProperty(value="发票状态")

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

@@ -138,12 +138,7 @@
 		p.print_date as "printDate",
 		p.total_print_amount as "totalPrintAmount",
 		p.state,
-		(case when p.state=0 then '待生成'
-		when p.state=1 then '正常'
-		when p.state=2 then '开票中(待生成)'
-		when p.state=3 then '已冲红'
-		when p.state=4 then '开票失败'
-		when p.state=5 then '已作废' end)
+		(select label from pay_sys_dict where type='发票状态' and `value`=p.state  and site_id=p.site_id and customer_id=p.customer_id)
 		as "stateLabel",
 		p.invoice_type as "invoiceType",
 		(case when p.invoice_type=1 then "蓝票"
@@ -181,7 +176,7 @@
 			or a.`name` like concat('%',#{condition},'%')
 			)
 		</if>
-
+		order by p.print_date
 	</select>
 
 </mapper>