Commit b2cc5120 by liyanlin

fix

parent 2116eb0b
package com.bailuntec.api.bailuntec.purchase;
import com.bailuntec.api.bailuntec.purchase.resp.GetPurchaseSkuForDataCenterResp;
import com.bailuntec.api.bailuntec.purchase.resp.PurchaseDetailDto;
import com.bailuntec.api.bailuntec.purchase.resp.PurchaseResult;
import com.bailuntec.api.bailuntec.purchase.resp.SupplierTransactionDTO;
import com.bailuntec.api.bailuntec.purchase.resp.*;
import feign.Headers;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
......@@ -73,5 +70,9 @@ public interface PurchaseApi {
@RequestParam("endTime") LocalDate endTime,
@RequestParam("supplierName") String supplierName,
@RequestBody String nothing);
@PostMapping(value = "api/GetList_SupplierTransactionExpress")
PurchaseResult<List<LogisticsSupplierTransactionDTO>> GetSupplierTransactionExpress(@RequestParam("day") LocalDate day,
@RequestBody String nothing);
}
package com.bailuntec.api.bailuntec.purchase.resp;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDate;
/**
* @Author: li.yanlin
* @Description:
* @Date: Created in
* @Modified by:
*/
@Data
public class LogisticsSupplierTransactionDTO {
@JSONField(name = "SupplierId")
private Integer supplierId;
@JSONField(name = "SupplierName")
private String supplierName;
@JSONField(name = "PayCompanyId")
private Integer payCompanyValue;
@JSONField(name = "PayCompanyName")
private String payCompanyName;
@JSONField(name = "StartAmount")
private BigDecimal startAmount;
@JSONField(name = "EndAmount")
private BigDecimal endAmount;
@JSONField(name = "BorrowAmount")
private BigDecimal borrowAmount;
@JSONField(name = "LoanAmount")
private BigDecimal loanAmount;
@JSONField(name = "Type")
private String type;
@JSONField(name = "Day", format = "yyyy/MM/dd HH:mm:ss")
private LocalDate day;
}
......@@ -4,7 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.time.LocalDate;
/**
* @Author: li.yanlin
......@@ -45,7 +45,7 @@ public class SupplierTransactionDTO {
@JSONField(name = "EndAmount")
private BigDecimal endAmount;
@JSONField(name = "Day", format = "yyyy/MM/dd HH:mm:ss")
private Date day;
private LocalDate day;
@JSONField(name = "Types")
private Integer types;
@JSONField(name = "IsFinish")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment