修改bug

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/seller/example/VendorExample.java

@@ -139,4 +139,8 @@ public class VendorExample implements Serializable {
      * gp系统用户token
      */
     private String gpToken;
+
+    private String storeUrlBy9710;
+
+    private String storeUrlBy9810;
 }

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/member/front/MemberFollowStoreController.java

@@ -20,8 +20,11 @@ import com.slodon.b2b2c.member.pojo.MemberFollowStore;
 import com.slodon.b2b2c.model.goods.GoodsModel;
 import com.slodon.b2b2c.model.member.MemberFollowStoreModel;
 import com.slodon.b2b2c.model.seller.StoreModel;
+import com.slodon.b2b2c.model.seller.StoreNameModel;
 import com.slodon.b2b2c.model.seller.StoreSiteInfoModel;
+import com.slodon.b2b2c.seller.example.StoreNameExample;
 import com.slodon.b2b2c.seller.pojo.Store;
+import com.slodon.b2b2c.seller.pojo.StoreName;
 import com.slodon.b2b2c.vo.member.FollowStoreVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -60,7 +63,9 @@ public class MemberFollowStoreController extends BaseController {
     private StoreModel storeModel;
     @Resource
     private StringRedisTemplate stringRedisTemplate;
-    @Autowired
+    @Resource
+    private StoreNameModel storeNameModel;
+    @Resource
     private StoreSiteInfoModel storeSiteInfoModel;
 
     @ApiOperation("关注/取消关注商铺")
@@ -97,7 +102,7 @@ public class MemberFollowStoreController extends BaseController {
     @GetMapping("list")
     public JsonResult<FollowStoreVO> getList(HttpServletRequest request) {
         Member member = UserUtil.getUser(request, Member.class);
-        String webSite = WebUtil.getWebSite( request);
+        String webSite = WebUtil.getWebSite(request);
         //根据条件查询集合
         MemberFollowStoreExample example = new MemberFollowStoreExample();
         example.setMemberId(member.getMemberId());
@@ -118,10 +123,15 @@ public class MemberFollowStoreController extends BaseController {
                 String serviceScore = store.getServiceScore();
                 Integer followNumber = store.getFollowNumber();
                 if (WebSiteConstant.MEMBER_DISTRIBUTOR.equals(webSite)){
+                    StoreNameExample storeNameExample =new StoreNameExample();
+                    storeNameExample.setStoreId(store.getStoreId());
+                    storeNameExample.setWebSite(webSite);
+                    StoreName storeName=storeNameModel.getStoreNameByExample(storeNameExample);
                     store = storeSiteInfoModel.getStoreByStoreIdAndWebSite(store.getStoreId(), WebSiteConstant.MEMBER_DISTRIBUTOR);
                     if (StringUtils.isEmpty(store.getStoreId())){
                         throw new MallException("店铺不存在");
                     }
+                    store.setStoreName(storeName != null ? storeName.getStoreName() : "");
                     store.setState(state);
                     store.setIsOwnStore(isOwnStore);
                     store.setServiceScore(serviceScore);

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/seller/admin/AdminStoreController.java

@@ -121,14 +121,16 @@ public class AdminStoreController extends BaseController {
                 vendorExample.setStoreId(store.getStoreId());
                 vendorExample.setIsStoreAdmin(VendorConst.IS_STORE_ADMIN_1);
                 List<Vendor> vendorList = vendorModel.getVendorList(vendorExample, null);
-                vo.setVendorName(vendorList.get(0).getVendorName());
-
-                //通过vendorId查询资质表获取联系人电话
-                StoreCertificateExample storeCertificateExample = new StoreCertificateExample();
-                storeCertificateExample.setVendorId(vendorList.get(0).getVendorId());
-                List<StoreCertificate> storeCertificateList = storeCertificateModel.getStoreCertificateList(storeCertificateExample, null);
-                if (!CollectionUtils.isEmpty(storeCertificateList)) {
-                    vo.setContactPhone(CommonUtil.dealMobile(storeCertificateList.get(0).getContactPhone()));
+                if (!CollectionUtils.isEmpty(vendorList)) {
+                    vo.setVendorName(vendorList.get(0).getVendorName());
+
+                    //通过vendorId查询资质表获取联系人电话
+                    StoreCertificateExample storeCertificateExample = new StoreCertificateExample();
+                    storeCertificateExample.setVendorId(vendorList.get(0).getVendorId());
+                    List<StoreCertificate> storeCertificateList = storeCertificateModel.getStoreCertificateList(storeCertificateExample, null);
+                    if (!CollectionUtils.isEmpty(storeCertificateList)) {
+                        vo.setContactPhone(CommonUtil.dealMobile(storeCertificateList.get(0).getContactPhone()));
+                    }
                 }
                 vos.add(vo);
             });

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/seller/seller/SellerApplyController.java

@@ -171,7 +171,7 @@ public class SellerApplyController extends BaseController {
         } else if (storeApplyList.get(0).getState() == StoreConst.STATE_3_FAIL_APPLY) {
             vo.setStateValue("您的店铺入驻审核未通过");
         } else {
-            vo.setStateValue("恭喜您成功入驻绿道云GPC2M出海营销平台");
+            vo.setStateValue("恭喜您成功入驻南京江北新区跨境出海服务营销平台");
         }
         return SldResponse.success(vo);
     }

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/seller/seller/SellerStoreProfileController.java

@@ -139,11 +139,11 @@ public class SellerStoreProfileController {
         storeProfileTextList.setWebSite(webSite);
         //查询店铺简介内容表里是否存在这笔数据
         StoreProfileTextList storeProfileTextInfo = storeProfileTextListModel.getList(vendor.getStoreId(),webSite);
-        if(storeProfileTextInfo!=null){//更新
+        if (storeProfileTextInfo != null) {//更新
             storeProfileTextList.setUpdateId(vendor.getVendorId());
             storeProfileTextList.setUpdateTime(new Date());
-            storeProfileTextListModel.updateProfileText(storeProfileTextList,vendor.getStoreId());
-        }else{
+            storeProfileTextListModel.updateProfileText(storeProfileTextList, vendor.getStoreId());
+        } else {
             storeProfileTextList.setStoreId(vendor.getStoreId());
             storeProfileTextList.setCreateId(vendor.getVendorId());
             storeProfileTextList.setCreateTime(new Date());
@@ -163,7 +163,7 @@ public class SellerStoreProfileController {
 //        Store store = storeModel.getStoreByStoreId(vendor.getStoreId());
         StoreProfileTextVo storeProfileTextVo = new StoreProfileTextVo();
         //查询店铺简介内容表里是否存在这笔数据
-        StoreProfileTextList storeProfileTextInfo = storeProfileTextListModel.getList(vendor.getStoreId(),webSite);
+        StoreProfileTextList storeProfileTextInfo = storeProfileTextListModel.getList(vendor.getStoreId(), webSite);
         if(storeProfileTextInfo!=null){
             storeProfileTextVo.setContent(storeProfileTextInfo.getContent());
             storeProfileTextVo.setWebSite(storeProfileTextInfo.getWebSite());

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/seller/StoreProfileTextListModel.java

@@ -36,8 +36,7 @@ public class StoreProfileTextListModel {
     public StoreProfileTextList getList(Long storeId,String webSite){
         StoreProfileTextList storeProfileTextList = null;
         StoreProfileTextListExample storeProfileTextListExample = new StoreProfileTextListExample();
-        storeProfileTextListExample.createCriteria().andStoreIdEqualTo(storeId);
-        storeProfileTextListExample.createCriteria().andWebSiteEqualTo(webSite);
+        storeProfileTextListExample.createCriteria().andStoreIdEqualTo(storeId).andWebSiteEqualTo(webSite);
         List<StoreProfileTextList> storeProfileTextInfoList = storeProfileTextListReadMapper.selectByExample(storeProfileTextListExample);
         if(!CollectionUtils.isEmpty(storeProfileTextInfoList)){
             storeProfileTextList = storeProfileTextInfoList.get(NumConstant.ZERO);
@@ -52,8 +51,7 @@ public class StoreProfileTextListModel {
      */
     public Integer updateProfileText(StoreProfileTextList storeProfileTextList,Long storeId){
         StoreProfileTextListExample storeProfileTextListExample = new StoreProfileTextListExample();
-        storeProfileTextListExample.createCriteria().andStoreIdEqualTo(storeId);
-        storeProfileTextListExample.createCriteria().andWebSiteEqualTo(storeProfileTextList.getWebSite());
+        storeProfileTextListExample.createCriteria().andStoreIdEqualTo(storeId).andWebSiteEqualTo(storeProfileTextList.getWebSite());
         int count = storeProfileTextListWriteMapper.updateByExampleSelective(storeProfileTextList,storeProfileTextListExample);
         if(count==0){
             throw new MallException("更新店铺简介内容表失败,请重试");

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/member/MemberEnquiryReadMapper.xml

@@ -67,6 +67,8 @@
                     AND (
                     `name` like concat('%',#{example.keyword},'%')
                     or `email` like concat('%',#{example.keyword},'%')
+                    or `phone` like concat('%',#{example.keyword},'%')
+                    or `phone_code` like concat('%',#{example.keyword},'%')
                     or `company` like concat('%',#{example.keyword},'%')
                     or `message` like concat('%',#{example.keyword},'%')
                     )

xinkeaboard-server/doc/DDL/update.sql

@@ -351,6 +351,10 @@ ALTER TABLE vendor ADD COLUMN store_url_by9710 VARCHAR(1000)  DEFAULT NULL COMME
 
 ALTER TABLE vendor ADD COLUMN store_url_by9810 VARCHAR(1000)  DEFAULT NULL COMMENT '9810模块url' AFTER store_url_by9710;
 
+update sys_setting set description='建议上传宽1920*高750的图片' where name in ('main_user_logon_bg','main_user_logon_bg_2','main_user_register_bg','main_user_register_bg_2','main_user_forget_password_bg','main_user_forget_password_bg_2');
+
+update sys_setting set `value`='1' where name = 'verification_code_check_is_enable';
+