Skip to content

D
dc-java
Commit 09ea95f7 by huluobin
Options

# 采购

parent 84333dff
Showing with 175 additions and 84 deletions
data-base/base-sync-purchase-details/src/main/java/com/bailuntec/domain/dto/PurchaseDetailDTO.java
package com.bailuntec.domain.dto;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
@Data
public class PurchaseDetailDTO {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.purchase_id
*
......@@ -21,7 +20,6 @@ public class PurchaseDetailDTO {
private String purchaseId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.status
*
......@@ -31,7 +29,6 @@ public class PurchaseDetailDTO {
private Integer status;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.purchase_category_name
*
......@@ -41,7 +38,6 @@ public class PurchaseDetailDTO {
private String purchaseCategoryName;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.deliver_id
*
......@@ -51,7 +47,6 @@ public class PurchaseDetailDTO {
private Integer deliverId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.deliver_name
*
......@@ -64,7 +59,6 @@ public class PurchaseDetailDTO {
private Integer deliverValue;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.buyer_name
*
......@@ -74,7 +68,6 @@ public class PurchaseDetailDTO {
private String buyerName;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.warehouse_from_code
*
......@@ -84,7 +77,6 @@ public class PurchaseDetailDTO {
private String warehouseFromCode;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.warehouse_from_name
*
......@@ -94,7 +86,6 @@ public class PurchaseDetailDTO {
private String warehouseFromName;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.warehouse_into_code
*
......@@ -104,7 +95,6 @@ public class PurchaseDetailDTO {
private String warehouseIntoCode;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.warehouse_into_name
*
......@@ -114,7 +104,6 @@ public class PurchaseDetailDTO {
private String warehouseIntoName;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.bailun_sku
*
......@@ -124,7 +113,6 @@ public class PurchaseDetailDTO {
private String bailunSku;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.quantity_purchase
*
......@@ -134,7 +122,6 @@ public class PurchaseDetailDTO {
private Integer quantityPurchase;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.unit_price
*
......@@ -144,7 +131,6 @@ public class PurchaseDetailDTO {
private BigDecimal unitPrice;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.amount_paid
*
......@@ -154,7 +140,6 @@ public class PurchaseDetailDTO {
private BigDecimal amountPaid;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.currency_code
*
......@@ -164,7 +149,6 @@ public class PurchaseDetailDTO {
private String currencyCode;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.currency_name
*
......@@ -174,7 +158,6 @@ public class PurchaseDetailDTO {
private String currencyName;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.quantity_return
*
......@@ -184,7 +167,6 @@ public class PurchaseDetailDTO {
private Integer quantityReturn;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.quantity_inbound
*
......@@ -194,7 +176,6 @@ public class PurchaseDetailDTO {
private Integer quantityInbound;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.quantity_deliver
*
......@@ -204,7 +185,6 @@ public class PurchaseDetailDTO {
private Integer quantityDeliver;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.quantity_not_deliver
*
......@@ -214,7 +194,6 @@ public class PurchaseDetailDTO {
private Integer quantityNotDeliver;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.quantity_arrival
*
......@@ -224,7 +203,6 @@ public class PurchaseDetailDTO {
private Integer quantityArrival;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.quantity_not_arrival
*
......@@ -234,7 +212,6 @@ public class PurchaseDetailDTO {
private Integer quantityNotArrival;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.quantity_inspect
*
......@@ -244,7 +221,6 @@ public class PurchaseDetailDTO {
private Integer quantityInspect;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.quantity_qualified_inspect
*
......@@ -254,7 +230,6 @@ public class PurchaseDetailDTO {
private Integer quantityQualifiedInspect;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.quantity_unqualified_inspect
*
......@@ -264,7 +239,6 @@ public class PurchaseDetailDTO {
private Integer quantityUnqualifiedInspect;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.quantity_wait_transfer
*
......@@ -274,7 +248,6 @@ public class PurchaseDetailDTO {
private Integer quantityWaitTransfer;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.quantity_exchange
*
......@@ -284,7 +257,6 @@ public class PurchaseDetailDTO {
private Integer quantityExchange;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.quantity_lose_inbound
*
......@@ -294,7 +266,6 @@ public class PurchaseDetailDTO {
private Integer quantityLoseInbound;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.create_time
*
......@@ -304,7 +275,6 @@ public class PurchaseDetailDTO {
private String createTimed;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.update_time
*
......@@ -315,7 +285,6 @@ public class PurchaseDetailDTO {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.alibaba_order_id
*
......@@ -325,7 +294,6 @@ public class PurchaseDetailDTO {
private String alibabaOrderId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.logistics_order_id
*
......@@ -335,7 +303,6 @@ public class PurchaseDetailDTO {
private String logisticsOrderId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.logistics_company_name
*
......@@ -383,5 +350,10 @@ public class PurchaseDetailDTO {
@JSONField(name = "createusername")
private String createusername;
@JSONField(name = "can_7day_refund")
@JsonProperty("can_7day_refund")
private Integer can7dayRefund;
}
data-base/base-sync-purchase-details/src/main/java/com/bailuntec/job/SyncPurchaseAimsJob.java
......@@ -3,14 +3,9 @@ package com.bailuntec.job;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.bailuntec.domain.constant.CommonConstant;
import com.bailuntec.domain.dto.PurchaseDetailAimsDTO;
import com.bailuntec.domain.dto.PurchaseDetailDTO;
import com.bailuntec.domain.entity.DcBasePurchaseDetails;
import com.bailuntec.domain.entity.JobPointLog;
import com.bailuntec.domain.example.DcBasePurchaseDetailsExample;
import com.bailuntec.mapper.DcBasePurchaseDetailsMapper;
import com.bailuntec.mapper.JobPointLogMapper;
import com.bailuntec.support.PointJob;
import com.bailuntec.utils.OkHttpUtil;
import com.bailuntec.utils.PropertiesUtil;
......@@ -18,12 +13,10 @@ import com.bailuntec.utils.SessionUtil;
import com.dangdang.ddframe.job.api.ShardingContext;
import lombok.extern.slf4j.Slf4j;
import okhttp3.*;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.lang3.StringUtils;
import java.io.IOException;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.LinkedHashMap;
import java.util.List;
......
data-common/src/main/java/com/bailuntec/domain/entity/DcBasePurchaseDetails.java
package com.bailuntec.domain.entity;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
import lombok.Data;
@Data
public class DcBasePurchaseDetails {
......@@ -34,7 +31,7 @@ public class DcBasePurchaseDetails {
*
* @mbg.generated
*/
private Integer status;
private Byte status;
/**
*
......@@ -376,7 +373,7 @@ public class DcBasePurchaseDetails {
*
* @mbg.generated
*/
private Integer isallot;
private Byte isallot;
/**
*
......@@ -412,7 +409,7 @@ public class DcBasePurchaseDetails {
*
* @mbg.generated
*/
private Date lastSigntime;
private LocalDateTime lastSigntime;
/**
*
......@@ -423,18 +420,52 @@ public class DcBasePurchaseDetails {
*/
private Integer arrivalStatus;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.amount_buy
*
* @mbg.generated
*/
private BigDecimal amountBuy;
private Integer amountBuy;
private Integer amountPayed;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.amount_payed
*
* @mbg.generated
*/
private BigDecimal amountPayed;
private Integer amountExpress;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.amount_express
*
* @mbg.generated
*/
private BigDecimal amountExpress;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.createusername
*
* @mbg.generated
*/
private String createusername;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_purchase_details.can_7day_refund
*
* @mbg.generated
*/
private Integer can7dayRefund;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_purchase_details
*
......@@ -492,6 +523,11 @@ public class DcBasePurchaseDetails {
sb.append(", payStatus=").append(payStatus);
sb.append(", lastSigntime=").append(lastSigntime);
sb.append(", arrivalStatus=").append(arrivalStatus);
sb.append(", amountBuy=").append(amountBuy);
sb.append(", amountPayed=").append(amountPayed);
sb.append(", amountExpress=").append(amountExpress);
sb.append(", createusername=").append(createusername);
sb.append(", can7dayRefund=").append(can7dayRefund);
sb.append("]");
return sb.toString();
}
......@@ -559,7 +595,12 @@ public class DcBasePurchaseDetails {
&& (this.getPayType() == null ? other.getPayType() == null : this.getPayType().equals(other.getPayType()))
&& (this.getPayStatus() == null ? other.getPayStatus() == null : this.getPayStatus().equals(other.getPayStatus()))
&& (this.getLastSigntime() == null ? other.getLastSigntime() == null : this.getLastSigntime().equals(other.getLastSigntime()))
&& (this.getArrivalStatus() == null ? other.getArrivalStatus() == null : this.getArrivalStatus().equals(other.getArrivalStatus()));
&& (this.getArrivalStatus() == null ? other.getArrivalStatus() == null : this.getArrivalStatus().equals(other.getArrivalStatus()))
&& (this.getAmountBuy() == null ? other.getAmountBuy() == null : this.getAmountBuy().equals(other.getAmountBuy()))
&& (this.getAmountPayed() == null ? other.getAmountPayed() == null : this.getAmountPayed().equals(other.getAmountPayed()))
&& (this.getAmountExpress() == null ? other.getAmountExpress() == null : this.getAmountExpress().equals(other.getAmountExpress()))
&& (this.getCreateusername() == null ? other.getCreateusername() == null : this.getCreateusername().equals(other.getCreateusername()))
&& (this.getCan7dayRefund() == null ? other.getCan7dayRefund() == null : this.getCan7dayRefund().equals(other.getCan7dayRefund()));
}
/**
......@@ -618,6 +659,11 @@ public class DcBasePurchaseDetails {
result = prime * result + ((getPayStatus() == null) ? 0 : getPayStatus().hashCode());
result = prime * result + ((getLastSigntime() == null) ? 0 : getLastSigntime().hashCode());
result = prime * result + ((getArrivalStatus() == null) ? 0 : getArrivalStatus().hashCode());
result = prime * result + ((getAmountBuy() == null) ? 0 : getAmountBuy().hashCode());
result = prime * result + ((getAmountPayed() == null) ? 0 : getAmountPayed().hashCode());
result = prime * result + ((getAmountExpress() == null) ? 0 : getAmountExpress().hashCode());
result = prime * result + ((getCreateusername() == null) ? 0 : getCreateusername().hashCode());
result = prime * result + ((getCan7dayRefund() == null) ? 0 : getCan7dayRefund().hashCode());
return result;
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/mapper/DcBasePurchaseDetailsMapper.java
package com.bailuntec.mapper;
import com.bailuntec.domain.dto.PurchaseDetailAimsDTO;
import com.bailuntec.domain.entity.DcBasePurchaseDetails;
import com.bailuntec.domain.example.DcBasePurchaseDetailsExample;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface DcBasePurchaseDetailsMapper {
/**
......@@ -122,10 +120,4 @@ public interface DcBasePurchaseDetailsMapper {
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
int upsertSelective(DcBasePurchaseDetails record);
long getCount();
List<String> selectPageByGroup(@Param("pageIndex") int pageIndex, @Param("pageSize") int pageSize);
int updateByBuyNo(@Param("isaims") int isaims, @Param("purchaseId") String purchaseId);
}
\ No newline at end of file
data-common/src/main/resources/init.properties
table-name=dc_aims_transfer_warehouse_sales
table-name=dc_base_purchase_details
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