浏览代码

应免税mall要求:是否含税改为字符串类型

lhm 3 年之前
父节点
当前提交
d16aa194a2

+ 3 - 3
kmall-admin/src/main/java/com/kmall/admin/haikong/dto/OrderInfoItemDTO.java

@@ -37,7 +37,7 @@ public class OrderInfoItemDTO implements Serializable {
     private Integer nums;
 
     @JsonProperty("is_tax")
-    private Boolean tax;
+    private String tax;
 
     @JsonProperty("tax_price")
     private BigDecimal taxPrice;
@@ -122,11 +122,11 @@ public class OrderInfoItemDTO implements Serializable {
         this.nums = nums;
     }
 
-    public Boolean getTax() {
+    public String getTax() {
         return tax;
     }
 
-    public void setTax(Boolean tax) {
+    public void setTax(String tax) {
         this.tax = tax;
     }
 

+ 1 - 1
kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderServiceImpl.java

@@ -2911,7 +2911,7 @@ public class OrderServiceImpl implements OrderService {
         orderInfoItemDTO.setItemcode(orderGoodsVo.getSku());
         orderInfoItemDTO.setAmount(orderGoodsVo.getActualPaymentAmount());
         orderInfoItemDTO.setNums(orderGoodsVo.getNumber());
-        orderInfoItemDTO.setTax(true);
+        orderInfoItemDTO.setTax("true");
         orderInfoItemDTO.setTaxPrice(orderGoodsVo.getTaxPrice());
         return orderInfoItemDTO;
     }