Commit d20c1637 by liyanlin

fix

parent b2cc5120
package com.bailuntec.api.bailuntec.mjcg; package com.bailuntec.api.bailuntec.mjcg;
import com.bailuntec.api.bailuntec.mjcg.resp.MjcgResult;
import com.bailuntec.api.bailuntec.mjcg.resp.SemiPurchaseDetailPageInfoDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import java.time.LocalDate;
/** /**
* <p> * <p>
* *
...@@ -8,5 +16,12 @@ package com.bailuntec.api.bailuntec.mjcg; ...@@ -8,5 +16,12 @@ package com.bailuntec.api.bailuntec.mjcg;
* @author robbendev * @author robbendev
* @since 2020/10/6 3:45 下午 * @since 2020/10/6 3:45 下午
*/ */
@FeignClient(name = "mjcg", url = "http://mjcg.bailuntec.com")
public interface MjcgApi { public interface MjcgApi {
@GetMapping("/api/BuyDetailList")
MjcgResult<SemiPurchaseDetailPageInfoDTO> GetBuyDetailList(@RequestParam("btime") LocalDate btime,
@RequestParam("etime") LocalDate etime,
@RequestParam("page") int page,
@RequestParam("rows") int rows);
} }
package com.bailuntec.api.bailuntec.mjcg.resp;
import lombok.Data;
/**
* @Author: li.yanlin
* @Description:
* @Date: Created in
* @Modified by:
*/
@Data
public class MjcgResult<T> {
private Boolean result;
private String msg;
private T list;
}
package com.bailuntec.api.bailuntec.mjcg.resp;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDate;
/**
* @Author: li.yanlin
* @Description:
* @Date: Created in
* @Modified by:
*/
@Data
public class SemiPurchaseDetailDTO {
@JsonProperty("buy_id")
private Integer buyId;
@JsonProperty("detail_id")
private Integer detailId;
@JsonProperty("no")
private String buyNo;
@JsonProperty("supplier_id")
private Integer supplierId;
@JsonProperty("supplier_name")
private String supplierName;
@JsonProperty("sku_code")
private String skuCode;
@JsonProperty("sku_name")
private String skuName;
@JsonProperty("warehouse_id")
private Integer warehouseId;
@JsonProperty("warehouse_name")
private String warehouseName;
@JsonProperty("ontheway_quantity")
private BigDecimal transferQuantity;
@JsonProperty("unit_price")
private BigDecimal unitPrice;
@JsonProperty("update_date_str")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDate semiUpdateDate;
@JsonProperty("sku_del_status")
private Integer skuDelStatus;
@JsonProperty("purchase_del_status")
private Integer purchaseDelStatus;
}
package com.bailuntec.api.bailuntec.mjcg.resp;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.util.List;
/**
* @Author: li.yanlin
* @Description:
* @Date: Created in
* @Modified by:
*/
@Data
public class SemiPurchaseDetailPageInfoDTO {
@JsonProperty("CurrentPage")
private Integer currentPage;
@JsonProperty("TotalPages")
private Integer totalPages;
@JsonProperty("TotalItems")
private Integer totalItems;
@JsonProperty("ItemsPerPage")
private Integer itemsPerPage;
@JsonProperty("Items")
private List<SemiPurchaseDetailDTO> items;
}
package com.bailuntec.api.bailuntec.purchase.resp; package com.bailuntec.api.bailuntec.purchase.resp;
import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -14,24 +15,25 @@ import java.time.LocalDate; ...@@ -14,24 +15,25 @@ import java.time.LocalDate;
*/ */
@Data @Data
public class LogisticsSupplierTransactionDTO { public class LogisticsSupplierTransactionDTO {
@JSONField(name = "SupplierId") @JsonProperty("SupplierId")
private Integer supplierId; private Integer supplierId;
@JSONField(name = "SupplierName") @JsonProperty("SupplierName")
private String supplierName; private String supplierName;
@JSONField(name = "PayCompanyId") @JsonProperty("PayCompanyId")
private Integer payCompanyValue; private Integer payCompanyValue;
@JSONField(name = "PayCompanyName") @JsonProperty("PayCompanyName")
private String payCompanyName; private String payCompanyName;
@JSONField(name = "StartAmount") @JsonProperty("StartAmount")
private BigDecimal startAmount; private BigDecimal startAmount;
@JSONField(name = "EndAmount") @JsonProperty("EndAmount")
private BigDecimal endAmount; private BigDecimal endAmount;
@JSONField(name = "BorrowAmount") @JsonProperty("BorrowAmount")
private BigDecimal borrowAmount; private BigDecimal borrowAmount;
@JSONField(name = "LoanAmount") @JsonProperty("LoanAmount")
private BigDecimal loanAmount; private BigDecimal loanAmount;
@JSONField(name = "Type") @JsonProperty("Type")
private String type; private String type;
@JSONField(name = "Day", format = "yyyy/MM/dd HH:mm:ss") @JsonProperty("str_Day")
@JsonFormat(pattern="yyyy-MM-dd")
private LocalDate day; private LocalDate day;
} }
package com.bailuntec.api.bailuntec.purchase.resp; package com.bailuntec.api.bailuntec.purchase.resp;
import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
/** /**
...@@ -14,10 +14,10 @@ import lombok.Data; ...@@ -14,10 +14,10 @@ import lombok.Data;
@Data @Data
public class PurchaseResult<T> { public class PurchaseResult<T> {
@JSONField(name = "IsSuccessed") @JsonProperty("IsSuccessed")
private Boolean isSuccessed; private Boolean isSuccessed;
@JSONField(name = "Message") @JsonProperty("Message")
private String message; private String message;
@JSONField(name = "Data") @JsonProperty("Data")
private T data; private T data;
} }
package com.bailuntec.api.bailuntec.purchase.resp; package com.bailuntec.api.bailuntec.purchase.resp;
import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -14,42 +15,43 @@ import java.time.LocalDate; ...@@ -14,42 +15,43 @@ import java.time.LocalDate;
*/ */
@Data @Data
public class SupplierTransactionDTO { public class SupplierTransactionDTO {
@JSONField(name = "PayCompanyId") @JsonProperty("PayCompanyId")
private Integer payCompanyValue; private Integer payCompanyValue;
@JSONField(name = "PayCompanyName") @JsonProperty("PayCompanyName")
private String payCompanyName; private String payCompanyName;
@JSONField(name = "SupplierId") @JsonProperty("SupplierId")
private Integer supplierId; private Integer supplierId;
@JSONField(name = "SupplierName") @JsonProperty("SupplierName")
private String supplierName; private String supplierName;
@JSONField(name = "ParentSupplierId") @JsonProperty("ParentSupplierId")
private Integer parentSupplierId; private Integer parentSupplierId;
@JSONField(name = "ParentSupplierName") @JsonProperty("ParentSupplierName")
private String parentSupplierName; private String parentSupplierName;
@JSONField(name = "PutinAmount") @JsonProperty("PutinAmount")
private BigDecimal puttingAmount; private BigDecimal puttingAmount;
@JSONField(name = "ExpressAmount") @JsonProperty("ExpressAmount")
private BigDecimal expressAmount; private BigDecimal expressAmount;
@JSONField(name = "PayAmount") @JsonProperty("PayAmount")
private BigDecimal payAmount; private BigDecimal payAmount;
@JSONField(name = "ReturnAmount") @JsonProperty("ReturnAmount")
private BigDecimal returnAmount; private BigDecimal returnAmount;
@JSONField(name = "ReturnExpress") @JsonProperty("ReturnExpress")
private BigDecimal returnExpress; private BigDecimal returnExpress;
@JSONField(name = "ReceviceAmount") @JsonProperty("ReceviceAmount")
private BigDecimal receiveAmount; private BigDecimal receiveAmount;
@JSONField(name = "AdjustAmount") @JsonProperty("AdjustAmount")
private BigDecimal adjustAmount; private BigDecimal adjustAmount;
@JSONField(name = "StartAmount") @JsonProperty("StartAmount")
private BigDecimal startAmount; private BigDecimal startAmount;
@JSONField(name = "EndAmount") @JsonProperty("EndAmount")
private BigDecimal endAmount; private BigDecimal endAmount;
@JSONField(name = "Day", format = "yyyy/MM/dd HH:mm:ss") @JsonProperty("str_Day")
@JsonFormat(pattern="yyyy-MM-dd")
private LocalDate day; private LocalDate day;
@JSONField(name = "Types") @JsonProperty("Types")
private Integer types; private Integer types;
@JSONField(name = "IsFinish") @JsonProperty("IsFinish")
private Integer isFinish; private Integer isFinish;
@JSONField(name = "DelayNoPayAmount") @JsonProperty("DelayNoPayAmount")
private BigDecimal delayNoPayAmount; private BigDecimal delayNoPayAmount;
} }
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