|
|
@@ -13,11 +13,11 @@ import com.uas.platform.b2c.prod.commodity.model.GoodsQtyPrice;
|
|
|
import com.uas.platform.b2c.prod.commodity.model.GoodsSimple;
|
|
|
import com.uas.platform.b2c.prod.commodity.model.ProductDetail;
|
|
|
import com.uas.platform.b2c.prod.product.component.modal.ComponentGoods;
|
|
|
-import org.springframework.data.domain.Page;
|
|
|
-import org.springframework.util.CollectionUtils;
|
|
|
-
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
+import org.springframework.data.domain.Page;
|
|
|
+import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
/**
|
|
|
* 用于ERP与商城类的互转
|
|
|
@@ -27,6 +27,9 @@ import java.util.List;
|
|
|
*/
|
|
|
public class ModelConverter {
|
|
|
|
|
|
+ public static SimpleDateFormat dateFormat=new SimpleDateFormat("yy-MM-dd");
|
|
|
+ public static SimpleDateFormat timeFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
+
|
|
|
/**
|
|
|
* erp分段价格转 商城分段价格
|
|
|
*
|
|
|
@@ -196,7 +199,13 @@ public class ModelConverter {
|
|
|
productDetail.setMinPackQty(productDetailERP.getMinPackQty());
|
|
|
productDetail.setPackaging(productDetailERP.getPackaging());
|
|
|
productDetail.setPrice(productDetailERP.getPrice());
|
|
|
- productDetail.setProduceDate(productDetailERP.getProduceDate());
|
|
|
+ if (productDetailERP.getProduceDate() != null) {
|
|
|
+ try {
|
|
|
+ productDetail.setProduceDate(dateFormat.format(timeFormat.parse(productDetailERP.getProduceDate())));
|
|
|
+ } catch (Exception e) {
|
|
|
+ productDetail.setProduceDate(productDetailERP.getProduceDate());
|
|
|
+ }
|
|
|
+ }
|
|
|
// 暂时将ERP空闲库存放置在product中
|
|
|
// productDetail.setReserve(productDetailERP.getReserve());
|
|
|
productDetail.setCode(productDetailERP.getCode());
|