czg_team/merge_data
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

商品 逻辑删除

Browse Source 
店铺 类型
就餐模式
This commit is contained in:
wangw
2025-03-24 20:46:14 +08:00
parent ee2cfad6c4
commit 95385b8c26
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/czg/mergedata/cur/service/impl/CurProductServiceImpl.java
View File

@@ -86,7 +86,7 @@ public class CurProductServiceImpl extends ServiceImpl<CurProductMapper, CurProd
curProduct.setStockNumber(oldProduct.getStockNumber()); curProduct.setStockNumber(oldProduct.getStockNumber());
curProduct.setIsRefundStock(oldProduct.getIsRefundStock()); curProduct.setIsRefundStock(oldProduct.getIsRefundStock());
curProduct.setCreateTime(DateUtil.toLocalDateTime(oldProduct.getCreatedAt() == null ? new Date() : new Date(oldProduct.getCreatedAt()))); 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); productList.add(curProduct);
} }
@@ -98,6 +98,9 @@ public class CurProductServiceImpl extends ServiceImpl<CurProductMapper, CurProd
private String getProductType(OldProduct oldProduct) { private String getProductType(OldProduct oldProduct) {
String type = oldProduct.getType(); String type = oldProduct.getType();
if ("weigh".equals(type) || "weight".equals(type)) {
return "weight";
}
if (!"normal".equals(type)) { if (!"normal".equals(type)) {
return type; return type;
} }

4
src/main/java/com/czg/mergedata/cur/service/impl/CurSysUserServiceImpl.java
View File

@@ -121,7 +121,7 @@ public class CurSysUserServiceImpl extends ServiceImpl<CurSysUserMapper, CurSysU
curShopInfo.setLogo(oldShopInfo.getLogo()); curShopInfo.setLogo(oldShopInfo.getLogo());
curShopInfo.setCoverImg(oldShopInfo.getCoverImg()); curShopInfo.setCoverImg(oldShopInfo.getCoverImg());
curShopInfo.setDetail(oldShopInfo.getDetail()); curShopInfo.setDetail(oldShopInfo.getDetail());
curShopInfo.setRegisterType(oldShopInfo.getRegisterType()); curShopInfo.setRegisterType("before");
curShopInfo.setShopType(oldShopInfo.getType()); curShopInfo.setShopType(oldShopInfo.getType());
curShopInfo.setTubeType(oldShopInfo.getTubeType()); curShopInfo.setTubeType(oldShopInfo.getTubeType());
curShopInfo.setBusinessStartDay(oldShopInfo.getBusinessStartDay()); curShopInfo.setBusinessStartDay(oldShopInfo.getBusinessStartDay());
@@ -147,7 +147,7 @@ public class CurSysUserServiceImpl extends ServiceImpl<CurSysUserMapper, CurSysU
curShopInfo.setIsMemberPrice(oldShopInfo.getIsMemberPrice()); curShopInfo.setIsMemberPrice(oldShopInfo.getIsMemberPrice());
curShopInfo.setIsAccountPay(oldShopInfo.getIsUseVip() == null ? 0 : oldShopInfo.getIsUseVip()); curShopInfo.setIsAccountPay(oldShopInfo.getIsUseVip() == null ? 0 : oldShopInfo.getIsUseVip());
curShopInfo.setConsumeColony(oldShopInfo.getConsumeColony()); curShopInfo.setConsumeColony(oldShopInfo.getConsumeColony());
curShopInfo.setEatModel(oldShopInfo.getEatModel()); curShopInfo.setEatModel(oldShopInfo.getEatModel().replaceAll("\"","").replaceAll("\\[","").replaceAll("]",""));
curShopInfo.setSmallQrcode(oldShopInfo.getSmallQrcode()); curShopInfo.setSmallQrcode(oldShopInfo.getSmallQrcode());
curShopInfo.setPaymentQrcode(oldShopInfo.getPaymentQrcode()); curShopInfo.setPaymentQrcode(oldShopInfo.getPaymentQrcode());
curShopInfo.setBookingSms(oldShopInfo.getBookingSms()); curShopInfo.setBookingSms(oldShopInfo.getBookingSms());