优化同步的单位判断
This commit is contained in:
parent
5ff094de7a
commit
c3997d074f
@ -829,8 +829,7 @@ public abstract class SyncBaseThirdSxAbstract{
|
|||||||
}
|
}
|
||||||
//商品总量
|
//商品总量
|
||||||
if(ObjectUtil.isNotEmpty(jsonObj.getStr("unit"))&&ObjectUtil.isNotEmpty(jsonObj.getStr("stock"))
|
if(ObjectUtil.isNotEmpty(jsonObj.getStr("unit"))&&ObjectUtil.isNotEmpty(jsonObj.getStr("stock"))
|
||||||
&& "KG,kg,公斤".contains(jsonObj.getStr("unit"))&&!(productName.contains("g")||productName.contains("ml")||productName.contains("ML")||productName.contains("kg")||
|
&& checkUnit(jsonObj.getStr("unit"))&&!(checkProductContainUnits(productName))){//这样做主要是有些超时有了kg,又打包成克来卖
|
||||||
productName.contains("KG")||productName.contains("L")||productName.contains("l")||productName.contains("斤")||productName.contains("袋"))){//这样做主要是有些超时有了kg,又打包成克来卖
|
|
||||||
shopProductBase.setShop_weight(stock);
|
shopProductBase.setShop_weight(stock);
|
||||||
shopProductBase.setUnit_name(jsonObj.getStr("unit"));
|
shopProductBase.setUnit_name(jsonObj.getStr("unit"));
|
||||||
shopProductBase.setProduct_state_id(StateCode.PRODUCT_STATE_OFF_THE_SHELF_UNCHECK);
|
shopProductBase.setProduct_state_id(StateCode.PRODUCT_STATE_OFF_THE_SHELF_UNCHECK);
|
||||||
@ -844,8 +843,7 @@ public abstract class SyncBaseThirdSxAbstract{
|
|||||||
}
|
}
|
||||||
shopProductBase.setProduct_state_id(StateCode.PRODUCT_STATE_OFF_THE_SHELF);//默认是下架
|
shopProductBase.setProduct_state_id(StateCode.PRODUCT_STATE_OFF_THE_SHELF);//默认是下架
|
||||||
shopProductBase.setUnit_price(BigDecimal.valueOf(jsonObj.getDouble("retail_price")));
|
shopProductBase.setUnit_price(BigDecimal.valueOf(jsonObj.getDouble("retail_price")));
|
||||||
if(!(productName.contains("g")||productName.contains("ml")||productName.contains("ML")||productName.contains("kg")||
|
if(!checkProductContainUnits(productName)){
|
||||||
productName.contains("KG")||productName.contains("L")||productName.contains("l")||productName.contains("斤")||productName.contains("袋"))){
|
|
||||||
String spectItem=StringUtils.isNotEmpty(shopProductBase.getSpecItem())?shopProductBase.getSpecItem():"";
|
String spectItem=StringUtils.isNotEmpty(shopProductBase.getSpecItem())?shopProductBase.getSpecItem():"";
|
||||||
String unit=StringUtils.isNotEmpty(shopProductBase.getSpecUnit())?shopProductBase.getSpecUnit():"";
|
String unit=StringUtils.isNotEmpty(shopProductBase.getSpecUnit())?shopProductBase.getSpecUnit():"";
|
||||||
if(StringUtils.isNotEmpty(spectItem)||StringUtils.isNotEmpty(unit)){
|
if(StringUtils.isNotEmpty(spectItem)||StringUtils.isNotEmpty(unit)){
|
||||||
@ -982,6 +980,32 @@ public abstract class SyncBaseThirdSxAbstract{
|
|||||||
return resultCount.get();
|
return resultCount.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 校验单位是否为公斤
|
||||||
|
* @param checkUnit
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
private boolean checkUnit(String checkUnit){
|
||||||
|
checkUnit=checkUnit.trim();
|
||||||
|
List<String> units=Arrays.asList("KG","kg","公斤","Kg","kG");
|
||||||
|
for(String unit:units){
|
||||||
|
if(unit.equals(checkUnit)){
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 校验商品是否包含单位
|
||||||
|
* @param productName
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
private boolean checkProductContainUnits(String productName){
|
||||||
|
return productName.contains("g")||productName.contains("ml")||productName.contains("ML")||productName.contains("kg")||
|
||||||
|
productName.contains("KG")||productName.contains("L")||productName.contains("l")||productName.contains("斤")||productName.contains("袋")||
|
||||||
|
productName.contains("Kg")||productName.contains("kG");
|
||||||
|
}
|
||||||
|
|
||||||
public void syncPrimaryKey(){
|
public void syncPrimaryKey(){
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user