Skip to content

D
dc-java
Commit 00a9e7e1 by wutong
Options

修改同步物流头程费, 对数据不做处理.

parent 7bd825c2
Showing with 748 additions and 198 deletions
data-base/base-sync-cost-first/src/main/java/com/bailuntec/domain/pojo/CostFirstData.java
...@@ -14,9 +14,25 @@ public class CostFirstData { ...@@ -14,9 +14,25 @@ public class CostFirstData {
private Integer channelId; private Integer channelId;
@JSONField(name = "boxCode") @JSONField(name = "boxCode")
private String boxId; private String boxId;
@JSONField(name = "moneyRMB")
private BigDecimal costFirst;
@JSONField(name = "wareCode") @JSONField(name = "wareCode")
private String warehouseCode; private String warehouseCode;
private List<CostFirstSku> skus; private List<CostFirstSku> skus;
//燃油附加费
@JSONField(name = "fuelFee")
private BigDecimal costFuel;
//原始重量邮费
@JSONField(name = "weightFee")
private BigDecimal costWeight;
//清关费
@JSONField(name = "customsClearanceFee")
private BigDecimal costCustomsClearance;
//关税预付
@JSONField(name = "dutyFee")
private BigDecimal costDuty;
//报关费
@JSONField(name = "clearanceGoodsFee")
private BigDecimal costGoodsClearance;
//总费用
@JSONField(name = "totalPrices")
private BigDecimal costFirst;
} }
data-base/base-sync-cost-first/src/main/java/com/bailuntec/job/SyncCostFirstJob.java
...@@ -2,15 +2,12 @@ package com.bailuntec.job; ...@@ -2,15 +2,12 @@ package com.bailuntec.job;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.bailuntec.domain.entity.DcBaseCostFirst; import com.bailuntec.domain.entity.DcBaseCostFirst;
import com.bailuntec.domain.entity.DcBaseSku;
import com.bailuntec.domain.entity.JobPointLog; import com.bailuntec.domain.entity.JobPointLog;
import com.bailuntec.domain.example.DcBaseCostFirstExample; import com.bailuntec.domain.example.DcBaseCostFirstExample;
import com.bailuntec.domain.example.DcBaseSkuExample;
import com.bailuntec.domain.pojo.CostFirstData; import com.bailuntec.domain.pojo.CostFirstData;
import com.bailuntec.domain.pojo.CostFirstResult; import com.bailuntec.domain.pojo.CostFirstResult;
import com.bailuntec.domain.pojo.CostFirstSku; import com.bailuntec.domain.pojo.CostFirstSku;
import com.bailuntec.mapper.DcBaseCostFirstMapper; import com.bailuntec.mapper.DcBaseCostFirstMapper;
import com.bailuntec.mapper.DcBaseSkuMapper;
import com.bailuntec.mapper.JobPointLogMapper; import com.bailuntec.mapper.JobPointLogMapper;
import com.bailuntec.support.PointJob; import com.bailuntec.support.PointJob;
import com.bailuntec.utils.OkHttpUtil; import com.bailuntec.utils.OkHttpUtil;
...@@ -20,10 +17,10 @@ import com.dangdang.ddframe.job.api.ShardingContext; ...@@ -20,10 +17,10 @@ import com.dangdang.ddframe.job.api.ShardingContext;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import okhttp3.Request; import okhttp3.Request;
import okhttp3.Response; import okhttp3.Response;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.io.IOException; import java.io.IOException;
import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
...@@ -37,34 +34,34 @@ public class SyncCostFirstJob extends PointJob { ...@@ -37,34 +34,34 @@ public class SyncCostFirstJob extends PointJob {
public void executeJob(ShardingContext shardingContext, JobPointLog jobPointLog) { public void executeJob(ShardingContext shardingContext, JobPointLog jobPointLog) {
OkHttpClient client = OkHttpUtil.getInstance(); OkHttpClient client = OkHttpUtil.getInstance();
HashMap<String, String> map = new HashMap<>(); HashMap<String, String> map = new HashMap<>();
map.put("startTime",jobPointLog.getStartTime().minusMinutes(3).format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)); map.put("startTime", jobPointLog.getStartTime().minusMinutes(3).format(DateTimeFormatter.ISO_LOCAL_DATE_TIME));
map.put("endTime",jobPointLog.getEndTime().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)); map.put("endTime", jobPointLog.getEndTime().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME));
Integer totalPage = 0; Integer totalPage = 0;
do { do {
map.put("currentPage",jobPointLog.getPageIndex().toString()); map.put("currentPage", jobPointLog.getPageIndex().toString());
Request request = new Request.Builder() Request request = new Request.Builder()
.url(OkHttpUtil.attachHttpGetParams(propertiesUtil.getPropertyAsString("COST_FIRST_URL"),map)) .url(OkHttpUtil.attachHttpGetParams(propertiesUtil.getPropertyAsString("COST_FIRST_URL"), map))
.get() .get()
.addHeader("Content-Type", "application/json") .addHeader("Content-Type", "application/json")
.addHeader("cache-control", "no-cache") .addHeader("cache-control", "no-cache")
.build(); .build();
Response response = null; Response response = null;
String result; String result;
try { try {
response = client.newCall(request).execute(); response = client.newCall(request).execute();
result = response.body().string(); result = response.body().string();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
throw new RuntimeException("调用头程费接口失败", e); throw new RuntimeException("调用头程费接口失败", e);
} finally { } finally {
if (response != null) { if (response != null) {
response.close(); response.close();
} }
} }
if (StringUtils.isNotBlank(result)) { if (StringUtils.isNotBlank(result)) {
CostFirstResult costFirstResult = JSON.parseObject(result, CostFirstResult.class); CostFirstResult costFirstResult = JSON.parseObject(result, CostFirstResult.class);
totalPage = costFirstResult.getPageCount(); totalPage = costFirstResult.getPageCount();
if (costFirstResult.getData() !=null && costFirstResult.getData().size() > 0) { if (costFirstResult.getData() != null && costFirstResult.getData().size() > 0) {
handleCostFirstData(costFirstResult.getData()); handleCostFirstData(costFirstResult.getData());
} }
} else { } else {
...@@ -75,71 +72,44 @@ public class SyncCostFirstJob extends PointJob { ...@@ -75,71 +72,44 @@ public class SyncCostFirstJob extends PointJob {
JobPointLogMapper mapper = SessionUtil.getSession().getMapper(JobPointLogMapper.class); JobPointLogMapper mapper = SessionUtil.getSession().getMapper(JobPointLogMapper.class);
mapper.upsertSelective(jobPointLog); mapper.upsertSelective(jobPointLog);
} }
} while (jobPointLog.getPageIndex() <= totalPage); } while (jobPointLog.getPageIndex() <= totalPage);
jobPointLog.setPageIndex(1); jobPointLog.setPageIndex(1);
jobPointLog.setStartTime(jobPointLog.getEndTime()); jobPointLog.setStartTime(jobPointLog.getEndTime());
jobPointLog.setEndTime(jobPointLog.getStartTime().plusDays(jobPointLog.getIntervalTime().longValue()).isAfter(LocalDateTime.now()) ? LocalDateTime.now() : jobPointLog.getStartTime().plusDays(jobPointLog.getIntervalTime().longValue())); jobPointLog.setEndTime(jobPointLog.getStartTime().plusDays(jobPointLog.getIntervalTime().longValue()).isAfter(LocalDateTime.now()) ? LocalDateTime.now() : jobPointLog.getStartTime().plusDays(jobPointLog.getIntervalTime().longValue()));
} }
private void handleCostFirstData(List<CostFirstData> costFirstDataList) { private void handleCostFirstData(List<CostFirstData> costFirstDataList) {
for (CostFirstData costFirstData : costFirstDataList) { try {
DcBaseCostFirst dcBaseCostFirst = new DcBaseCostFirst(); DcBaseCostFirstMapper baseCostFirstMapper = SessionUtil.getSession().getMapper(DcBaseCostFirstMapper.class);
dcBaseCostFirst.setBoxId(costFirstData.getBoxId()); for (CostFirstData costFirstData : costFirstDataList) {
dcBaseCostFirst.setChannelId(costFirstData.getChannelId()); costFirstData.setCostDuty(costFirstData.getCostDuty().setScale(3, RoundingMode.HALF_EVEN));
dcBaseCostFirst.setChannelOrderId(costFirstData.getChannelOrderId()); costFirstData.setCostCustomsClearance(costFirstData.getCostCustomsClearance().setScale(3, RoundingMode.HALF_EVEN));
dcBaseCostFirst.setWarehouseCode(costFirstData.getWarehouseCode()); costFirstData.setCostGoodsClearance(costFirstData.getCostGoodsClearance().setScale(3, RoundingMode.HALF_EVEN));
if (costFirstData.getSkus() != null && costFirstData.getSkus().size() > 0) { costFirstData.setCostWeight(costFirstData.getCostWeight().setScale(3, RoundingMode.HALF_EVEN));
HashMap<String, BigDecimal> map = new HashMap<>(); costFirstData.setCostFuel(costFirstData.getCostFuel().setScale(3, RoundingMode.HALF_EVEN));
/* costFirstData.setCostFirst(costFirstData.getCostFirst().setScale(3, RoundingMode.HALF_EVEN));
* 先算出总重量, 再按重量占总重量平摊 DcBaseCostFirst dcBaseCostFirst = new DcBaseCostFirst();
*/ List<CostFirstSku> skus = costFirstData.getSkus();
BigDecimal totalWeight = null; if (skus != null && skus.size() > 0) {
try { for (CostFirstSku costFirstSku : skus) {
DcBaseSkuMapper dcBaseSkuMapper = SessionUtil.getSession().getMapper(DcBaseSkuMapper.class); dcBaseCostFirst.setBailunSku(costFirstSku.getBailunSku());
totalWeight = BigDecimal.ZERO; dcBaseCostFirst.setQuantity(costFirstSku.getQuantity());
for (CostFirstSku sku : costFirstData.getSkus()) { try {
DcBaseSku dcBaseSku = dcBaseSkuMapper.selectOneByExample(DcBaseSkuExample.newAndCreateCriteria().andBailunSkuEqualTo(sku.getBailunSku()).example()); BeanUtils.copyProperties(dcBaseCostFirst, costFirstData);
BigDecimal weight = dcBaseSku.getWeight().multiply(BigDecimal.valueOf(sku.getQuantity())); } catch (Exception e) {
map.put(sku.getBailunSku(), weight); throw new RuntimeException("BeanUtils.copyProperties失败, ChannelId是" + costFirstData.getChannelId());
totalWeight = totalWeight.add(weight); }
} int i = baseCostFirstMapper.updateByExampleSelective(dcBaseCostFirst, DcBaseCostFirstExample.newAndCreateCriteria().andBailunSkuEqualTo(dcBaseCostFirst.getBailunSku()).andChannelIdEqualTo(dcBaseCostFirst.getChannelId()).example());
} catch (Exception e) { if (i == 0) {
e.printStackTrace(); baseCostFirstMapper.insertSelective(dcBaseCostFirst);
throw new RuntimeException("MYBATIS操作DB查询SKU信息失败");
} finally {
SessionUtil.closeSession();
}
BigDecimal totalRatioCostFrist = BigDecimal.ZERO;
try {
DcBaseCostFirstMapper baseCostFirstMapper = SessionUtil.getSession().getMapper(DcBaseCostFirstMapper.class);
for (int i = 0; i < costFirstData.getSkus().size(); i++) {
dcBaseCostFirst.setBailunSku(costFirstData.getSkus().get(i).getBailunSku());
dcBaseCostFirst.setQuantity(costFirstData.getSkus().get(i).getQuantity());
BigDecimal weight = map.get(costFirstData.getSkus().get(i).getBailunSku());
if (totalWeight.compareTo(BigDecimal.ZERO) == 1) {
BigDecimal weightRatio = weight.divide(totalWeight, 4, RoundingMode.HALF_EVEN);
dcBaseCostFirst.setRatioWeight(weightRatio);
BigDecimal skuCostFirst = costFirstData.getCostFirst().multiply(weightRatio).setScale(3, RoundingMode.HALF_EVEN);
dcBaseCostFirst.setCostFirst(skuCostFirst);
if (i == costFirstData.getSkus().size() - 1) {
dcBaseCostFirst.setCostFirst(costFirstData.getCostFirst().subtract(totalRatioCostFrist));
}
totalRatioCostFrist = totalRatioCostFrist.add(skuCostFirst);
int i1 = baseCostFirstMapper.updateByExampleSelective(dcBaseCostFirst, DcBaseCostFirstExample.newAndCreateCriteria().andBailunSkuEqualTo(dcBaseCostFirst.getBailunSku()).andChannelIdEqualTo(dcBaseCostFirst.getChannelId()).example());
if (i1 == 0) {
baseCostFirstMapper.insertSelective(dcBaseCostFirst);
}
} else {
throw new RuntimeException("算头程费占比时SKU总重量为0, ChannelId是" + costFirstData.getChannelId());
} }
} }
} catch (RuntimeException e) {
throw new RuntimeException("MYBATIS操作DB更新插入数据失败, ChannelId是" + costFirstData.getChannelId(),e);
} finally {
} }
} }
} catch (RuntimeException e) {
throw new RuntimeException("MYBATIS操作DB更新插入数据失败",e);
} finally {
SessionUtil.closeSession();
} }
} }
} }
data-base/base-sync-cost-first/src/main/java/com/bailuntec/mapper/DcBaseCostFirstMapper.xml
...@@ -11,10 +11,15 @@ ...@@ -11,10 +11,15 @@
<result column="channel_id" jdbcType="INTEGER" property="channelId" /> <result column="channel_id" jdbcType="INTEGER" property="channelId" />
<result column="box_id" jdbcType="VARCHAR" property="boxId" /> <result column="box_id" jdbcType="VARCHAR" property="boxId" />
<result column="cost_first" jdbcType="DECIMAL" property="costFirst" /> <result column="cost_first" jdbcType="DECIMAL" property="costFirst" />
<result column="bailun_sku" jdbcType="VARCHAR" property="bailunSku" /> <result column="cost_goods_clearance" jdbcType="DECIMAL" property="costGoodsClearance" />
<result column="cost_duty" jdbcType="DECIMAL" property="costDuty" />
<result column="cost_customs_clearance" jdbcType="DECIMAL" property="costCustomsClearance" />
<result column="cost_weight" jdbcType="DECIMAL" property="costWeight" />
<result column="cost_fuel" jdbcType="DECIMAL" property="costFuel" />
<result column="warehouse_code" jdbcType="VARCHAR" property="warehouseCode" /> <result column="warehouse_code" jdbcType="VARCHAR" property="warehouseCode" />
<result column="bailun_sku" jdbcType="VARCHAR" property="bailunSku" />
<result column="quantity" jdbcType="INTEGER" property="quantity" /> <result column="quantity" jdbcType="INTEGER" property="quantity" />
<result column="ratio_weight" jdbcType="DECIMAL" property="ratioWeight" /> <result column="sku_weight" jdbcType="DECIMAL" property="skuWeight" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -87,8 +92,9 @@ ...@@ -87,8 +92,9 @@
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
id, channel_order_id, channel_id, box_id, cost_first, bailun_sku, warehouse_code, id, channel_order_id, channel_id, box_id, cost_first, cost_goods_clearance, cost_duty,
quantity, ratio_weight cost_customs_clearance, cost_weight, cost_fuel, warehouse_code, bailun_sku, quantity,
sku_weight
</sql> </sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseCostFirstExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseCostFirstExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -150,13 +156,15 @@ ...@@ -150,13 +156,15 @@
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
insert into dc_base_cost_first (id, channel_order_id, channel_id, insert into dc_base_cost_first (id, channel_order_id, channel_id,
box_id, cost_first, bailun_sku, box_id, cost_first, cost_goods_clearance,
warehouse_code, quantity, ratio_weight cost_duty, cost_customs_clearance, cost_weight,
) cost_fuel, warehouse_code, bailun_sku,
quantity, sku_weight)
values (#{id,jdbcType=INTEGER}, #{channelOrderId,jdbcType=VARCHAR}, #{channelId,jdbcType=INTEGER}, values (#{id,jdbcType=INTEGER}, #{channelOrderId,jdbcType=VARCHAR}, #{channelId,jdbcType=INTEGER},
#{boxId,jdbcType=VARCHAR}, #{costFirst,jdbcType=DECIMAL}, #{bailunSku,jdbcType=VARCHAR}, #{boxId,jdbcType=VARCHAR}, #{costFirst,jdbcType=DECIMAL}, #{costGoodsClearance,jdbcType=DECIMAL},
#{warehouseCode,jdbcType=VARCHAR}, #{quantity,jdbcType=INTEGER}, #{ratioWeight,jdbcType=DECIMAL} #{costDuty,jdbcType=DECIMAL}, #{costCustomsClearance,jdbcType=DECIMAL}, #{costWeight,jdbcType=DECIMAL},
) #{costFuel,jdbcType=DECIMAL}, #{warehouseCode,jdbcType=VARCHAR}, #{bailunSku,jdbcType=VARCHAR},
#{quantity,jdbcType=INTEGER}, #{skuWeight,jdbcType=DECIMAL})
</insert> </insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseCostFirst"> <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseCostFirst">
<!-- <!--
...@@ -180,17 +188,32 @@ ...@@ -180,17 +188,32 @@
<if test="costFirst != null"> <if test="costFirst != null">
cost_first, cost_first,
</if> </if>
<if test="bailunSku != null"> <if test="costGoodsClearance != null">
bailun_sku, cost_goods_clearance,
</if>
<if test="costDuty != null">
cost_duty,
</if>
<if test="costCustomsClearance != null">
cost_customs_clearance,
</if>
<if test="costWeight != null">
cost_weight,
</if>
<if test="costFuel != null">
cost_fuel,
</if> </if>
<if test="warehouseCode != null"> <if test="warehouseCode != null">
warehouse_code, warehouse_code,
</if> </if>
<if test="bailunSku != null">
bailun_sku,
</if>
<if test="quantity != null"> <if test="quantity != null">
quantity, quantity,
</if> </if>
<if test="ratioWeight != null"> <if test="skuWeight != null">
ratio_weight, sku_weight,
</if> </if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
...@@ -209,17 +232,32 @@ ...@@ -209,17 +232,32 @@
<if test="costFirst != null"> <if test="costFirst != null">
#{costFirst,jdbcType=DECIMAL}, #{costFirst,jdbcType=DECIMAL},
</if> </if>
<if test="bailunSku != null"> <if test="costGoodsClearance != null">
#{bailunSku,jdbcType=VARCHAR}, #{costGoodsClearance,jdbcType=DECIMAL},
</if>
<if test="costDuty != null">
#{costDuty,jdbcType=DECIMAL},
</if>
<if test="costCustomsClearance != null">
#{costCustomsClearance,jdbcType=DECIMAL},
</if>
<if test="costWeight != null">
#{costWeight,jdbcType=DECIMAL},
</if>
<if test="costFuel != null">
#{costFuel,jdbcType=DECIMAL},
</if> </if>
<if test="warehouseCode != null"> <if test="warehouseCode != null">
#{warehouseCode,jdbcType=VARCHAR}, #{warehouseCode,jdbcType=VARCHAR},
</if> </if>
<if test="bailunSku != null">
#{bailunSku,jdbcType=VARCHAR},
</if>
<if test="quantity != null"> <if test="quantity != null">
#{quantity,jdbcType=INTEGER}, #{quantity,jdbcType=INTEGER},
</if> </if>
<if test="ratioWeight != null"> <if test="skuWeight != null">
#{ratioWeight,jdbcType=DECIMAL}, #{skuWeight,jdbcType=DECIMAL},
</if> </if>
</trim> </trim>
</insert> </insert>
...@@ -255,17 +293,32 @@ ...@@ -255,17 +293,32 @@
<if test="record.costFirst != null"> <if test="record.costFirst != null">
cost_first = #{record.costFirst,jdbcType=DECIMAL}, cost_first = #{record.costFirst,jdbcType=DECIMAL},
</if> </if>
<if test="record.bailunSku != null"> <if test="record.costGoodsClearance != null">
bailun_sku = #{record.bailunSku,jdbcType=VARCHAR}, cost_goods_clearance = #{record.costGoodsClearance,jdbcType=DECIMAL},
</if>
<if test="record.costDuty != null">
cost_duty = #{record.costDuty,jdbcType=DECIMAL},
</if>
<if test="record.costCustomsClearance != null">
cost_customs_clearance = #{record.costCustomsClearance,jdbcType=DECIMAL},
</if>
<if test="record.costWeight != null">
cost_weight = #{record.costWeight,jdbcType=DECIMAL},
</if>
<if test="record.costFuel != null">
cost_fuel = #{record.costFuel,jdbcType=DECIMAL},
</if> </if>
<if test="record.warehouseCode != null"> <if test="record.warehouseCode != null">
warehouse_code = #{record.warehouseCode,jdbcType=VARCHAR}, warehouse_code = #{record.warehouseCode,jdbcType=VARCHAR},
</if> </if>
<if test="record.bailunSku != null">
bailun_sku = #{record.bailunSku,jdbcType=VARCHAR},
</if>
<if test="record.quantity != null"> <if test="record.quantity != null">
quantity = #{record.quantity,jdbcType=INTEGER}, quantity = #{record.quantity,jdbcType=INTEGER},
</if> </if>
<if test="record.ratioWeight != null"> <if test="record.skuWeight != null">
ratio_weight = #{record.ratioWeight,jdbcType=DECIMAL}, sku_weight = #{record.skuWeight,jdbcType=DECIMAL},
</if> </if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
...@@ -283,10 +336,15 @@ ...@@ -283,10 +336,15 @@
channel_id = #{record.channelId,jdbcType=INTEGER}, channel_id = #{record.channelId,jdbcType=INTEGER},
box_id = #{record.boxId,jdbcType=VARCHAR}, box_id = #{record.boxId,jdbcType=VARCHAR},
cost_first = #{record.costFirst,jdbcType=DECIMAL}, cost_first = #{record.costFirst,jdbcType=DECIMAL},
bailun_sku = #{record.bailunSku,jdbcType=VARCHAR}, cost_goods_clearance = #{record.costGoodsClearance,jdbcType=DECIMAL},
cost_duty = #{record.costDuty,jdbcType=DECIMAL},
cost_customs_clearance = #{record.costCustomsClearance,jdbcType=DECIMAL},
cost_weight = #{record.costWeight,jdbcType=DECIMAL},
cost_fuel = #{record.costFuel,jdbcType=DECIMAL},
warehouse_code = #{record.warehouseCode,jdbcType=VARCHAR}, warehouse_code = #{record.warehouseCode,jdbcType=VARCHAR},
bailun_sku = #{record.bailunSku,jdbcType=VARCHAR},
quantity = #{record.quantity,jdbcType=INTEGER}, quantity = #{record.quantity,jdbcType=INTEGER},
ratio_weight = #{record.ratioWeight,jdbcType=DECIMAL} sku_weight = #{record.skuWeight,jdbcType=DECIMAL}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -310,17 +368,32 @@ ...@@ -310,17 +368,32 @@
<if test="costFirst != null"> <if test="costFirst != null">
cost_first = #{costFirst,jdbcType=DECIMAL}, cost_first = #{costFirst,jdbcType=DECIMAL},
</if> </if>
<if test="bailunSku != null"> <if test="costGoodsClearance != null">
bailun_sku = #{bailunSku,jdbcType=VARCHAR}, cost_goods_clearance = #{costGoodsClearance,jdbcType=DECIMAL},
</if>
<if test="costDuty != null">
cost_duty = #{costDuty,jdbcType=DECIMAL},
</if>
<if test="costCustomsClearance != null">
cost_customs_clearance = #{costCustomsClearance,jdbcType=DECIMAL},
</if>
<if test="costWeight != null">
cost_weight = #{costWeight,jdbcType=DECIMAL},
</if>
<if test="costFuel != null">
cost_fuel = #{costFuel,jdbcType=DECIMAL},
</if> </if>
<if test="warehouseCode != null"> <if test="warehouseCode != null">
warehouse_code = #{warehouseCode,jdbcType=VARCHAR}, warehouse_code = #{warehouseCode,jdbcType=VARCHAR},
</if> </if>
<if test="bailunSku != null">
bailun_sku = #{bailunSku,jdbcType=VARCHAR},
</if>
<if test="quantity != null"> <if test="quantity != null">
quantity = #{quantity,jdbcType=INTEGER}, quantity = #{quantity,jdbcType=INTEGER},
</if> </if>
<if test="ratioWeight != null"> <if test="skuWeight != null">
ratio_weight = #{ratioWeight,jdbcType=DECIMAL}, sku_weight = #{skuWeight,jdbcType=DECIMAL},
</if> </if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
...@@ -335,10 +408,15 @@ ...@@ -335,10 +408,15 @@
channel_id = #{channelId,jdbcType=INTEGER}, channel_id = #{channelId,jdbcType=INTEGER},
box_id = #{boxId,jdbcType=VARCHAR}, box_id = #{boxId,jdbcType=VARCHAR},
cost_first = #{costFirst,jdbcType=DECIMAL}, cost_first = #{costFirst,jdbcType=DECIMAL},
bailun_sku = #{bailunSku,jdbcType=VARCHAR}, cost_goods_clearance = #{costGoodsClearance,jdbcType=DECIMAL},
cost_duty = #{costDuty,jdbcType=DECIMAL},
cost_customs_clearance = #{costCustomsClearance,jdbcType=DECIMAL},
cost_weight = #{costWeight,jdbcType=DECIMAL},
cost_fuel = #{costFuel,jdbcType=DECIMAL},
warehouse_code = #{warehouseCode,jdbcType=VARCHAR}, warehouse_code = #{warehouseCode,jdbcType=VARCHAR},
bailun_sku = #{bailunSku,jdbcType=VARCHAR},
quantity = #{quantity,jdbcType=INTEGER}, quantity = #{quantity,jdbcType=INTEGER},
ratio_weight = #{ratioWeight,jdbcType=DECIMAL} sku_weight = #{skuWeight,jdbcType=DECIMAL}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseCostFirst"> <insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseCostFirst">
...@@ -364,17 +442,32 @@ ...@@ -364,17 +442,32 @@
<if test="costFirst != null"> <if test="costFirst != null">
cost_first, cost_first,
</if> </if>
<if test="bailunSku != null"> <if test="costGoodsClearance != null">
bailun_sku, cost_goods_clearance,
</if>
<if test="costDuty != null">
cost_duty,
</if>
<if test="costCustomsClearance != null">
cost_customs_clearance,
</if>
<if test="costWeight != null">
cost_weight,
</if>
<if test="costFuel != null">
cost_fuel,
</if> </if>
<if test="warehouseCode != null"> <if test="warehouseCode != null">
warehouse_code, warehouse_code,
</if> </if>
<if test="bailunSku != null">
bailun_sku,
</if>
<if test="quantity != null"> <if test="quantity != null">
quantity, quantity,
</if> </if>
<if test="ratioWeight != null"> <if test="skuWeight != null">
ratio_weight, sku_weight,
</if> </if>
</trim> </trim>
values values
...@@ -394,17 +487,32 @@ ...@@ -394,17 +487,32 @@
<if test="costFirst != null"> <if test="costFirst != null">
#{costFirst,jdbcType=DECIMAL}, #{costFirst,jdbcType=DECIMAL},
</if> </if>
<if test="bailunSku != null"> <if test="costGoodsClearance != null">
#{bailunSku,jdbcType=VARCHAR}, #{costGoodsClearance,jdbcType=DECIMAL},
</if>
<if test="costDuty != null">
#{costDuty,jdbcType=DECIMAL},
</if>
<if test="costCustomsClearance != null">
#{costCustomsClearance,jdbcType=DECIMAL},
</if>
<if test="costWeight != null">
#{costWeight,jdbcType=DECIMAL},
</if>
<if test="costFuel != null">
#{costFuel,jdbcType=DECIMAL},
</if> </if>
<if test="warehouseCode != null"> <if test="warehouseCode != null">
#{warehouseCode,jdbcType=VARCHAR}, #{warehouseCode,jdbcType=VARCHAR},
</if> </if>
<if test="bailunSku != null">
#{bailunSku,jdbcType=VARCHAR},
</if>
<if test="quantity != null"> <if test="quantity != null">
#{quantity,jdbcType=INTEGER}, #{quantity,jdbcType=INTEGER},
</if> </if>
<if test="ratioWeight != null"> <if test="skuWeight != null">
#{ratioWeight,jdbcType=DECIMAL}, #{skuWeight,jdbcType=DECIMAL},
</if> </if>
</trim> </trim>
on duplicate key update on duplicate key update
...@@ -424,17 +532,32 @@ ...@@ -424,17 +532,32 @@
<if test="costFirst != null"> <if test="costFirst != null">
cost_first = #{costFirst,jdbcType=DECIMAL}, cost_first = #{costFirst,jdbcType=DECIMAL},
</if> </if>
<if test="bailunSku != null"> <if test="costGoodsClearance != null">
bailun_sku = #{bailunSku,jdbcType=VARCHAR}, cost_goods_clearance = #{costGoodsClearance,jdbcType=DECIMAL},
</if>
<if test="costDuty != null">
cost_duty = #{costDuty,jdbcType=DECIMAL},
</if>
<if test="costCustomsClearance != null">
cost_customs_clearance = #{costCustomsClearance,jdbcType=DECIMAL},
</if>
<if test="costWeight != null">
cost_weight = #{costWeight,jdbcType=DECIMAL},
</if>
<if test="costFuel != null">
cost_fuel = #{costFuel,jdbcType=DECIMAL},
</if> </if>
<if test="warehouseCode != null"> <if test="warehouseCode != null">
warehouse_code = #{warehouseCode,jdbcType=VARCHAR}, warehouse_code = #{warehouseCode,jdbcType=VARCHAR},
</if> </if>
<if test="bailunSku != null">
bailun_sku = #{bailunSku,jdbcType=VARCHAR},
</if>
<if test="quantity != null"> <if test="quantity != null">
quantity = #{quantity,jdbcType=INTEGER}, quantity = #{quantity,jdbcType=INTEGER},
</if> </if>
<if test="ratioWeight != null"> <if test="skuWeight != null">
ratio_weight = #{ratioWeight,jdbcType=DECIMAL}, sku_weight = #{skuWeight,jdbcType=DECIMAL},
</if> </if>
</trim> </trim>
</insert> </insert>
...@@ -445,23 +568,30 @@ ...@@ -445,23 +568,30 @@
@project https://github.com/itfsw/mybatis-generator-plugin @project https://github.com/itfsw/mybatis-generator-plugin
--> -->
insert into dc_base_cost_first insert into dc_base_cost_first
(id, channel_order_id, channel_id, box_id, cost_first, bailun_sku, warehouse_code, (id, channel_order_id, channel_id, box_id, cost_first, cost_goods_clearance, cost_duty,
quantity, ratio_weight) cost_customs_clearance, cost_weight, cost_fuel, warehouse_code, bailun_sku, quantity,
sku_weight)
values values
(#{id,jdbcType=INTEGER}, #{channelOrderId,jdbcType=VARCHAR}, #{channelId,jdbcType=INTEGER}, (#{id,jdbcType=INTEGER}, #{channelOrderId,jdbcType=VARCHAR}, #{channelId,jdbcType=INTEGER},
#{boxId,jdbcType=VARCHAR}, #{costFirst,jdbcType=DECIMAL}, #{bailunSku,jdbcType=VARCHAR}, #{boxId,jdbcType=VARCHAR}, #{costFirst,jdbcType=DECIMAL}, #{costGoodsClearance,jdbcType=DECIMAL},
#{warehouseCode,jdbcType=VARCHAR}, #{quantity,jdbcType=INTEGER}, #{ratioWeight,jdbcType=DECIMAL} #{costDuty,jdbcType=DECIMAL}, #{costCustomsClearance,jdbcType=DECIMAL}, #{costWeight,jdbcType=DECIMAL},
) #{costFuel,jdbcType=DECIMAL}, #{warehouseCode,jdbcType=VARCHAR}, #{bailunSku,jdbcType=VARCHAR},
#{quantity,jdbcType=INTEGER}, #{skuWeight,jdbcType=DECIMAL})
on duplicate key update on duplicate key update
id = #{id,jdbcType=INTEGER}, id = #{id,jdbcType=INTEGER},
channel_order_id = #{channelOrderId,jdbcType=VARCHAR}, channel_order_id = #{channelOrderId,jdbcType=VARCHAR},
channel_id = #{channelId,jdbcType=INTEGER}, channel_id = #{channelId,jdbcType=INTEGER},
box_id = #{boxId,jdbcType=VARCHAR}, box_id = #{boxId,jdbcType=VARCHAR},
cost_first = #{costFirst,jdbcType=DECIMAL}, cost_first = #{costFirst,jdbcType=DECIMAL},
bailun_sku = #{bailunSku,jdbcType=VARCHAR}, cost_goods_clearance = #{costGoodsClearance,jdbcType=DECIMAL},
cost_duty = #{costDuty,jdbcType=DECIMAL},
cost_customs_clearance = #{costCustomsClearance,jdbcType=DECIMAL},
cost_weight = #{costWeight,jdbcType=DECIMAL},
cost_fuel = #{costFuel,jdbcType=DECIMAL},
warehouse_code = #{warehouseCode,jdbcType=VARCHAR}, warehouse_code = #{warehouseCode,jdbcType=VARCHAR},
bailun_sku = #{bailunSku,jdbcType=VARCHAR},
quantity = #{quantity,jdbcType=INTEGER}, quantity = #{quantity,jdbcType=INTEGER},
ratio_weight = #{ratioWeight,jdbcType=DECIMAL} sku_weight = #{skuWeight,jdbcType=DECIMAL}
</insert> </insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseCostFirstExample" resultMap="BaseResultMap"> <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseCostFirstExample" resultMap="BaseResultMap">
<!-- <!--
......
data-common/src/main/java/com/bailuntec/domain/entity/DcBaseCostFirst.java
...@@ -54,11 +54,47 @@ public class DcBaseCostFirst { ...@@ -54,11 +54,47 @@ public class DcBaseCostFirst {
/** /**
* *
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_cost_first.bailun_sku * This field corresponds to the database column dc_base_cost_first.cost_goods_clearance
* *
* @mbg.generated * @mbg.generated
*/ */
private String bailunSku; private BigDecimal costGoodsClearance;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_cost_first.cost_duty
*
* @mbg.generated
*/
private BigDecimal costDuty;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_cost_first.cost_customs_clearance
*
* @mbg.generated
*/
private BigDecimal costCustomsClearance;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_cost_first.cost_weight
*
* @mbg.generated
*/
private BigDecimal costWeight;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_cost_first.cost_fuel
*
* @mbg.generated
*/
private BigDecimal costFuel;
/** /**
* *
...@@ -72,6 +108,15 @@ public class DcBaseCostFirst { ...@@ -72,6 +108,15 @@ public class DcBaseCostFirst {
/** /**
* *
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_cost_first.bailun_sku
*
* @mbg.generated
*/
private String bailunSku;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_cost_first.quantity * This field corresponds to the database column dc_base_cost_first.quantity
* *
* @mbg.generated * @mbg.generated
...@@ -81,11 +126,11 @@ public class DcBaseCostFirst { ...@@ -81,11 +126,11 @@ public class DcBaseCostFirst {
/** /**
* *
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_cost_first.ratio_weight * This field corresponds to the database column dc_base_cost_first.sku_weight
* *
* @mbg.generated * @mbg.generated
*/ */
private BigDecimal ratioWeight; private BigDecimal skuWeight;
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
...@@ -104,10 +149,15 @@ public class DcBaseCostFirst { ...@@ -104,10 +149,15 @@ public class DcBaseCostFirst {
sb.append(", channelId=").append(channelId); sb.append(", channelId=").append(channelId);
sb.append(", boxId=").append(boxId); sb.append(", boxId=").append(boxId);
sb.append(", costFirst=").append(costFirst); sb.append(", costFirst=").append(costFirst);
sb.append(", bailunSku=").append(bailunSku); sb.append(", costGoodsClearance=").append(costGoodsClearance);
sb.append(", costDuty=").append(costDuty);
sb.append(", costCustomsClearance=").append(costCustomsClearance);
sb.append(", costWeight=").append(costWeight);
sb.append(", costFuel=").append(costFuel);
sb.append(", warehouseCode=").append(warehouseCode); sb.append(", warehouseCode=").append(warehouseCode);
sb.append(", bailunSku=").append(bailunSku);
sb.append(", quantity=").append(quantity); sb.append(", quantity=").append(quantity);
sb.append(", ratioWeight=").append(ratioWeight); sb.append(", skuWeight=").append(skuWeight);
sb.append("]"); sb.append("]");
return sb.toString(); return sb.toString();
} }
...@@ -135,10 +185,15 @@ public class DcBaseCostFirst { ...@@ -135,10 +185,15 @@ public class DcBaseCostFirst {
&& (this.getChannelId() == null ? other.getChannelId() == null : this.getChannelId().equals(other.getChannelId())) && (this.getChannelId() == null ? other.getChannelId() == null : this.getChannelId().equals(other.getChannelId()))
&& (this.getBoxId() == null ? other.getBoxId() == null : this.getBoxId().equals(other.getBoxId())) && (this.getBoxId() == null ? other.getBoxId() == null : this.getBoxId().equals(other.getBoxId()))
&& (this.getCostFirst() == null ? other.getCostFirst() == null : this.getCostFirst().equals(other.getCostFirst())) && (this.getCostFirst() == null ? other.getCostFirst() == null : this.getCostFirst().equals(other.getCostFirst()))
&& (this.getBailunSku() == null ? other.getBailunSku() == null : this.getBailunSku().equals(other.getBailunSku())) && (this.getCostGoodsClearance() == null ? other.getCostGoodsClearance() == null : this.getCostGoodsClearance().equals(other.getCostGoodsClearance()))
&& (this.getCostDuty() == null ? other.getCostDuty() == null : this.getCostDuty().equals(other.getCostDuty()))
&& (this.getCostCustomsClearance() == null ? other.getCostCustomsClearance() == null : this.getCostCustomsClearance().equals(other.getCostCustomsClearance()))
&& (this.getCostWeight() == null ? other.getCostWeight() == null : this.getCostWeight().equals(other.getCostWeight()))
&& (this.getCostFuel() == null ? other.getCostFuel() == null : this.getCostFuel().equals(other.getCostFuel()))
&& (this.getWarehouseCode() == null ? other.getWarehouseCode() == null : this.getWarehouseCode().equals(other.getWarehouseCode())) && (this.getWarehouseCode() == null ? other.getWarehouseCode() == null : this.getWarehouseCode().equals(other.getWarehouseCode()))
&& (this.getBailunSku() == null ? other.getBailunSku() == null : this.getBailunSku().equals(other.getBailunSku()))
&& (this.getQuantity() == null ? other.getQuantity() == null : this.getQuantity().equals(other.getQuantity())) && (this.getQuantity() == null ? other.getQuantity() == null : this.getQuantity().equals(other.getQuantity()))
&& (this.getRatioWeight() == null ? other.getRatioWeight() == null : this.getRatioWeight().equals(other.getRatioWeight())); && (this.getSkuWeight() == null ? other.getSkuWeight() == null : this.getSkuWeight().equals(other.getSkuWeight()));
} }
/** /**
...@@ -156,10 +211,15 @@ public class DcBaseCostFirst { ...@@ -156,10 +211,15 @@ public class DcBaseCostFirst {
result = prime * result + ((getChannelId() == null) ? 0 : getChannelId().hashCode()); result = prime * result + ((getChannelId() == null) ? 0 : getChannelId().hashCode());
result = prime * result + ((getBoxId() == null) ? 0 : getBoxId().hashCode()); result = prime * result + ((getBoxId() == null) ? 0 : getBoxId().hashCode());
result = prime * result + ((getCostFirst() == null) ? 0 : getCostFirst().hashCode()); result = prime * result + ((getCostFirst() == null) ? 0 : getCostFirst().hashCode());
result = prime * result + ((getBailunSku() == null) ? 0 : getBailunSku().hashCode()); result = prime * result + ((getCostGoodsClearance() == null) ? 0 : getCostGoodsClearance().hashCode());
result = prime * result + ((getCostDuty() == null) ? 0 : getCostDuty().hashCode());
result = prime * result + ((getCostCustomsClearance() == null) ? 0 : getCostCustomsClearance().hashCode());
result = prime * result + ((getCostWeight() == null) ? 0 : getCostWeight().hashCode());
result = prime * result + ((getCostFuel() == null) ? 0 : getCostFuel().hashCode());
result = prime * result + ((getWarehouseCode() == null) ? 0 : getWarehouseCode().hashCode()); result = prime * result + ((getWarehouseCode() == null) ? 0 : getWarehouseCode().hashCode());
result = prime * result + ((getBailunSku() == null) ? 0 : getBailunSku().hashCode());
result = prime * result + ((getQuantity() == null) ? 0 : getQuantity().hashCode()); result = prime * result + ((getQuantity() == null) ? 0 : getQuantity().hashCode());
result = prime * result + ((getRatioWeight() == null) ? 0 : getRatioWeight().hashCode()); result = prime * result + ((getSkuWeight() == null) ? 0 : getSkuWeight().hashCode());
return result; return result;
} }
} }
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/entity/DcBaseCrmRefund.java
...@@ -161,6 +161,15 @@ public class DcBaseCrmRefund { ...@@ -161,6 +161,15 @@ public class DcBaseCrmRefund {
private BigDecimal amountRefundRmb; private BigDecimal amountRefundRmb;
/** /**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_crm_refund.crm_id
*
* @mbg.generated
*/
private Integer crmId;
/**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_crm_refund * This method corresponds to the database table dc_base_crm_refund
* *
...@@ -189,6 +198,7 @@ public class DcBaseCrmRefund { ...@@ -189,6 +198,7 @@ public class DcBaseCrmRefund {
sb.append(", gmtModified=").append(gmtModified); sb.append(", gmtModified=").append(gmtModified);
sb.append(", linked=").append(linked); sb.append(", linked=").append(linked);
sb.append(", amountRefundRmb=").append(amountRefundRmb); sb.append(", amountRefundRmb=").append(amountRefundRmb);
sb.append(", crmId=").append(crmId);
sb.append("]"); sb.append("]");
return sb.toString(); return sb.toString();
} }
...@@ -227,7 +237,8 @@ public class DcBaseCrmRefund { ...@@ -227,7 +237,8 @@ public class DcBaseCrmRefund {
&& (this.getGmtCreate() == null ? other.getGmtCreate() == null : this.getGmtCreate().equals(other.getGmtCreate())) && (this.getGmtCreate() == null ? other.getGmtCreate() == null : this.getGmtCreate().equals(other.getGmtCreate()))
&& (this.getGmtModified() == null ? other.getGmtModified() == null : this.getGmtModified().equals(other.getGmtModified())) && (this.getGmtModified() == null ? other.getGmtModified() == null : this.getGmtModified().equals(other.getGmtModified()))
&& (this.getLinked() == null ? other.getLinked() == null : this.getLinked().equals(other.getLinked())) && (this.getLinked() == null ? other.getLinked() == null : this.getLinked().equals(other.getLinked()))
&& (this.getAmountRefundRmb() == null ? other.getAmountRefundRmb() == null : this.getAmountRefundRmb().equals(other.getAmountRefundRmb())); && (this.getAmountRefundRmb() == null ? other.getAmountRefundRmb() == null : this.getAmountRefundRmb().equals(other.getAmountRefundRmb()))
&& (this.getCrmId() == null ? other.getCrmId() == null : this.getCrmId().equals(other.getCrmId()));
} }
/** /**
...@@ -257,6 +268,7 @@ public class DcBaseCrmRefund { ...@@ -257,6 +268,7 @@ public class DcBaseCrmRefund {
result = prime * result + ((getGmtModified() == null) ? 0 : getGmtModified().hashCode()); result = prime * result + ((getGmtModified() == null) ? 0 : getGmtModified().hashCode());
result = prime * result + ((getLinked() == null) ? 0 : getLinked().hashCode()); result = prime * result + ((getLinked() == null) ? 0 : getLinked().hashCode());
result = prime * result + ((getAmountRefundRmb() == null) ? 0 : getAmountRefundRmb().hashCode()); result = prime * result + ((getAmountRefundRmb() == null) ? 0 : getAmountRefundRmb().hashCode());
result = prime * result + ((getCrmId() == null) ? 0 : getCrmId().hashCode());
return result; return result;
} }
} }
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/example/DcBaseCostFirstExample.java
...@@ -690,73 +690,303 @@ public class DcBaseCostFirstExample { ...@@ -690,73 +690,303 @@ public class DcBaseCostFirstExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBailunSkuIsNull() { public Criteria andCostGoodsClearanceIsNull() {
addCriterion("bailun_sku is null"); addCriterion("cost_goods_clearance is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBailunSkuIsNotNull() { public Criteria andCostGoodsClearanceIsNotNull() {
addCriterion("bailun_sku is not null"); addCriterion("cost_goods_clearance is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBailunSkuEqualTo(String value) { public Criteria andCostGoodsClearanceEqualTo(BigDecimal value) {
addCriterion("bailun_sku =", value, "bailunSku"); addCriterion("cost_goods_clearance =", value, "costGoodsClearance");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBailunSkuNotEqualTo(String value) { public Criteria andCostGoodsClearanceNotEqualTo(BigDecimal value) {
addCriterion("bailun_sku <>", value, "bailunSku"); addCriterion("cost_goods_clearance <>", value, "costGoodsClearance");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBailunSkuGreaterThan(String value) { public Criteria andCostGoodsClearanceGreaterThan(BigDecimal value) {
addCriterion("bailun_sku >", value, "bailunSku"); addCriterion("cost_goods_clearance >", value, "costGoodsClearance");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBailunSkuGreaterThanOrEqualTo(String value) { public Criteria andCostGoodsClearanceGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("bailun_sku >=", value, "bailunSku"); addCriterion("cost_goods_clearance >=", value, "costGoodsClearance");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBailunSkuLessThan(String value) { public Criteria andCostGoodsClearanceLessThan(BigDecimal value) {
addCriterion("bailun_sku <", value, "bailunSku"); addCriterion("cost_goods_clearance <", value, "costGoodsClearance");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBailunSkuLessThanOrEqualTo(String value) { public Criteria andCostGoodsClearanceLessThanOrEqualTo(BigDecimal value) {
addCriterion("bailun_sku <=", value, "bailunSku"); addCriterion("cost_goods_clearance <=", value, "costGoodsClearance");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBailunSkuLike(String value) { public Criteria andCostGoodsClearanceIn(List<BigDecimal> values) {
addCriterion("bailun_sku like", value, "bailunSku"); addCriterion("cost_goods_clearance in", values, "costGoodsClearance");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBailunSkuNotLike(String value) { public Criteria andCostGoodsClearanceNotIn(List<BigDecimal> values) {
addCriterion("bailun_sku not like", value, "bailunSku"); addCriterion("cost_goods_clearance not in", values, "costGoodsClearance");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBailunSkuIn(List<String> values) { public Criteria andCostGoodsClearanceBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("bailun_sku in", values, "bailunSku"); addCriterion("cost_goods_clearance between", value1, value2, "costGoodsClearance");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBailunSkuNotIn(List<String> values) { public Criteria andCostGoodsClearanceNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("bailun_sku not in", values, "bailunSku"); addCriterion("cost_goods_clearance not between", value1, value2, "costGoodsClearance");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBailunSkuBetween(String value1, String value2) { public Criteria andCostDutyIsNull() {
addCriterion("bailun_sku between", value1, value2, "bailunSku"); addCriterion("cost_duty is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBailunSkuNotBetween(String value1, String value2) { public Criteria andCostDutyIsNotNull() {
addCriterion("bailun_sku not between", value1, value2, "bailunSku"); addCriterion("cost_duty is not null");
return (Criteria) this;
}
public Criteria andCostDutyEqualTo(BigDecimal value) {
addCriterion("cost_duty =", value, "costDuty");
return (Criteria) this;
}
public Criteria andCostDutyNotEqualTo(BigDecimal value) {
addCriterion("cost_duty <>", value, "costDuty");
return (Criteria) this;
}
public Criteria andCostDutyGreaterThan(BigDecimal value) {
addCriterion("cost_duty >", value, "costDuty");
return (Criteria) this;
}
public Criteria andCostDutyGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("cost_duty >=", value, "costDuty");
return (Criteria) this;
}
public Criteria andCostDutyLessThan(BigDecimal value) {
addCriterion("cost_duty <", value, "costDuty");
return (Criteria) this;
}
public Criteria andCostDutyLessThanOrEqualTo(BigDecimal value) {
addCriterion("cost_duty <=", value, "costDuty");
return (Criteria) this;
}
public Criteria andCostDutyIn(List<BigDecimal> values) {
addCriterion("cost_duty in", values, "costDuty");
return (Criteria) this;
}
public Criteria andCostDutyNotIn(List<BigDecimal> values) {
addCriterion("cost_duty not in", values, "costDuty");
return (Criteria) this;
}
public Criteria andCostDutyBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("cost_duty between", value1, value2, "costDuty");
return (Criteria) this;
}
public Criteria andCostDutyNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("cost_duty not between", value1, value2, "costDuty");
return (Criteria) this;
}
public Criteria andCostCustomsClearanceIsNull() {
addCriterion("cost_customs_clearance is null");
return (Criteria) this;
}
public Criteria andCostCustomsClearanceIsNotNull() {
addCriterion("cost_customs_clearance is not null");
return (Criteria) this;
}
public Criteria andCostCustomsClearanceEqualTo(BigDecimal value) {
addCriterion("cost_customs_clearance =", value, "costCustomsClearance");
return (Criteria) this;
}
public Criteria andCostCustomsClearanceNotEqualTo(BigDecimal value) {
addCriterion("cost_customs_clearance <>", value, "costCustomsClearance");
return (Criteria) this;
}
public Criteria andCostCustomsClearanceGreaterThan(BigDecimal value) {
addCriterion("cost_customs_clearance >", value, "costCustomsClearance");
return (Criteria) this;
}
public Criteria andCostCustomsClearanceGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("cost_customs_clearance >=", value, "costCustomsClearance");
return (Criteria) this;
}
public Criteria andCostCustomsClearanceLessThan(BigDecimal value) {
addCriterion("cost_customs_clearance <", value, "costCustomsClearance");
return (Criteria) this;
}
public Criteria andCostCustomsClearanceLessThanOrEqualTo(BigDecimal value) {
addCriterion("cost_customs_clearance <=", value, "costCustomsClearance");
return (Criteria) this;
}
public Criteria andCostCustomsClearanceIn(List<BigDecimal> values) {
addCriterion("cost_customs_clearance in", values, "costCustomsClearance");
return (Criteria) this;
}
public Criteria andCostCustomsClearanceNotIn(List<BigDecimal> values) {
addCriterion("cost_customs_clearance not in", values, "costCustomsClearance");
return (Criteria) this;
}
public Criteria andCostCustomsClearanceBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("cost_customs_clearance between", value1, value2, "costCustomsClearance");
return (Criteria) this;
}
public Criteria andCostCustomsClearanceNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("cost_customs_clearance not between", value1, value2, "costCustomsClearance");
return (Criteria) this;
}
public Criteria andCostWeightIsNull() {
addCriterion("cost_weight is null");
return (Criteria) this;
}
public Criteria andCostWeightIsNotNull() {
addCriterion("cost_weight is not null");
return (Criteria) this;
}
public Criteria andCostWeightEqualTo(BigDecimal value) {
addCriterion("cost_weight =", value, "costWeight");
return (Criteria) this;
}
public Criteria andCostWeightNotEqualTo(BigDecimal value) {
addCriterion("cost_weight <>", value, "costWeight");
return (Criteria) this;
}
public Criteria andCostWeightGreaterThan(BigDecimal value) {
addCriterion("cost_weight >", value, "costWeight");
return (Criteria) this;
}
public Criteria andCostWeightGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("cost_weight >=", value, "costWeight");
return (Criteria) this;
}
public Criteria andCostWeightLessThan(BigDecimal value) {
addCriterion("cost_weight <", value, "costWeight");
return (Criteria) this;
}
public Criteria andCostWeightLessThanOrEqualTo(BigDecimal value) {
addCriterion("cost_weight <=", value, "costWeight");
return (Criteria) this;
}
public Criteria andCostWeightIn(List<BigDecimal> values) {
addCriterion("cost_weight in", values, "costWeight");
return (Criteria) this;
}
public Criteria andCostWeightNotIn(List<BigDecimal> values) {
addCriterion("cost_weight not in", values, "costWeight");
return (Criteria) this;
}
public Criteria andCostWeightBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("cost_weight between", value1, value2, "costWeight");
return (Criteria) this;
}
public Criteria andCostWeightNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("cost_weight not between", value1, value2, "costWeight");
return (Criteria) this;
}
public Criteria andCostFuelIsNull() {
addCriterion("cost_fuel is null");
return (Criteria) this;
}
public Criteria andCostFuelIsNotNull() {
addCriterion("cost_fuel is not null");
return (Criteria) this;
}
public Criteria andCostFuelEqualTo(BigDecimal value) {
addCriterion("cost_fuel =", value, "costFuel");
return (Criteria) this;
}
public Criteria andCostFuelNotEqualTo(BigDecimal value) {
addCriterion("cost_fuel <>", value, "costFuel");
return (Criteria) this;
}
public Criteria andCostFuelGreaterThan(BigDecimal value) {
addCriterion("cost_fuel >", value, "costFuel");
return (Criteria) this;
}
public Criteria andCostFuelGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("cost_fuel >=", value, "costFuel");
return (Criteria) this;
}
public Criteria andCostFuelLessThan(BigDecimal value) {
addCriterion("cost_fuel <", value, "costFuel");
return (Criteria) this;
}
public Criteria andCostFuelLessThanOrEqualTo(BigDecimal value) {
addCriterion("cost_fuel <=", value, "costFuel");
return (Criteria) this;
}
public Criteria andCostFuelIn(List<BigDecimal> values) {
addCriterion("cost_fuel in", values, "costFuel");
return (Criteria) this;
}
public Criteria andCostFuelNotIn(List<BigDecimal> values) {
addCriterion("cost_fuel not in", values, "costFuel");
return (Criteria) this;
}
public Criteria andCostFuelBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("cost_fuel between", value1, value2, "costFuel");
return (Criteria) this;
}
public Criteria andCostFuelNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("cost_fuel not between", value1, value2, "costFuel");
return (Criteria) this; return (Criteria) this;
} }
...@@ -830,6 +1060,76 @@ public class DcBaseCostFirstExample { ...@@ -830,6 +1060,76 @@ public class DcBaseCostFirstExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBailunSkuIsNull() {
addCriterion("bailun_sku is null");
return (Criteria) this;
}
public Criteria andBailunSkuIsNotNull() {
addCriterion("bailun_sku is not null");
return (Criteria) this;
}
public Criteria andBailunSkuEqualTo(String value) {
addCriterion("bailun_sku =", value, "bailunSku");
return (Criteria) this;
}
public Criteria andBailunSkuNotEqualTo(String value) {
addCriterion("bailun_sku <>", value, "bailunSku");
return (Criteria) this;
}
public Criteria andBailunSkuGreaterThan(String value) {
addCriterion("bailun_sku >", value, "bailunSku");
return (Criteria) this;
}
public Criteria andBailunSkuGreaterThanOrEqualTo(String value) {
addCriterion("bailun_sku >=", value, "bailunSku");
return (Criteria) this;
}
public Criteria andBailunSkuLessThan(String value) {
addCriterion("bailun_sku <", value, "bailunSku");
return (Criteria) this;
}
public Criteria andBailunSkuLessThanOrEqualTo(String value) {
addCriterion("bailun_sku <=", value, "bailunSku");
return (Criteria) this;
}
public Criteria andBailunSkuLike(String value) {
addCriterion("bailun_sku like", value, "bailunSku");
return (Criteria) this;
}
public Criteria andBailunSkuNotLike(String value) {
addCriterion("bailun_sku not like", value, "bailunSku");
return (Criteria) this;
}
public Criteria andBailunSkuIn(List<String> values) {
addCriterion("bailun_sku in", values, "bailunSku");
return (Criteria) this;
}
public Criteria andBailunSkuNotIn(List<String> values) {
addCriterion("bailun_sku not in", values, "bailunSku");
return (Criteria) this;
}
public Criteria andBailunSkuBetween(String value1, String value2) {
addCriterion("bailun_sku between", value1, value2, "bailunSku");
return (Criteria) this;
}
public Criteria andBailunSkuNotBetween(String value1, String value2) {
addCriterion("bailun_sku not between", value1, value2, "bailunSku");
return (Criteria) this;
}
public Criteria andQuantityIsNull() { public Criteria andQuantityIsNull() {
addCriterion("quantity is null"); addCriterion("quantity is null");
return (Criteria) this; return (Criteria) this;
...@@ -890,63 +1190,63 @@ public class DcBaseCostFirstExample { ...@@ -890,63 +1190,63 @@ public class DcBaseCostFirstExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRatioWeightIsNull() { public Criteria andSkuWeightIsNull() {
addCriterion("ratio_weight is null"); addCriterion("sku_weight is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRatioWeightIsNotNull() { public Criteria andSkuWeightIsNotNull() {
addCriterion("ratio_weight is not null"); addCriterion("sku_weight is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRatioWeightEqualTo(BigDecimal value) { public Criteria andSkuWeightEqualTo(BigDecimal value) {
addCriterion("ratio_weight =", value, "ratioWeight"); addCriterion("sku_weight =", value, "skuWeight");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRatioWeightNotEqualTo(BigDecimal value) { public Criteria andSkuWeightNotEqualTo(BigDecimal value) {
addCriterion("ratio_weight <>", value, "ratioWeight"); addCriterion("sku_weight <>", value, "skuWeight");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRatioWeightGreaterThan(BigDecimal value) { public Criteria andSkuWeightGreaterThan(BigDecimal value) {
addCriterion("ratio_weight >", value, "ratioWeight"); addCriterion("sku_weight >", value, "skuWeight");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRatioWeightGreaterThanOrEqualTo(BigDecimal value) { public Criteria andSkuWeightGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("ratio_weight >=", value, "ratioWeight"); addCriterion("sku_weight >=", value, "skuWeight");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRatioWeightLessThan(BigDecimal value) { public Criteria andSkuWeightLessThan(BigDecimal value) {
addCriterion("ratio_weight <", value, "ratioWeight"); addCriterion("sku_weight <", value, "skuWeight");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRatioWeightLessThanOrEqualTo(BigDecimal value) { public Criteria andSkuWeightLessThanOrEqualTo(BigDecimal value) {
addCriterion("ratio_weight <=", value, "ratioWeight"); addCriterion("sku_weight <=", value, "skuWeight");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRatioWeightIn(List<BigDecimal> values) { public Criteria andSkuWeightIn(List<BigDecimal> values) {
addCriterion("ratio_weight in", values, "ratioWeight"); addCriterion("sku_weight in", values, "skuWeight");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRatioWeightNotIn(List<BigDecimal> values) { public Criteria andSkuWeightNotIn(List<BigDecimal> values) {
addCriterion("ratio_weight not in", values, "ratioWeight"); addCriterion("sku_weight not in", values, "skuWeight");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRatioWeightBetween(BigDecimal value1, BigDecimal value2) { public Criteria andSkuWeightBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("ratio_weight between", value1, value2, "ratioWeight"); addCriterion("sku_weight between", value1, value2, "skuWeight");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andRatioWeightNotBetween(BigDecimal value1, BigDecimal value2) { public Criteria andSkuWeightNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("ratio_weight not between", value1, value2, "ratioWeight"); addCriterion("sku_weight not between", value1, value2, "skuWeight");
return (Criteria) this; return (Criteria) this;
} }
} }
......
data-common/src/main/java/com/bailuntec/domain/example/DcBaseCrmRefundExample.java
...@@ -1460,6 +1460,66 @@ public class DcBaseCrmRefundExample { ...@@ -1460,6 +1460,66 @@ public class DcBaseCrmRefundExample {
addCriterion("amount_refund_rmb not between", value1, value2, "amountRefundRmb"); addCriterion("amount_refund_rmb not between", value1, value2, "amountRefundRmb");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCrmIdIsNull() {
addCriterion("crm_id is null");
return (Criteria) this;
}
public Criteria andCrmIdIsNotNull() {
addCriterion("crm_id is not null");
return (Criteria) this;
}
public Criteria andCrmIdEqualTo(Integer value) {
addCriterion("crm_id =", value, "crmId");
return (Criteria) this;
}
public Criteria andCrmIdNotEqualTo(Integer value) {
addCriterion("crm_id <>", value, "crmId");
return (Criteria) this;
}
public Criteria andCrmIdGreaterThan(Integer value) {
addCriterion("crm_id >", value, "crmId");
return (Criteria) this;
}
public Criteria andCrmIdGreaterThanOrEqualTo(Integer value) {
addCriterion("crm_id >=", value, "crmId");
return (Criteria) this;
}
public Criteria andCrmIdLessThan(Integer value) {
addCriterion("crm_id <", value, "crmId");
return (Criteria) this;
}
public Criteria andCrmIdLessThanOrEqualTo(Integer value) {
addCriterion("crm_id <=", value, "crmId");
return (Criteria) this;
}
public Criteria andCrmIdIn(List<Integer> values) {
addCriterion("crm_id in", values, "crmId");
return (Criteria) this;
}
public Criteria andCrmIdNotIn(List<Integer> values) {
addCriterion("crm_id not in", values, "crmId");
return (Criteria) this;
}
public Criteria andCrmIdBetween(Integer value1, Integer value2) {
addCriterion("crm_id between", value1, value2, "crmId");
return (Criteria) this;
}
public Criteria andCrmIdNotBetween(Integer value1, Integer value2) {
addCriterion("crm_id not between", value1, value2, "crmId");
return (Criteria) this;
}
} }
/** /**
......
data-common/src/main/java/com/bailuntec/domain/pojo/CommonSkuCondition.java
...@@ -87,6 +87,6 @@ public class CommonSkuCondition { ...@@ -87,6 +87,6 @@ public class CommonSkuCondition {
/// </summary> /// </summary>
private Integer isResultWare; private Integer isResultWare;
//是否上传
public Integer IsUpApi;
} }
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