Commit df97de0a by huluobin

订单sku

parent 8322a5c4
...@@ -592,7 +592,11 @@ public class OrderSyncJob extends PointJob { ...@@ -592,7 +592,11 @@ public class OrderSyncJob extends PointJob {
* @param totalCostFirst * @param totalCostFirst
* @return * @return
*/ */
private BigDecimal caculateCostFirst(DcBaseWarehouse dcBaseWarehouse, DcBaseOmsSku dcBaseOmsSku, BailunSkuStructure bailunSkuStructure, BigDecimal totalCostFirst, DcBaseOmsOrder dcBaseOmsOrder) { private BigDecimal caculateCostFirst(DcBaseWarehouse dcBaseWarehouse,
DcBaseOmsSku dcBaseOmsSku,
BailunSkuStructure bailunSkuStructure,
BigDecimal totalCostFirst,
DcBaseOmsOrder dcBaseOmsOrder) {
//MARKETING平台 如果是耗材仓的,产品成本和头程费不参与利润统计 //MARKETING平台 如果是耗材仓的,产品成本和头程费不参与利润统计
if (dcBaseOmsOrder.getPlatformType().toUpperCase().equals(PlatformType.Marketing.value()) && ((dcBaseWarehouse != null && Constant.CONSUMABLES_WAREHOUSE.equals(dcBaseWarehouse.getHqType())) || dcBaseOmsOrder.getHasTransferOrder())) { if (dcBaseOmsOrder.getPlatformType().toUpperCase().equals(PlatformType.Marketing.value()) && ((dcBaseWarehouse != null && Constant.CONSUMABLES_WAREHOUSE.equals(dcBaseWarehouse.getHqType())) || dcBaseOmsOrder.getHasTransferOrder())) {
...@@ -610,7 +614,11 @@ public class OrderSyncJob extends PointJob { ...@@ -610,7 +614,11 @@ public class OrderSyncJob extends PointJob {
} }
}*/ }*/
DcMidCostFirstMapper mapper = SessionUtil.getSession().getMapper(DcMidCostFirstMapper.class); DcMidCostFirstMapper mapper = SessionUtil.getSession().getMapper(DcMidCostFirstMapper.class);
DcMidCostFirst dcMidCostFirst = mapper.selectOneByExample(DcMidCostFirstExample.newAndCreateCriteria().andBailunSkuEqualTo(dcBaseOmsSku.getBailunSku()).andWarehouseCodeEqualTo(dcBaseWarehouse.getWarehouseCode()).example()); DcMidCostFirst dcMidCostFirst = mapper.selectOneByExample(DcMidCostFirstExample.newAndCreateCriteria()
.andBailunSkuEqualTo(dcBaseOmsSku.getBailunSku())
.andWarehouseCodeEqualTo(dcBaseWarehouse.getWarehouseCode())
.example());
//如果dcMidCostFirst查不到,铭哥那边商量好了,头程0的,先跑调拨单,若是真是之前的SKU无法找到的,那就取值38元1KG来计算。 //如果dcMidCostFirst查不到,铭哥那边商量好了,头程0的,先跑调拨单,若是真是之前的SKU无法找到的,那就取值38元1KG来计算。
if (dcMidCostFirst == null) { if (dcMidCostFirst == null) {
dcMidCostFirst = new DcMidCostFirst(); dcMidCostFirst = new DcMidCostFirst();
......
...@@ -17,6 +17,6 @@ JOB_NAME30=base-sync-oms-skus30 ...@@ -17,6 +17,6 @@ JOB_NAME30=base-sync-oms-skus30
#JOB_NAME=base-sync-oms-order #JOB_NAME=base-sync-oms-order
JOB_CRON30=0 0 22,23,00 * * ? * JOB_CRON30=0 0 22,23,00 * * ? *
JOB_COROUTINE_NAME=base-sync-oms-order-coroutine JOB_COROUTINE_NAME=base-sync-oms-order-task
JOB_COROUTINE_CRON=0 1 16 * * ? JOB_COROUTINE_CRON=0 30 16 * * ?
SHARDING_TOTAL_COUNT=1 SHARDING_TOTAL_COUNT=1
...@@ -11,6 +11,7 @@ import com.dangdang.ddframe.job.executor.ShardingContexts; ...@@ -11,6 +11,7 @@ import com.dangdang.ddframe.job.executor.ShardingContexts;
import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSession;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.math.BigDecimal;
import java.util.HashMap; import java.util.HashMap;
/** /**
...@@ -53,4 +54,19 @@ public class OrderSyncJobTest { ...@@ -53,4 +54,19 @@ public class OrderSyncJobTest {
} }
@Test
public void testBigDecimal() {
BigDecimal totalCost = BigDecimal.ONE;
totalCost = this.calc(totalCost);
System.out.println(totalCost);
}
private BigDecimal calc(BigDecimal totalCost) {
totalCost = totalCost.add(BigDecimal.TEN);
return totalCost;
}
} }
package com.bailuntec.mapper;
import com.bailuntec.utils.SessionUtil;
import org.junit.jupiter.api.Test;
/**
* <p>
*
* </p>
*
* @author robbendev
* @since 2020/9/3 4:04 下午
*/
class DcDailySalesMapperTest {
@Test
void calculateSales() {
try {
DcDailySalesMapper dcDailySalesMapper = SessionUtil.getSession().getMapper(DcDailySalesMapper.class);
dcDailySalesMapper.calculateSales();
} finally {
SessionUtil.closeSession();
}
}
}
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