Skip to content

D
dc-java
Commit 20c78c0b by wutong
Options

修复了订单预收费异常问题, 新增普货货值计算.

parent ae675d0d
Showing with 264 additions and 172 deletions
data-base/base-sync-oms-order/src/main/java/com/bailuntec/job/OrderSyncJob.java
......@@ -171,19 +171,6 @@ public class OrderSyncJob extends PointJob {
break;
}
}
try {
DcBaseOmsHandleMapper mapper = SessionUtil.getSession().getMapper(DcBaseOmsHandleMapper.class);
DcBaseOmsHandle orderBailunCatagory = mapper.getOrderBailunCatagory(bailunSkuObj.getBailunSku());
bailunSkuStructure.setGeneralCargo(true);
if (orderBailunCatagory != null) {//如果没有在这个表, 说明是普货类, 在这个表, 就是美容自产
bailunSkuStructure.setGeneralCargo(false);
}
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("MYBATIS操作DB失败", e);
} finally {
SessionUtil.closeSession();
}
bailunSkuStructure.setBailunSku(bailunSkuObj.getBailunSku());
bailunSkuStructure.setBailunSkuUnitPrice((bailunSkuObj.getBailunSkuUnitPrice() != null && bailunSkuObj.getBailunSkuUnitPrice().getAmount() != null) ? bailunSkuObj.getBailunSkuUnitPrice().getAmount() : BigDecimal.ZERO);
bailunSkuStructure.setBailunSkuWeight(bailunSkuObj.getBailunSkuWeight() != null ? bailunSkuObj.getBailunSkuWeight() : BigDecimal.ZERO);
......@@ -199,7 +186,7 @@ public class OrderSyncJob extends PointJob {
/*
* dc_base_oms_sku字段赋值, 给初始值是为了避免nullPoint
*/
assignmentSkuInfo(omsResult, dcBaseOmsOrder, dcBaseOmsSku, bailunSkuObj, dcBaseWarehouse, logisticsHashMap);
assignmentSkuInfo(omsResult, dcBaseOmsOrder, dcBaseOmsSku, bailunSkuObj, dcBaseWarehouse, logisticsHashMap,bailunSkuStructure);
if (PlatformType.FBA.value().equals(omsResult.getPlatformType().toUpperCase())) {
//FBA费用
BigDecimal skuCostFbaFee = bailunSkuStructure.getSkuWeightRatio().multiply(dcBaseOmsOrder.getCostFbaFee()).setScale(5, RoundingMode.HALF_EVEN);
......@@ -248,6 +235,7 @@ public class OrderSyncJob extends PointJob {
BigDecimal totalAmountPrepaid = BigDecimal.ZERO;
BigDecimal totalProfit = BigDecimal.ZERO;
BigDecimal totalSkuCostLogistics = BigDecimal.ZERO;
BigDecimal totalAmountGeneralCargo = BigDecimal.ZERO;//货值= 售价-物流-平台费, 只有普货才算货值, 不发货也算货值
try {
DcBaseOmsSkuMapper omsSkuMapper = SessionUtil.getSession().getMapper(DcBaseOmsSkuMapper.class);
if (bailunSkuInfoMap.size() > 0) {
......@@ -268,6 +256,7 @@ public class OrderSyncJob extends PointJob {
BigDecimal skuAmountRefund = bailunSkuStructure.getSkuCostRatio().multiply(dcBaseOmsOrder.getAmountRefund()).setScale(5, RoundingMode.HALF_EVEN);
//SKU商品收入
BigDecimal skuAmountProduct = bailunSkuStructure.getSkuCostRatio().multiply(dcBaseOmsOrder.getAmountProduct()).setScale(5, RoundingMode.HALF_EVEN);
BigDecimal skuAmountProductRMB = bailunSkuStructure.getSkuCostRatio().multiply(dcBaseOmsOrder.getAmountProduct()).multiply(dcBaseOmsOrder.getSellerOrderExchangeRate()).setScale(5, RoundingMode.HALF_EVEN);
//SKU礼品包装收入
BigDecimal skuGiftAmountFee = bailunSkuStructure.getSkuCostRatio().multiply(dcBaseOmsOrder.getAmountGiftWrap()).setScale(5, RoundingMode.HALF_EVEN);
//SKU调整收入
......@@ -315,7 +304,14 @@ public class OrderSyncJob extends PointJob {
BigDecimal quantityOrderdDecimal = BigDecimal.valueOf(bailunSkuStructure.getSkuQuantityOrderd());
BigDecimal bailunSkuQuantityShippedDecimal = BigDecimal.valueOf(dcBaseOmsSku.getBailunSkuQuantityShipped());
BigDecimal rmbCost = BigDecimal.ZERO;
BigDecimal skuAmountGeneralCargo = BigDecimal.ZERO;
//货值= 售价-物流-平台费,只有普货才算货值, 不发货也算货值-- 这里放单个SKU的货值
if (bailunSkuStructure.getGeneralCargo()) {
skuAmountGeneralCargo = skuAmountProductRMB.subtract(skuCostLogistics).subtract(skuCostPlatformFeeRMB);
totalAmountGeneralCargo = totalAmountGeneralCargo.add(skuAmountGeneralCargo);
}
if (quantityOrderdDecimal.compareTo(BigDecimal.ZERO) == 1) {
dcBaseOmsSku.setAmountGeneralCargo(skuAmountGeneralCargo.divide(quantityOrderdDecimal, 5, RoundingMode.HALF_EVEN));
dcBaseOmsSku.setCostLogistics(bailunSkuQuantityShippedDecimal.compareTo(BigDecimal.ZERO) == 1? skuCostLogistics.divide(bailunSkuQuantityShippedDecimal, 5, RoundingMode.HALF_EVEN) : BigDecimal.ZERO);
dcBaseOmsSku.setAmountTotal(skuAmountTotal.divide(quantityOrderdDecimal, 5, RoundingMode.HALF_EVEN));
dcBaseOmsSku.setAmountProduct(skuAmountProduct.divide(quantityOrderdDecimal, 5, RoundingMode.HALF_EVEN));
......@@ -333,6 +329,7 @@ public class OrderSyncJob extends PointJob {
dcBaseOmsSku.setAmountSales(skuAmountSales.subtract(skuCostPromotion).divide(quantityOrderdDecimal, 5, RoundingMode.HALF_EVEN));
dcBaseOmsSku.setAmountShipping(skuAmountShipping.divide(quantityOrderdDecimal, 5, RoundingMode.HALF_EVEN));
dcBaseOmsSku.setAmountRefund(skuAmountRefund.divide(quantityOrderdDecimal, 5, RoundingMode.HALF_EVEN));
//单个SKU的销售额
unitSkuAmountSalesRMB = skuAmountSalesRMB.divide(quantityOrderdDecimal, 5, RoundingMode.HALF_EVEN);
//单个SKU的支出
......@@ -374,6 +371,7 @@ public class OrderSyncJob extends PointJob {
dcBaseOmsOrder.setAmountPrepaid(totalAmountPrepaid);
dcBaseOmsOrder.setCostFirst(totalCostFirst);
dcBaseOmsOrder.setCostLogistics(totalSkuCostLogistics);
dcBaseOmsOrder.setAmountGeneralCargo(totalAmountGeneralCargo);
/*
* OMS过来的详细费用不用动
* 这边处理新增了
......@@ -842,12 +840,14 @@ public class OrderSyncJob extends PointJob {
* 拿SkU基础信息
*
* @param bailunSku
* @param bailunSkuStructure
* @return
*/
private DcBaseSku getDcBaseSku(BailunSku bailunSku) {
private DcBaseSku getDcBaseSku(BailunSku bailunSku, BailunSkuStructure bailunSkuStructure) {
DcBaseSku skuProductInfo = null;
try {
DcBaseSkuMapper dcBaseSkuMapper = SessionUtil.getSession().getMapper(DcBaseSkuMapper.class);
bailunSkuStructure.setGeneralCargo(dcBaseSkuMapper.getIsGeneralCargo(bailunSku.getBailunSku()));
skuProductInfo = dcBaseSkuMapper.selectOneByExample(DcBaseSkuExample.newAndCreateCriteria().andBailunSkuEqualTo(bailunSku.getBailunSku()).example());
} catch (Exception e) {
e.printStackTrace();
......@@ -1004,9 +1004,10 @@ public class OrderSyncJob extends PointJob {
*
* @param dcBaseOmsSku
* @param logisticsHashMap
* @param bailunSkuStructure
* @return
*/
public void assignmentSkuInfo(OmsResult omsResult, DcBaseOmsOrder dcBaseOmsOrder, DcBaseOmsSku dcBaseOmsSku, BailunSku bailunSku, DcBaseWarehouse dcBaseWarehouse, HashMap<String, Logistics> logisticsHashMap) {
public void assignmentSkuInfo(OmsResult omsResult, DcBaseOmsOrder dcBaseOmsOrder, DcBaseOmsSku dcBaseOmsSku, BailunSku bailunSku, DcBaseWarehouse dcBaseWarehouse, HashMap<String, Logistics> logisticsHashMap, BailunSkuStructure bailunSkuStructure) {
dcBaseOmsSku.setCompanyId(omsResult.getCompanyId());
dcBaseOmsSku.setBailunSkuQuantityShipped(0);
dcBaseOmsSku.setBailunSkuQuantityPicked(0);
......@@ -1027,12 +1028,13 @@ public class OrderSyncJob extends PointJob {
dcBaseOmsSku.setAreaId(omsResult.getAreaId());
dcBaseOmsSku.setHasCancle(omsResult.getHasCancle());
// --begin 调用产品库信息 skuProductInfo, 获取分类信息
DcBaseSku skuProductInfo = getDcBaseSku(bailunSku);
// --begin 调用产品库信息 skuProductInfo, 获取分类信息, 判断是否普货
DcBaseSku skuProductInfo = getDcBaseSku(bailunSku,bailunSkuStructure);
if (skuProductInfo != null) {
dcBaseOmsSku.setBailunCategoryId(skuProductInfo.getBailunCategoryId());
dcBaseOmsSku.setBailunCategoryName(skuProductInfo.getBailunCategoryName());
dcBaseOmsSku.setSellerName(skuProductInfo.getSellerName());
}
//根据国家找物流规则
if (omsResult.getReceiptAddress() != null) {
......
data-base/base-sync-oms-order/src/test/java/OmsOrderTest.java
......@@ -73,7 +73,7 @@ public class OmsOrderTest {
LinkedHashMap<String, String> map = new LinkedHashMap<>(4);
map.put("pageIndex", "1");
map.put("pageCount", "100");
map.put("OriginOrderNo", "114-2843166-1456253");
map.put("OriginOrderNo", "163763969786-1879402896006");
Request request = new Request.Builder()
.get()
.url(OkHttpUtil.attachHttpGetParams("http://oms.bailuntec.com/apiV2/bailunOrder/getBailunOrders", map))
......
data-common/src/main/java/com/bailuntec/domain/entity/DcBaseOmsOrder.java
......@@ -863,6 +863,15 @@ public class DcBaseOmsOrder {
private Boolean hasFbaS;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_order.amount_general_cargo
*
* @mbg.generated
*/
private BigDecimal amountGeneralCargo;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_order
*
......@@ -969,6 +978,7 @@ public class DcBaseOmsOrder {
sb.append(", refundType=").append(refundType);
sb.append(", refundReferenceId=").append(refundReferenceId);
sb.append(", hasFbaS=").append(hasFbaS);
sb.append(", amountGeneralCargo=").append(amountGeneralCargo);
sb.append("]");
return sb.toString();
}
......@@ -1085,7 +1095,8 @@ public class DcBaseOmsOrder {
&& (this.getRefundObj() == null ? other.getRefundObj() == null : this.getRefundObj().equals(other.getRefundObj()))
&& (this.getRefundType() == null ? other.getRefundType() == null : this.getRefundType().equals(other.getRefundType()))
&& (this.getRefundReferenceId() == null ? other.getRefundReferenceId() == null : this.getRefundReferenceId().equals(other.getRefundReferenceId()))
&& (this.getHasFbaS() == null ? other.getHasFbaS() == null : this.getHasFbaS().equals(other.getHasFbaS()));
&& (this.getHasFbaS() == null ? other.getHasFbaS() == null : this.getHasFbaS().equals(other.getHasFbaS()))
&& (this.getAmountGeneralCargo() == null ? other.getAmountGeneralCargo() == null : this.getAmountGeneralCargo().equals(other.getAmountGeneralCargo()));
}
/**
......@@ -1193,6 +1204,7 @@ public class DcBaseOmsOrder {
result = prime * result + ((getRefundType() == null) ? 0 : getRefundType().hashCode());
result = prime * result + ((getRefundReferenceId() == null) ? 0 : getRefundReferenceId().hashCode());
result = prime * result + ((getHasFbaS() == null) ? 0 : getHasFbaS().hashCode());
result = prime * result + ((getAmountGeneralCargo() == null) ? 0 : getAmountGeneralCargo().hashCode());
return result;
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/entity/DcBaseOmsSku.java
......@@ -998,6 +998,15 @@ public class DcBaseOmsSku {
private Integer bailunSkuQuantityPushed;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_sku.amount_general_cargo
*
* @mbg.generated
*/
private BigDecimal amountGeneralCargo;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_sku
*
......@@ -1119,6 +1128,7 @@ public class DcBaseOmsSku {
sb.append(", refundReferenceId=").append(refundReferenceId);
sb.append(", hasFbaS=").append(hasFbaS);
sb.append(", bailunSkuQuantityPushed=").append(bailunSkuQuantityPushed);
sb.append(", amountGeneralCargo=").append(amountGeneralCargo);
sb.append("]");
return sb.toString();
}
......@@ -1250,7 +1260,8 @@ public class DcBaseOmsSku {
&& (this.getRefundType() == null ? other.getRefundType() == null : this.getRefundType().equals(other.getRefundType()))
&& (this.getRefundReferenceId() == null ? other.getRefundReferenceId() == null : this.getRefundReferenceId().equals(other.getRefundReferenceId()))
&& (this.getHasFbaS() == null ? other.getHasFbaS() == null : this.getHasFbaS().equals(other.getHasFbaS()))
&& (this.getBailunSkuQuantityPushed() == null ? other.getBailunSkuQuantityPushed() == null : this.getBailunSkuQuantityPushed().equals(other.getBailunSkuQuantityPushed()));
&& (this.getBailunSkuQuantityPushed() == null ? other.getBailunSkuQuantityPushed() == null : this.getBailunSkuQuantityPushed().equals(other.getBailunSkuQuantityPushed()))
&& (this.getAmountGeneralCargo() == null ? other.getAmountGeneralCargo() == null : this.getAmountGeneralCargo().equals(other.getAmountGeneralCargo()));
}
/**
......@@ -1373,6 +1384,7 @@ public class DcBaseOmsSku {
result = prime * result + ((getRefundReferenceId() == null) ? 0 : getRefundReferenceId().hashCode());
result = prime * result + ((getHasFbaS() == null) ? 0 : getHasFbaS().hashCode());
result = prime * result + ((getBailunSkuQuantityPushed() == null) ? 0 : getBailunSkuQuantityPushed().hashCode());
result = prime * result + ((getAmountGeneralCargo() == null) ? 0 : getAmountGeneralCargo().hashCode());
return result;
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/example/DcBaseOmsOrderExample.java
......@@ -6510,6 +6510,66 @@ public class DcBaseOmsOrderExample {
addCriterion("has_fba_s not between", value1, value2, "hasFbaS");
return (Criteria) this;
}
public Criteria andAmountGeneralCargoIsNull() {
addCriterion("amount_general_cargo is null");
return (Criteria) this;
}
public Criteria andAmountGeneralCargoIsNotNull() {
addCriterion("amount_general_cargo is not null");
return (Criteria) this;
}
public Criteria andAmountGeneralCargoEqualTo(BigDecimal value) {
addCriterion("amount_general_cargo =", value, "amountGeneralCargo");
return (Criteria) this;
}
public Criteria andAmountGeneralCargoNotEqualTo(BigDecimal value) {
addCriterion("amount_general_cargo <>", value, "amountGeneralCargo");
return (Criteria) this;
}
public Criteria andAmountGeneralCargoGreaterThan(BigDecimal value) {
addCriterion("amount_general_cargo >", value, "amountGeneralCargo");
return (Criteria) this;
}
public Criteria andAmountGeneralCargoGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("amount_general_cargo >=", value, "amountGeneralCargo");
return (Criteria) this;
}
public Criteria andAmountGeneralCargoLessThan(BigDecimal value) {
addCriterion("amount_general_cargo <", value, "amountGeneralCargo");
return (Criteria) this;
}
public Criteria andAmountGeneralCargoLessThanOrEqualTo(BigDecimal value) {
addCriterion("amount_general_cargo <=", value, "amountGeneralCargo");
return (Criteria) this;
}
public Criteria andAmountGeneralCargoIn(List<BigDecimal> values) {
addCriterion("amount_general_cargo in", values, "amountGeneralCargo");
return (Criteria) this;
}
public Criteria andAmountGeneralCargoNotIn(List<BigDecimal> values) {
addCriterion("amount_general_cargo not in", values, "amountGeneralCargo");
return (Criteria) this;
}
public Criteria andAmountGeneralCargoBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("amount_general_cargo between", value1, value2, "amountGeneralCargo");
return (Criteria) this;
}
public Criteria andAmountGeneralCargoNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("amount_general_cargo not between", value1, value2, "amountGeneralCargo");
return (Criteria) this;
}
}
/**
......
data-common/src/main/java/com/bailuntec/domain/example/DcBaseOmsSkuExample.java
......@@ -7470,6 +7470,66 @@ public class DcBaseOmsSkuExample {
addCriterion("bailun_sku_quantity_pushed not between", value1, value2, "bailunSkuQuantityPushed");
return (Criteria) this;
}
public Criteria andAmountGeneralCargoIsNull() {
addCriterion("amount_general_cargo is null");
return (Criteria) this;
}
public Criteria andAmountGeneralCargoIsNotNull() {
addCriterion("amount_general_cargo is not null");
return (Criteria) this;
}
public Criteria andAmountGeneralCargoEqualTo(BigDecimal value) {
addCriterion("amount_general_cargo =", value, "amountGeneralCargo");
return (Criteria) this;
}
public Criteria andAmountGeneralCargoNotEqualTo(BigDecimal value) {
addCriterion("amount_general_cargo <>", value, "amountGeneralCargo");
return (Criteria) this;
}
public Criteria andAmountGeneralCargoGreaterThan(BigDecimal value) {
addCriterion("amount_general_cargo >", value, "amountGeneralCargo");
return (Criteria) this;
}
public Criteria andAmountGeneralCargoGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("amount_general_cargo >=", value, "amountGeneralCargo");
return (Criteria) this;
}
public Criteria andAmountGeneralCargoLessThan(BigDecimal value) {
addCriterion("amount_general_cargo <", value, "amountGeneralCargo");
return (Criteria) this;
}
public Criteria andAmountGeneralCargoLessThanOrEqualTo(BigDecimal value) {
addCriterion("amount_general_cargo <=", value, "amountGeneralCargo");
return (Criteria) this;
}
public Criteria andAmountGeneralCargoIn(List<BigDecimal> values) {
addCriterion("amount_general_cargo in", values, "amountGeneralCargo");
return (Criteria) this;
}
public Criteria andAmountGeneralCargoNotIn(List<BigDecimal> values) {
addCriterion("amount_general_cargo not in", values, "amountGeneralCargo");
return (Criteria) this;
}
public Criteria andAmountGeneralCargoBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("amount_general_cargo between", value1, value2, "amountGeneralCargo");
return (Criteria) this;
}
public Criteria andAmountGeneralCargoNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("amount_general_cargo not between", value1, value2, "amountGeneralCargo");
return (Criteria) this;
}
}
/**
......
data-common/src/main/java/com/bailuntec/mapper/DcBaseOmsHandleMapper.java deleted 100644 → 0
package com.bailuntec.mapper;
import com.bailuntec.domain.entity.DcBaseOmsHandle;
import com.bailuntec.domain.example.DcBaseOmsHandleExample;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface DcBaseOmsHandleMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_handle
*
* @mbg.generated
*/
long countByExample(DcBaseOmsHandleExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_handle
*
* @mbg.generated
*/
int deleteByExample(DcBaseOmsHandleExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_handle
*
* @mbg.generated
*/
int deleteByPrimaryKey(Integer id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_handle
*
* @mbg.generated
*/
int insert(DcBaseOmsHandle record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_handle
*
* @mbg.generated
*/
int insertSelective(DcBaseOmsHandle record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_handle
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
DcBaseOmsHandle selectOneByExample(DcBaseOmsHandleExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_handle
*
* @mbg.generated
*/
List<DcBaseOmsHandle> selectByExample(DcBaseOmsHandleExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_handle
*
* @mbg.generated
*/
DcBaseOmsHandle selectByPrimaryKey(Integer id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_handle
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") DcBaseOmsHandle record, @Param("example") DcBaseOmsHandleExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_handle
*
* @mbg.generated
*/
int updateByExample(@Param("record") DcBaseOmsHandle record, @Param("example") DcBaseOmsHandleExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_handle
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(DcBaseOmsHandle record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_handle
*
* @mbg.generated
*/
int updateByPrimaryKey(DcBaseOmsHandle record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_handle
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
int upsert(DcBaseOmsHandle record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_handle
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
int upsertSelective(DcBaseOmsHandle record);
DcBaseOmsHandle getOrderBailunCatagory(@Param("bailunSku") String bailunSku);
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/mapper/DcBaseOmsOrderMapper.java
......@@ -121,10 +121,9 @@ public interface DcBaseOmsOrderMapper {
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
int upsertSelective(DcBaseOmsOrder record);
void logicDeleteOmsSku(DcBaseOmsOrder dcBaseOmsOrder);
void logicDeleteOmsPick(DcBaseOmsOrder dcBaseOmsOrder);
void logicDeleteOmsSku(DcBaseOmsOrder dcBaseOmsOrder);
void logicDeleteOmsPick(DcBaseOmsOrder dcBaseOmsOrder);
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/mapper/DcBaseOmsOrderMapper.xml
......@@ -101,6 +101,7 @@
<result column="refund_type" jdbcType="VARCHAR" property="refundType" />
<result column="refund_reference_id" jdbcType="VARCHAR" property="refundReferenceId" />
<result column="has_fba_s" jdbcType="BIT" property="hasFbaS" />
<result column="amount_general_cargo" jdbcType="DECIMAL" property="amountGeneralCargo" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
......@@ -191,7 +192,7 @@
gmt_modified, quantity_bailun_sku, logistics_warehouse_code, logistics_warehouse_name,
logistics_method_code, logistics_method_name, bailun_picking_status, bailun_require_logistics,
has_scalp, has_innersale, company_id, profit_oms, refund_obj, refund_type, refund_reference_id,
has_fba_s
has_fba_s, amount_general_cargo
</sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultMap="BaseResultMap">
<!--
......@@ -286,7 +287,8 @@
bailun_picking_status, bailun_require_logistics,
has_scalp, has_innersale, company_id,
profit_oms, refund_obj, refund_type,
refund_reference_id, has_fba_s)
refund_reference_id, has_fba_s, amount_general_cargo
)
values (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
#{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR},
......@@ -321,7 +323,8 @@
#{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR},
#{hasScalp,jdbcType=BIT}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER},
#{profitOms,jdbcType=DECIMAL}, #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR},
#{refundReferenceId,jdbcType=VARCHAR}, #{hasFbaS,jdbcType=BIT})
#{refundReferenceId,jdbcType=VARCHAR}, #{hasFbaS,jdbcType=BIT}, #{amountGeneralCargo,jdbcType=DECIMAL}
)
</insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
<!--
......@@ -615,6 +618,9 @@
<if test="hasFbaS != null">
has_fba_s,
</if>
<if test="amountGeneralCargo != null">
amount_general_cargo,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -902,6 +908,9 @@
<if test="hasFbaS != null">
#{hasFbaS,jdbcType=BIT},
</if>
<if test="amountGeneralCargo != null">
#{amountGeneralCargo,jdbcType=DECIMAL},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultType="java.lang.Long">
......@@ -1206,6 +1215,9 @@
<if test="record.hasFbaS != null">
has_fba_s = #{record.hasFbaS,jdbcType=BIT},
</if>
<if test="record.amountGeneralCargo != null">
amount_general_cargo = #{record.amountGeneralCargo,jdbcType=DECIMAL},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -1311,7 +1323,8 @@
refund_obj = #{record.refundObj,jdbcType=VARCHAR},
refund_type = #{record.refundType,jdbcType=VARCHAR},
refund_reference_id = #{record.refundReferenceId,jdbcType=VARCHAR},
has_fba_s = #{record.hasFbaS,jdbcType=BIT}
has_fba_s = #{record.hasFbaS,jdbcType=BIT},
amount_general_cargo = #{record.amountGeneralCargo,jdbcType=DECIMAL}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -1605,6 +1618,9 @@
<if test="hasFbaS != null">
has_fba_s = #{hasFbaS,jdbcType=BIT},
</if>
<if test="amountGeneralCargo != null">
amount_general_cargo = #{amountGeneralCargo,jdbcType=DECIMAL},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -1707,7 +1723,8 @@
refund_obj = #{refundObj,jdbcType=VARCHAR},
refund_type = #{refundType,jdbcType=VARCHAR},
refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR},
has_fba_s = #{hasFbaS,jdbcType=BIT}
has_fba_s = #{hasFbaS,jdbcType=BIT},
amount_general_cargo = #{amountGeneralCargo,jdbcType=DECIMAL}
where id = #{id,jdbcType=INTEGER}
</update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
......@@ -2003,6 +2020,9 @@
<if test="hasFbaS != null">
has_fba_s,
</if>
<if test="amountGeneralCargo != null">
amount_general_cargo,
</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -2291,6 +2311,9 @@
<if test="hasFbaS != null">
#{hasFbaS,jdbcType=BIT},
</if>
<if test="amountGeneralCargo != null">
#{amountGeneralCargo,jdbcType=DECIMAL},
</if>
</trim>
on duplicate key update
<trim suffixOverrides=",">
......@@ -2579,6 +2602,9 @@
<if test="hasFbaS != null">
has_fba_s = #{hasFbaS,jdbcType=BIT},
</if>
<if test="amountGeneralCargo != null">
amount_general_cargo = #{amountGeneralCargo,jdbcType=DECIMAL},
</if>
</trim>
</insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
......@@ -2606,7 +2632,7 @@
gmt_modified, quantity_bailun_sku, logistics_warehouse_code, logistics_warehouse_name,
logistics_method_code, logistics_method_name, bailun_picking_status, bailun_require_logistics,
has_scalp, has_innersale, company_id, profit_oms, refund_obj, refund_type, refund_reference_id,
has_fba_s)
has_fba_s, amount_general_cargo)
values
(#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
......@@ -2642,7 +2668,8 @@
#{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR},
#{hasScalp,jdbcType=BIT}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER},
#{profitOms,jdbcType=DECIMAL}, #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR},
#{refundReferenceId,jdbcType=VARCHAR}, #{hasFbaS,jdbcType=BIT})
#{refundReferenceId,jdbcType=VARCHAR}, #{hasFbaS,jdbcType=BIT}, #{amountGeneralCargo,jdbcType=DECIMAL}
)
on duplicate key update
id = #{id,jdbcType=INTEGER},
origin_order_id = #{originOrderId,jdbcType=VARCHAR},
......@@ -2738,7 +2765,8 @@
refund_obj = #{refundObj,jdbcType=VARCHAR},
refund_type = #{refundType,jdbcType=VARCHAR},
refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR},
has_fba_s = #{hasFbaS,jdbcType=BIT}
has_fba_s = #{hasFbaS,jdbcType=BIT},
amount_general_cargo = #{amountGeneralCargo,jdbcType=DECIMAL}
</insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultMap="BaseResultMap">
<!--
......
data-common/src/main/java/com/bailuntec/mapper/DcBaseOmsSkuMapper.java
......@@ -123,7 +123,8 @@ public interface DcBaseOmsSkuMapper {
*/
int upsertSelective(DcBaseOmsSku record);
List<FbaFeeSku> listFbaSku(@Param("timeInterval") int timeInterval);
List<Double> listFbaFee(@Param("bailunSku")String bailunSku, @Param("website")String website, @Param("timeInterval") int timeInterval);
List<Double> listFbaFee(@Param("bailunSku") String bailunSku, @Param("website") String website, @Param("timeInterval") int timeInterval);
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/mapper/DcBaseOmsSkuMapper.xml
......@@ -116,6 +116,7 @@
<result column="refund_reference_id" jdbcType="VARCHAR" property="refundReferenceId" />
<result column="has_fba_s" jdbcType="BIT" property="hasFbaS" />
<result column="bailun_sku_quantity_pushed" jdbcType="INTEGER" property="bailunSkuQuantityPushed" />
<result column="amount_general_cargo" jdbcType="DECIMAL" property="amountGeneralCargo" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
......@@ -208,7 +209,8 @@
has_cancle, area_id, bailun_category_id, bailun_category_name, gmt_create, gmt_modified,
ratio_weight, ratio_price, bailun_picking_status, bailun_require_logistics, has_delete,
has_scalp, logistics_method_code, logistics_method_name, has_innersale, company_id,
bailun_refund_status, refund_obj, refund_type, refund_reference_id, has_fba_s, bailun_sku_quantity_pushed
bailun_refund_status, refund_obj, refund_type, refund_reference_id, has_fba_s, bailun_sku_quantity_pushed,
amount_general_cargo
</sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap">
<!--
......@@ -308,8 +310,8 @@
has_delete, has_scalp, logistics_method_code,
logistics_method_name, has_innersale, company_id,
bailun_refund_status, refund_obj, refund_type,
refund_reference_id, has_fba_s, bailun_sku_quantity_pushed
)
refund_reference_id, has_fba_s, bailun_sku_quantity_pushed,
amount_general_cargo)
values (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
#{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR},
......@@ -349,8 +351,8 @@
#{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT}, #{logisticsMethodCode,jdbcType=VARCHAR},
#{logisticsMethodName,jdbcType=VARCHAR}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER},
#{bailunRefundStatus,jdbcType=VARCHAR}, #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR},
#{refundReferenceId,jdbcType=VARCHAR}, #{hasFbaS,jdbcType=BIT}, #{bailunSkuQuantityPushed,jdbcType=INTEGER}
)
#{refundReferenceId,jdbcType=VARCHAR}, #{hasFbaS,jdbcType=BIT}, #{bailunSkuQuantityPushed,jdbcType=INTEGER},
#{amountGeneralCargo,jdbcType=DECIMAL})
</insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
<!--
......@@ -689,6 +691,9 @@
<if test="bailunSkuQuantityPushed != null">
bailun_sku_quantity_pushed,
</if>
<if test="amountGeneralCargo != null">
amount_general_cargo,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -1021,6 +1026,9 @@
<if test="bailunSkuQuantityPushed != null">
#{bailunSkuQuantityPushed,jdbcType=INTEGER},
</if>
<if test="amountGeneralCargo != null">
#{amountGeneralCargo,jdbcType=DECIMAL},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultType="java.lang.Long">
......@@ -1370,6 +1378,9 @@
<if test="record.bailunSkuQuantityPushed != null">
bailun_sku_quantity_pushed = #{record.bailunSkuQuantityPushed,jdbcType=INTEGER},
</if>
<if test="record.amountGeneralCargo != null">
amount_general_cargo = #{record.amountGeneralCargo,jdbcType=DECIMAL},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -1490,7 +1501,8 @@
refund_type = #{record.refundType,jdbcType=VARCHAR},
refund_reference_id = #{record.refundReferenceId,jdbcType=VARCHAR},
has_fba_s = #{record.hasFbaS,jdbcType=BIT},
bailun_sku_quantity_pushed = #{record.bailunSkuQuantityPushed,jdbcType=INTEGER}
bailun_sku_quantity_pushed = #{record.bailunSkuQuantityPushed,jdbcType=INTEGER},
amount_general_cargo = #{record.amountGeneralCargo,jdbcType=DECIMAL}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -1829,6 +1841,9 @@
<if test="bailunSkuQuantityPushed != null">
bailun_sku_quantity_pushed = #{bailunSkuQuantityPushed,jdbcType=INTEGER},
</if>
<if test="amountGeneralCargo != null">
amount_general_cargo = #{amountGeneralCargo,jdbcType=DECIMAL},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -1946,7 +1961,8 @@
refund_type = #{refundType,jdbcType=VARCHAR},
refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR},
has_fba_s = #{hasFbaS,jdbcType=BIT},
bailun_sku_quantity_pushed = #{bailunSkuQuantityPushed,jdbcType=INTEGER}
bailun_sku_quantity_pushed = #{bailunSkuQuantityPushed,jdbcType=INTEGER},
amount_general_cargo = #{amountGeneralCargo,jdbcType=DECIMAL}
where id = #{id,jdbcType=INTEGER}
</update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
......@@ -2287,6 +2303,9 @@
<if test="bailunSkuQuantityPushed != null">
bailun_sku_quantity_pushed,
</if>
<if test="amountGeneralCargo != null">
amount_general_cargo,
</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -2620,6 +2639,9 @@
<if test="bailunSkuQuantityPushed != null">
#{bailunSkuQuantityPushed,jdbcType=INTEGER},
</if>
<if test="amountGeneralCargo != null">
#{amountGeneralCargo,jdbcType=DECIMAL},
</if>
</trim>
on duplicate key update
<trim suffixOverrides=",">
......@@ -2953,6 +2975,9 @@
<if test="bailunSkuQuantityPushed != null">
bailun_sku_quantity_pushed = #{bailunSkuQuantityPushed,jdbcType=INTEGER},
</if>
<if test="amountGeneralCargo != null">
amount_general_cargo = #{amountGeneralCargo,jdbcType=DECIMAL},
</if>
</trim>
</insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
......@@ -2983,7 +3008,7 @@
bailun_category_name, gmt_create, gmt_modified, ratio_weight, ratio_price, bailun_picking_status,
bailun_require_logistics, has_delete, has_scalp, logistics_method_code, logistics_method_name,
has_innersale, company_id, bailun_refund_status, refund_obj, refund_type, refund_reference_id,
has_fba_s, bailun_sku_quantity_pushed)
has_fba_s, bailun_sku_quantity_pushed, amount_general_cargo)
values
(#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
......@@ -3024,8 +3049,8 @@
#{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT}, #{logisticsMethodCode,jdbcType=VARCHAR},
#{logisticsMethodName,jdbcType=VARCHAR}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER},
#{bailunRefundStatus,jdbcType=VARCHAR}, #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR},
#{refundReferenceId,jdbcType=VARCHAR}, #{hasFbaS,jdbcType=BIT}, #{bailunSkuQuantityPushed,jdbcType=INTEGER}
)
#{refundReferenceId,jdbcType=VARCHAR}, #{hasFbaS,jdbcType=BIT}, #{bailunSkuQuantityPushed,jdbcType=INTEGER},
#{amountGeneralCargo,jdbcType=DECIMAL})
on duplicate key update
id = #{id,jdbcType=INTEGER},
origin_order_id = #{originOrderId,jdbcType=VARCHAR},
......@@ -3136,7 +3161,8 @@
refund_type = #{refundType,jdbcType=VARCHAR},
refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR},
has_fba_s = #{hasFbaS,jdbcType=BIT},
bailun_sku_quantity_pushed = #{bailunSkuQuantityPushed,jdbcType=INTEGER}
bailun_sku_quantity_pushed = #{bailunSkuQuantityPushed,jdbcType=INTEGER},
amount_general_cargo = #{amountGeneralCargo,jdbcType=DECIMAL}
</insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap">
<!--
......@@ -3156,11 +3182,11 @@
limit 1
</select>
<select id="listFbaFee" resultType="double">
SELECT cost_fba_fee FROM dc_base_oms_sku WHERE platform_type='FBA' and paid_time >= DATE_SUB(CURDATE(),INTERVAL #{timeInterval} day) AND bailun_sku=#{bailunSku} and website=#{website}
</select>
<select id="listFbaSku" resultType="com.bailuntec.domain.pojo.FbaFeeSku">
SELECT bailun_sku,website FROM dc_base_oms_sku WHERE platform_type='FBA' and paid_time >= DATE_SUB(CURDATE(),INTERVAL #{timeInterval} day) GROUP BY bailun_sku,website
</select>
</mapper>
\ No newline at end of file
data-common/src/main/java/com/bailuntec/mapper/DcBaseSkuMapper.java
......@@ -121,4 +121,6 @@ public interface DcBaseSkuMapper {
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
int upsertSelective(DcBaseSku record);
Boolean getIsGeneralCargo(@Param("bailunSku") String bailunSku);
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/mapper/DcBaseSkuMapper.xml
......@@ -2058,4 +2058,14 @@
</if>
limit 1
</select>
<select id="getIsGeneralCargo" resultType="boolean">
SELECT
(CASE tb2.parent_id
WHEN 1 THEN true
WHEN tb2.parent_id is null THEN false
ELSE false
END),tb2.parent_id
FROM (SELECT * FROM `dc_base_sku` WHERE bailun_sku =#{bailunSku})tb1 LEFT JOIN dc_base_sku_simple_category tb2 on tb1.category_simple_id = tb2.skums_id;
</select>
</mapper>
\ No newline at end of file
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