商品 逻辑删除
店铺 类型 就餐模式
This commit is contained in:
@@ -86,7 +86,7 @@ public class CurProductServiceImpl extends ServiceImpl<CurProductMapper, CurProd
|
||||
curProduct.setStockNumber(oldProduct.getStockNumber());
|
||||
curProduct.setIsRefundStock(oldProduct.getIsRefundStock());
|
||||
curProduct.setCreateTime(DateUtil.toLocalDateTime(oldProduct.getCreatedAt() == null ? new Date() : new Date(oldProduct.getCreatedAt())));
|
||||
curProduct.setIsDel(oldProduct.getIsDel());
|
||||
curProduct.setIsDel(oldProduct.getStatus() == 1 ? 0 : 1);
|
||||
|
||||
productList.add(curProduct);
|
||||
}
|
||||
@@ -98,6 +98,9 @@ public class CurProductServiceImpl extends ServiceImpl<CurProductMapper, CurProd
|
||||
|
||||
private String getProductType(OldProduct oldProduct) {
|
||||
String type = oldProduct.getType();
|
||||
if ("weigh".equals(type) || "weight".equals(type)) {
|
||||
return "weight";
|
||||
}
|
||||
if (!"normal".equals(type)) {
|
||||
return type;
|
||||
}
|
||||
|
||||
@@ -121,7 +121,7 @@ public class CurSysUserServiceImpl extends ServiceImpl<CurSysUserMapper, CurSysU
|
||||
curShopInfo.setLogo(oldShopInfo.getLogo());
|
||||
curShopInfo.setCoverImg(oldShopInfo.getCoverImg());
|
||||
curShopInfo.setDetail(oldShopInfo.getDetail());
|
||||
curShopInfo.setRegisterType(oldShopInfo.getRegisterType());
|
||||
curShopInfo.setRegisterType("before");
|
||||
curShopInfo.setShopType(oldShopInfo.getType());
|
||||
curShopInfo.setTubeType(oldShopInfo.getTubeType());
|
||||
curShopInfo.setBusinessStartDay(oldShopInfo.getBusinessStartDay());
|
||||
@@ -147,7 +147,7 @@ public class CurSysUserServiceImpl extends ServiceImpl<CurSysUserMapper, CurSysU
|
||||
curShopInfo.setIsMemberPrice(oldShopInfo.getIsMemberPrice());
|
||||
curShopInfo.setIsAccountPay(oldShopInfo.getIsUseVip() == null ? 0 : oldShopInfo.getIsUseVip());
|
||||
curShopInfo.setConsumeColony(oldShopInfo.getConsumeColony());
|
||||
curShopInfo.setEatModel(oldShopInfo.getEatModel());
|
||||
curShopInfo.setEatModel(oldShopInfo.getEatModel().replaceAll("\"","").replaceAll("\\[","").replaceAll("]",""));
|
||||
curShopInfo.setSmallQrcode(oldShopInfo.getSmallQrcode());
|
||||
curShopInfo.setPaymentQrcode(oldShopInfo.getPaymentQrcode());
|
||||
curShopInfo.setBookingSms(oldShopInfo.getBookingSms());
|
||||
|
||||
Reference in New Issue
Block a user