Compare commits
No commits in common. "079685b766f0d142b8ed935fe1760ce8559032d5" and "11eb0165ce1091a2bf4dd723135c7de1e1c98bb0" have entirely different histories.
079685b766
...
11eb0165ce
@ -97,8 +97,6 @@ public class SxGoosModel {
|
|||||||
@ApiModelProperty("商品图片库")
|
@ApiModelProperty("商品图片库")
|
||||||
private List<ProductImage> product_images;
|
private List<ProductImage> product_images;
|
||||||
|
|
||||||
@ApiModelProperty("是否特价商品,0否,1是")
|
|
||||||
private String isSpecial;
|
|
||||||
|
|
||||||
@ApiModelProperty("商品详情")
|
@ApiModelProperty("商品详情")
|
||||||
private List<PromotionDetail> promotion_detail;
|
private List<PromotionDetail> promotion_detail;
|
||||||
|
|||||||
@ -172,7 +172,7 @@ public abstract class SxDataAbstService {
|
|||||||
sxGoosModel.setProduct_images(new ArrayList<>());//介绍图片 todo
|
sxGoosModel.setProduct_images(new ArrayList<>());//介绍图片 todo
|
||||||
|
|
||||||
sxGoosModel.setPromotion_detail(new ArrayList<>());//活动列表 todo
|
sxGoosModel.setPromotion_detail(new ArrayList<>());//活动列表 todo
|
||||||
sxGoosModel.setIsSpecial("0");
|
|
||||||
SxGoosModel finalSxGoosModel = sxGoosModel;
|
SxGoosModel finalSxGoosModel = sxGoosModel;
|
||||||
specPriceDtoList.forEach(m->{
|
specPriceDtoList.forEach(m->{
|
||||||
if(sxSyncGood.getItem_no().equals(m.getItemNo())){
|
if(sxSyncGood.getItem_no().equals(m.getItemNo())){
|
||||||
@ -184,7 +184,6 @@ public abstract class SxDataAbstService {
|
|||||||
if(type.equals("2")){
|
if(type.equals("2")){
|
||||||
finalSxGoosModel.setPrice(finalSxGoosModel.getPrice().multiply(m.getDiscount()));
|
finalSxGoosModel.setPrice(finalSxGoosModel.getPrice().multiply(m.getDiscount()));
|
||||||
}
|
}
|
||||||
finalSxGoosModel.setIsSpecial("1");
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
sxGoosModelList.add(sxGoosModel);
|
sxGoosModelList.add(sxGoosModel);
|
||||||
|
|||||||
@ -142,9 +142,6 @@ public class ShopProductBase implements Serializable{
|
|||||||
@TableField(updateStrategy=NOT_EMPTY)
|
@TableField(updateStrategy=NOT_EMPTY)
|
||||||
private BigDecimal shop_weight;
|
private BigDecimal shop_weight;
|
||||||
|
|
||||||
@ApiModelProperty("是否特价商品,0否,1是")
|
|
||||||
private String is_special;
|
|
||||||
|
|
||||||
@ApiModelProperty(value = "单价")
|
@ApiModelProperty(value = "单价")
|
||||||
@TableField(updateStrategy=NOT_EMPTY)
|
@TableField(updateStrategy=NOT_EMPTY)
|
||||||
private BigDecimal unit_price;
|
private BigDecimal unit_price;
|
||||||
|
|||||||
@ -573,7 +573,6 @@ public abstract class SyncBaseThirdSxAbstract{
|
|||||||
shopProductBase.setProduct_from(1005);// 商品来源(ENUM):1000-发布;1001-天猫;1002-淘宝;1003-阿里巴巴;1004-京东;1005-思迅;
|
shopProductBase.setProduct_from(1005);// 商品来源(ENUM):1000-发布;1001-天猫;1002-淘宝;1003-阿里巴巴;1004-京东;1005-思迅;
|
||||||
shopProductBase.setProduct_add_time(currentDate.getTime());
|
shopProductBase.setProduct_add_time(currentDate.getTime());
|
||||||
shopProductBase.setProduct_unit_price(BigDecimal.valueOf(jsonObj.getDouble("retail_price")));
|
shopProductBase.setProduct_unit_price(BigDecimal.valueOf(jsonObj.getDouble("retail_price")));
|
||||||
shopProductBase.setIs_special(jsonObj.getStr("isSpecial"));//是否特价商品
|
|
||||||
//商品总量
|
//商品总量
|
||||||
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"))){
|
&& "KG,kg,公斤".contains(jsonObj.getStr("unit"))){
|
||||||
|
|||||||
@ -1,2 +0,0 @@
|
|||||||
alter table shop_product_base add column `is_special` varchar(2) NOT NULL DEFAULT '0' COMMENT '是否特价商品,0否,1是';
|
|
||||||
alter table shop_product_base add index `is_special` (`is_special`) USING BTREE;
|
|
||||||
Loading…
Reference in New Issue
Block a user