diff --git a/client/src/main/java/com/small/client/service/SxDataAbst/SxDataAbstService.java b/client/src/main/java/com/small/client/service/SxDataAbst/SxDataAbstService.java index 49812e35..9940de9d 100644 --- a/client/src/main/java/com/small/client/service/SxDataAbst/SxDataAbstService.java +++ b/client/src/main/java/com/small/client/service/SxDataAbst/SxDataAbstService.java @@ -6,6 +6,7 @@ import com.small.client.Cache.CommonCache; import com.small.client.dao.SxDataDao; import com.small.client.dto.*; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -100,7 +101,7 @@ public abstract class SxDataAbstService { }else { sxCategoryModel.setFirst_category_name(""); } - sxCategoryModel.setProduct_type("食品生鲜"); + sxCategoryModel.setProduct_type(sxCategoryModel.getCategory_name()); sxCategoryModels.add(sxCategoryModel); } return sxCategoryModels; @@ -145,9 +146,11 @@ public abstract class SxDataAbstService { sxGoosModel.setOriginal_price(sxSyncGood.getSale_price());//原价 todo sxGoosModel.setPrice(sxSyncGood.getSale_price());// sxGoosModel.setMember_price(sxSyncGood.getVip_price());//会员价 - sxGoosModel.setStock(sxSyncGood.getStock());//库存 todo + sxGoosModel.setStock(sxSyncGood.getStock());//库存 sxGoosModel.setGross_margin(sxSyncGood.getGross_margin()); //毛利率 todo - sxGoosModel.setUnit(sxSyncGood.getUnit_no());//单位 + if(StringUtils.isNotEmpty(sxSyncGood.getUnit_no())){ + sxGoosModel.setUnit(sxSyncGood.getUnit_no().trim());//单位 + } sxGoosModel.setCan_piont(new BigDecimal(0));//可用积分 todo sxGoosModel.setPoints(sxSyncGood.getVip_acc_num());//总积分 todo sxGoosModel.setMnemonic(sxSyncGood.getItem_rem());//助记码 todo