ufo / ufo-platform · Commits

Go to a project

Authored by mali
Commit d3ff52d22a97cee4c438e7bb750c98514e9c9f2e 2 parents 84d685ae 72836fd3

Merge branch 'master' into test6.8.6 

Conflicts:
	product/src/main/java/com/yoho/ufo/service/scheduled/ScheduledNoticeSellerHiddenSkup.java
Inline Side-by-side
Showing 3 changed files with 8 additions and 4 deletions
... ... @@ -252,7 +252,8 @@ public class ChannelSkuCompareServiceImpl implements IChannelSkuCompareService,
List<Storage> storageList = Lists.newArrayList();
for(ChannelSkuCompare csc : cscList) {
if((null != productIdMinPriceMap.get(csc.getProductId()) && csc.getChannelPrice().compareTo(productIdMinPriceMap.get(csc.getProductId()))< 0)
|| (csc.getChannelAveragePrice().compareTo(BigDecimal.valueOf(0)) != 0 && csc.getChannelPrice().compareTo(csc.getChannelAveragePrice()) < 0)) {//毒价小于平台最低价或毒价小于毒前24小时平均价为异常
|| (csc.getChannelAveragePrice().compareTo(BigDecimal.valueOf(0)) != 0
&& csc.getChannelPrice().compareTo((csc.getChannelAveragePrice().multiply(BigDecimal.valueOf(0.95)))) < 0)) {//毒价小于平台最低价或毒价小于毒前24小时平均价*0.95为异常
abnormalIdList.add(csc.getId());
continue;
}
... ... @@ -330,7 +331,7 @@ public class ChannelSkuCompareServiceImpl implements IChannelSkuCompareService,
bo.setUfoCurrentPrice(getFormatPrice(storageMinPriceMap.get(csc.getSku())));
BigDecimal ufoMinPrice = null == productMap.get(csc.getProductId()) ? null : productMap.get(csc.getProductId()).getMinPrice();
bo.setUfoMinPrice(getFormatPrice(ufoMinPrice));
bo.setChannelAveragePrice(null == csc.getChannelAveragePrice() ? "" : getIntFormatPrice(csc.getChannelAveragePrice()));
bo.setChannelAveragePrice(null == csc.getChannelAveragePrice() ? "" : getIntFormatPrice(csc.getChannelAveragePrice().multiply(BigDecimal.valueOf(0.95))));
//毒当前价低于UFO价格红线则为异常，那么显示上回的建议价
BigDecimal suggestLowPrice = null == storageMap.get(csc.getSku()) ? null : storageMap.get(csc.getSku()).getSuggestLowPrice();
BigDecimal suggestHighPrice = null == storageMap.get(csc.getSku()) ? null : storageMap.get(csc.getSku()).getSuggestHighPrice();
... ...
... ... @@ -19,8 +19,9 @@ import com.yoho.ufo.service.IChannelSkuCompareService;
*
*/
@Service(value="scheduledNoticeSellerHiddenSkup")
@YhJobDef(desc = "定时通知卖家有隐藏skup", jobName = "scheduledNoticeSellerHiddenSkup", cron = "0 0/2 * * * ?", misfiredPolicy = MisfiredPolicy.CRON_DO_NOTHING,
jobType = JobType.CRON, jobGroup = "ufoPlatform", needUpdate=true)
@YhJobDef(desc = "定时通知卖家有隐藏skup", jobName = "scheduledNoticeSellerHiddenSkup", cron = "0 0 12,20 * * ?", misfiredPolicy = MisfiredPolicy.CRON_DO_NOTHING,
jobType = JobType.CRON, jobGroup = "ufoPlatform")
// , needUpdate=true
public class ScheduledNoticeSellerHiddenSkup implements YhJob{
private static final Logger LOGGER = LoggerFactory.getLogger("scheduledLog");
... ...
... ... @@ -66,6 +66,8 @@ $(function() {
$("#uid").textbox('setValue','');
$("#businessName").textbox('setValue','');
$("#validStatus").combobox('setValue','');
$("#businessListTable").datagrid("load", {
});
}
});
... ...