yaozhixue 1 year ago
parent
commit
ed5af69e66

+ 4 - 3
src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPGFWebsitServiceImpl.java

@@ -319,6 +319,7 @@ public class GLPPGFWebsitServiceImpl implements GLPPGFWebsitService {
                 v.setUpdateBy("system");
                 v.setCreateTime(new Date());
                 v.setUpdateTime(new Date());
+                v.setSplb(","+item.getSplb()+",");
 
                 // 操作人
                 if (!StringUtils.isEmpty(item.getCzren())){
@@ -516,8 +517,8 @@ public class GLPPGFWebsitServiceImpl implements GLPPGFWebsitService {
                 }
                 if (!StringUtils.isEmpty(old.getSplb()) || !StringUtils.isEmpty(item.getSplb())){
                     if (!StringUtils.isEmpty(old.getSplb()) && !StringUtils.isEmpty(item.getSplb())){
-                        if (!old.getSplb().equals(item.getSplb())){
-                            old.setSplb(item.getSplb());
+                        if (!old.getSplb().equals(","+item.getSplb()+",")){
+                            old.setSplb(","+item.getSplb()+",");
                             // 提取品类名称
                             StringBuffer splbmc = getStringBuffer(oldSysDictRecMap, item.getSplb());
                             old.setSplbmc(splbmc.toString());
@@ -526,7 +527,7 @@ public class GLPPGFWebsitServiceImpl implements GLPPGFWebsitService {
                     } else {
                         flag = Boolean.TRUE;
                         if (!StringUtils.isEmpty(item.getSplb())) {
-                            old.setSplb(item.getSplb());
+                            old.setSplb(","+item.getSplb()+",");
                         } else {
                             old.setSplb("");
                         }

+ 2 - 2
src/main/java/com/zfire/jiasm/syncdata/service/impl/PublicServiceImpl.java

@@ -672,8 +672,8 @@ public class PublicServiceImpl implements PublicService {
             for (CustomerInformationWebsit item:cIWebsitList) {
                 BrandWebsit bw = brandWebsitService.lambdaQuery()
                         .eq(BrandWebsit::getGroupCompanyId, item.getGroupCompanyId())
-                        .eq(BrandWebsit::getSplb,category)
                         .eq(BrandWebsit::getBrandWebsitNumber, item.getRefWebsitId())
+                        .like(BrandWebsit::getSplb,"%,"+category+",%")
                         .last("limit 1")
                         .one();
                 if (bw != null) {
@@ -717,8 +717,8 @@ public class PublicServiceImpl implements PublicService {
             // 多记录时根据商户网点服务的产品大类是否满足订单的大类(category) 进行取舍
             for (WebsitOrderSign item : wos) {
                 BrandWebsit bw = brandWebsitService.lambdaQuery()
-                        .eq(BrandWebsit::getSplb, category)
                         .eq(BrandWebsit::getBrandWebsitNumber, item.getBrandWebsitId())
+                        .like(BrandWebsit::getSplb,"%,"+category+",%")
                         .last("limit 1")
                         .one();
                 if (bw != null) {