feat: 完善下载报告功能

xinkeaboard-seller/src/pages/settledManage/openUp/open_up.js

@@ -318,7 +318,7 @@ export default class openUp extends Component {
             <div className={`${styles.check_fail_wrap} ${global.flex_column_center_center}`}>
               <p>{sldComLanguage('审核未通过原因：')}{apply_progress.refuseReason}</p>
               {apply_progress.auditInfo && <p>{sldComLanguage('备注：')}{apply_progress.auditInfo}</p>}
-              <p>{sldComLanguage('您可以修改信息后重新上传或联系绿道云的客服人员。')}</p>
+              <p>{sldComLanguage('您可以修改信息后重新上传或联系平台的客服人员。')}</p>
             </div>
             }
 

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/member/advich/AdminEnquiryReceiverMailSettingModel.java

@@ -41,13 +41,13 @@ public class AdminEnquiryReceiverMailSettingModel {
         Admin admin = UserUtil.getUser(request, Admin.class);
 
         AdminEnquiryReceiveMailSettingExample adminEnquiryReceiveMailSettingExample = new AdminEnquiryReceiveMailSettingExample();
-        adminEnquiryReceiveMailSettingExample.setWebSite(adminEnquiryReceiveMailSettingExample.getWebSite());
+        adminEnquiryReceiveMailSettingExample.setWebSite(adminEnquiryReceiveMailSetting.getWebSite());
         adminEnquiryReceiveMailSettingExample.setEmail(adminEnquiryReceiveMailSetting.getEmail());
         List<AdminEnquiryReceiveMailSetting> adminEnquiryReceiveMailSettings = adminEnquiryReceiveMailSettingReadMapper.listByExample(adminEnquiryReceiveMailSettingExample);
         AssertUtil.isTrue(!CollectionUtil.isEmpty(adminEnquiryReceiveMailSettings), "该邮箱已添加，无需重复添加");
 
         AdminEnquiryReceiveMailSettingExample adminEnquiryPhoneMailSettingExample = new AdminEnquiryReceiveMailSettingExample();
-        adminEnquiryPhoneMailSettingExample.setWebSite(adminEnquiryReceiveMailSettingExample.getWebSite());
+        adminEnquiryPhoneMailSettingExample.setWebSite(adminEnquiryReceiveMailSetting.getWebSite());
         adminEnquiryPhoneMailSettingExample.setPhone(adminEnquiryReceiveMailSetting.getPhone());
         List<AdminEnquiryReceiveMailSetting> adminEnquiryPhoneMailSettings = adminEnquiryReceiveMailSettingReadMapper.listByExample(adminEnquiryPhoneMailSettingExample);
         AssertUtil.isTrue(!CollectionUtil.isEmpty(adminEnquiryPhoneMailSettings), "该手机号已添加，无需重复添加");
@@ -71,14 +71,14 @@ public class AdminEnquiryReceiverMailSettingModel {
         Admin admin = UserUtil.getUser(request, Admin.class);
 
         AdminEnquiryReceiveMailSettingExample adminEnquiryReceiveMailSettingExample = new AdminEnquiryReceiveMailSettingExample();
-        adminEnquiryReceiveMailSettingExample.setWebSite(adminEnquiryReceiveMailSettingExample.getWebSite());
+        adminEnquiryReceiveMailSettingExample.setWebSite(adminEnquiryReceiveMailSetting.getWebSite());
         adminEnquiryReceiveMailSettingExample.setEmail(adminEnquiryReceiveMailSetting.getEmail());
         adminEnquiryReceiveMailSettingExample.setIdNotEqualTo(adminEnquiryReceiveMailSetting.getId());
         List<AdminEnquiryReceiveMailSetting> adminEnquiryReceiveMailSettings = adminEnquiryReceiveMailSettingReadMapper.listByExample(adminEnquiryReceiveMailSettingExample);
         AssertUtil.isTrue(!CollectionUtil.isEmpty(adminEnquiryReceiveMailSettings), "该邮箱已添加，无需重复添加");
 
         AdminEnquiryReceiveMailSettingExample adminEnquiryPhoneMailSettingExample = new AdminEnquiryReceiveMailSettingExample();
-        adminEnquiryPhoneMailSettingExample.setWebSite(adminEnquiryReceiveMailSettingExample.getWebSite());
+        adminEnquiryPhoneMailSettingExample.setWebSite(adminEnquiryReceiveMailSetting.getWebSite());
         adminEnquiryPhoneMailSettingExample.setPhone(adminEnquiryReceiveMailSetting.getPhone());
         adminEnquiryPhoneMailSettingExample.setIdNotEqualTo(adminEnquiryReceiveMailSetting.getId());
         List<AdminEnquiryReceiveMailSetting> adminEnquiryPhoneMailSettings = adminEnquiryReceiveMailSettingReadMapper.listByExample(adminEnquiryPhoneMailSettingExample);

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/seller/StoreApplyVO.java

@@ -79,7 +79,7 @@ public class StoreApplyVO {
                 value = "待审核";
                 break;
             case StoreConst.STATE_2_DONE_APPLY:
-                value = "待审核";
+                value = "审核通过";
                 break;
             case StoreConst.STATE_3_FAIL_APPLY:
                 value = "已拒绝";

xinkeaboard-server/b2b2c-web/src/main/resources/application-dev.yml

@@ -58,8 +58,8 @@ geoip:
 #dataforseo外部接口
 analysis:
   translateAddress: http://54.46.9.88:8007
-  loginUser: metaljacket@meshinfo.cn
-  password: d088821c1d6863ec
+  loginUser: advichdev@gmail.com
+  password: Admin@123.com
   searchVolume: https://api.dataforseo.com/v3/keywords_data/google/search_volume/live
   keywordsForSite: https://api.dataforseo.com/v3/keywords_data/google_ads/keywords_for_site/live
   KeywordForSuggestions: https://api.dataforseo.com/v3/dataforseo_labs/google/keyword_suggestions/live
@@ -70,6 +70,7 @@ analysis:
 dify:
   apiKey: dataset-t2bq146uJwJj00kxVyfOOWua
   difyRoute: http://52.42.176.27/v1/datasets/
+  databaseId: 20b6bddd-c07d-4302-80f5-195080f8958f
 
 #创建/获取商户订单URL
 store: