From 95385b8c26ab5c6acec105e0ac19b729b2881a80 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 24 Mar 2025 20:46:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=20=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=20=E5=BA=97=E9=93=BA=20=E7=B1=BB=E5=9E=8B=20?=
 =?UTF-8?q?=E5=B0=B1=E9=A4=90=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mergedata/cur/service/impl/CurProductServiceImpl.java    | 5 ++++-
 .../mergedata/cur/service/impl/CurSysUserServiceImpl.java    | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/czg/mergedata/cur/service/impl/CurProductServiceImpl.java b/src/main/java/com/czg/mergedata/cur/service/impl/CurProductServiceImpl.java
index adc11cb..5a02852 100644
--- a/src/main/java/com/czg/mergedata/cur/service/impl/CurProductServiceImpl.java
+++ b/src/main/java/com/czg/mergedata/cur/service/impl/CurProductServiceImpl.java
@@ -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;
         }
diff --git a/src/main/java/com/czg/mergedata/cur/service/impl/CurSysUserServiceImpl.java b/src/main/java/com/czg/mergedata/cur/service/impl/CurSysUserServiceImpl.java
index 0e288fd..4a2298c 100644
--- a/src/main/java/com/czg/mergedata/cur/service/impl/CurSysUserServiceImpl.java
+++ b/src/main/java/com/czg/mergedata/cur/service/impl/CurSysUserServiceImpl.java
@@ -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());