fix: 修复专题装修banner展示问题

xinkeaboard-server/b2b2c-core/src/main/java/com/slodon/b2b2c/core/util/AssertUtil.java

@@ -160,7 +160,7 @@ public class AssertUtil {
         Pattern regex = Pattern.compile(check);
         Matcher matcher = regex.matcher(email);
         if (!matcher.matches()) {
-            throw new MallException(Language.translate("请输入正确的邮箱",Language.EN_LANGUAGE_TYPE));
+            throw new MallException("请输入正确的邮箱",Language.EN_LANGUAGE_TYPE);
         }
     }
 

xinkeaboard-server/b2b2c-core/src/main/resources/i18n_en.properties

@@ -771,7 +771,7 @@ invoiceIds格式错误,请重试=invoiceIds format error, please try again
 请输入正确的邮箱=Please enter the correct email address
 请输入新的邮箱=Please enter the new email address
 请输入新的手机号=
-请输入正确的手机号=
+请输入正确的手机号=Please enter the correct mobile number
 新密码与原密码不能一样=The new password and password can not be the same as the original
 原密码不对,请重新输入=Original password wrong, please re-enter
 修改登录密码成功=Modify password successfully
@@ -2181,9 +2181,7 @@ IOS=
 退款提醒=
 退货自动处理提醒=
 退款自动处理提醒=
-商品被违规下架=
 商品库存预警=
-商品审核失败=
 结算单已经付款提醒=
 结算单等待确认提醒=
 平台银行开户名=
@@ -2522,6 +2520,7 @@ pc端注册页面logo=
 榜单不存在=
 榜单分类不存在=
 该邮箱已注册，请登录=This email has been registered, please log in
+该手机号已注册，请登录=This phone number has been registered, please log in
 邮件不能为空=Email cannot be empty
 手机号码不能为空=Phone number cannot be empty
 验证码不能为空=Verification cannot be empty
@@ -2536,6 +2535,7 @@ pc端注册页面logo=
 注册链接不正确，请重新注册=The registration link is incorrect, please register again
 密码不一致，请重新输入=Passwords do not match. Please reenter
 会员邮箱不存在，请重新注册=Member email does not exist, please re register
+会员邮箱已激活，无需重复注册，请登录=Member email has been activated, no need to re register, please log in
 会员手机号不存在，请重新注册=Member phone number does not exist, please re register
 会员账号已激活，无需重复注册，请登录=Member account has been activated, no need to re register, please log in
 注册链接激活码已失效，请重新注册=The registration link activation code has expired, please re register
@@ -2545,6 +2545,9 @@ pc端注册页面logo=
 发送重置密码邮件失败，请重试=Failed to send the reset password email. Please try again
 该邮箱未激活，请先激活=This mail is not activated, please activate it first
 该邮箱未注册，请先注册=This email is not registered, please register first
+该手机号未激活，请先激活=This phone number is not activated, please activate it first
+该手机号未注册，请先注册=This phone number is not registered, please register first
+该手机号不存在，请先注册=This phone number does not exist, please register first
 重置密码链接已发送=Reset password link sent 
 重置密码链接不正确，请重新获取忘记密码链接=The reset password link is incorrect. Please obtain the forgotten password link again
 该邮箱不存在，请先注册=The mail does not exist, please register first
@@ -2597,4 +2600,8 @@ pc端注册页面logo=
 感谢您注册成为${URL}的明星买家。明星买家是${URL}上的特殊买家。=Thank you for registering and becoming a Star Buyer of ${URL}. Star Buyer is a special buyer status on ${URL}.
 您可以通过您的电子邮件地址登录您的${URL}帐户：=You can sign into your ${URL} account with your email address:
 在${URL}上寻找供应商既快捷又方便。凭借我们提供的独家明星买家福利和有用工具，您的采购之旅将变得更安全、更容易、更高效!=Finding suppliers on ${URL} is quick and easy. And with exclusive Star Buyer benefits and useful tools we offer, your sourcing journey will become safer, easier, and more efficient!
-注册成功=Registered Successfully
+注册成功=Registered Successfully
+不支持的站点类型=Unsupported site type
+新询盘提醒=enquiry_reminder
+商品审核失败=goods_audit_failure_reminder
+商品被违规下架=goods_violation_off_shelf_reminder

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/member/dto/MemberUpdateLoginPwdDTO.java

@@ -14,6 +14,9 @@ public class MemberUpdateLoginPwdDTO {
     @ApiModelProperty( value = "邮箱",required = false)
     private String memberEmail;
 
+    @ApiModelProperty( value = "手机号",required = false)
+    private String memberMobile;
+
     @ApiModelProperty( value = "验证码",required = false)
     private String verifyCode;
 }

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/goods/front/FrontGoodsCategoryController.java

@@ -320,7 +320,7 @@ public class FrontGoodsCategoryController extends BaseController {
             needDefaultCategoryId = true;
         } else {
             GoodsCategory goodsCategory = goodsCategoryModel.getGoodsCategoryByCategoryId(categoryId);
-            AssertUtil.notNull(goodsCategory, Language.translate("获取分类信息为空",Language.EN_LANGUAGE_TYPE));
+            AssertUtil.notNull(goodsCategory,"获取分类信息为空");
             if (goodsCategory.getGrade() != GoodsCategoryConst.CATEGORY_GRADE_3) {
                 //传了分类id，但不是三级分类
                 needDefaultCategoryId = true;
@@ -337,7 +337,7 @@ public class FrontGoodsCategoryController extends BaseController {
             return SldResponse.success(vo);
         }
         GoodsCategory goodsCategory = goodsCategoryModel.getGoodsCategoryByCategoryId(categoryId);
-        AssertUtil.notNull(goodsCategory, Language.translate("获取分类信息为空",Language.EN_LANGUAGE_TYPE));
+        AssertUtil.notNull(goodsCategory, "获取分类信息为空");
 
         GoodsCategoryExample example = new GoodsCategoryExample();
         example.setState(GoodsCategoryConst.CATEGORY_STATE_1);
@@ -360,7 +360,7 @@ public class FrontGoodsCategoryController extends BaseController {
         if (!CollectionUtils.isEmpty(categoryBindBrandList)) {
             categoryBindBrandList.forEach(categoryBindBrand -> {
                 GoodsBrand goodsBrand = goodsBrandModel.getGoodsBrandByBrandId(categoryBindBrand.getBrandId());
-                AssertUtil.notNull(goodsBrand, Language.translate("品牌不存在",Language.EN_LANGUAGE_TYPE));
+                AssertUtil.notNull(goodsBrand, "品牌不存在");
                 brandVOS.add(new GoodsScreenListVO.BrandVO(goodsBrand));
             });
         }
@@ -387,7 +387,7 @@ public class FrontGoodsCategoryController extends BaseController {
                 GoodsAttributeValueExample valueExample = new GoodsAttributeValueExample();
                 valueExample.setAttributeId(goodsAttribute.getAttributeId());
                 List<GoodsAttributeValue> attributeValueList = goodsAttributeValueModel.getGoodsAttributeValueList(valueExample, null);
-                AssertUtil.notEmpty(attributeValueList, Language.translate("属性值不存在",Language.EN_LANGUAGE_TYPE));
+                AssertUtil.notEmpty(attributeValueList, "属性值不存在");
                 List<GoodsScreenListVO.AttributeVO.AttributeValueVO> valueVOS = new ArrayList<>();
                 attributeValueList.forEach(attributeValue -> {
                     valueVOS.add(new GoodsScreenListVO.AttributeVO.AttributeValueVO(attributeValue.getValueId(), attributeValue.getAttributeValue()));

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/goods/front/GoodsDetailsController.java

@@ -113,7 +113,7 @@ public class GoodsDetailsController extends BaseController {
     @GetMapping("details")
     public JsonResult<GoodsFrontDetailVO> getGoodsDetails1(HttpServletRequest request, Long productId) {
         Product product = productModel.getProductByProductId(productId);
-        AssertUtil.notNull(product, Language.translate("货品不存在，请重试！",Language.EN_LANGUAGE_TYPE));
+        AssertUtil.notNull(product, "货品不存在，请重试！");
         Long goodsId = product.getGoodsId();
         //从redis中查询缓存数据
         Object goodsDetail = objectRedisTemplate.opsForHash().get(RedisConst.GOODS_DETAIL, String.valueOf(goodsId));
@@ -126,9 +126,9 @@ public class GoodsDetailsController extends BaseController {
 
         //缓存不存在，查库并缓存
         Goods goods = goodsModel.getGoodsByGoodsId(goodsId);
-        AssertUtil.notNull(goods, Language.translate("商品不存在，请重试！",Language.EN_LANGUAGE_TYPE));
+        AssertUtil.notNull(goods, "商品不存在，请重试！");
         GoodsExtend goodsExtend = goodsExtendModel.getGoodsExtendByGoodsId(goodsId);
-        AssertUtil.notNull(goodsExtend, Language.translate("商品不存在，请重试！",Language.EN_LANGUAGE_TYPE));
+        AssertUtil.notNull(goodsExtend, "商品不存在，请重试！");
 
         SysSeoVO sysSeoVO = storeModel.getRecordByTargetIdAndTypeForGoodsDetail(goodsId, SeoTypeConstant.SEO_TYPE_GOODS);
 
@@ -233,13 +233,13 @@ public class GoodsDetailsController extends BaseController {
     @GetMapping("details2")
     public JsonResult<GoodsFrontDetailVO> getGoodsDetails2(HttpServletRequest request, Long productId) {
         Product product = productModel.getProductByProductId(productId);
-        AssertUtil.notNull(product, Language.translate("货品不存在，请重试！",Language.EN_LANGUAGE_TYPE));
+        AssertUtil.notNull(product, "货品不存在，请重试！");
         Long goodsId = product.getGoodsId();
 
         Goods goods = goodsModel.getGoodsByGoodsId(goodsId);
-        AssertUtil.notNull(goods, Language.translate("商品不存在，请重试！",Language.EN_LANGUAGE_TYPE));
+        AssertUtil.notNull(goods, "商品不存在，请重试！");
         GoodsExtend goodsExtend = goodsExtendModel.getGoodsExtendByGoodsId(goodsId);
-        AssertUtil.notNull(goodsExtend,  Language.translate("商品不存在，请重试！",Language.EN_LANGUAGE_TYPE));
+        AssertUtil.notNull(goodsExtend,  "商品不存在，请重试！");
 
         //seo
         SysSeoVO sysSeoVO = storeModel.getRecordByTargetIdAndTypeForGoodsDetail(goodsId, SeoTypeConstant.SEO_TYPE_GOODS);
@@ -344,9 +344,9 @@ public class GoodsDetailsController extends BaseController {
     public JsonResult<ProductInfoVO> getProductInfo(HttpServletRequest request, Long goodsId, String specValueIds) {
         //获得货品信息 包含某规格商品的库存及价格信息
         Goods goods = goodsModel.getGoodsByGoodsId(goodsId);
-        AssertUtil.notNull(goods, Language.translate("商品不存在，请重试！",Language.EN_LANGUAGE_TYPE));
+        AssertUtil.notNull(goods, "商品不存在，请重试！");
         GoodsExtend goodsExtend = goodsExtendModel.getGoodsExtendByGoodsId(goodsId);
-        AssertUtil.notNull(goodsExtend, Language.translate("未查询到货品，请重试！",Language.EN_LANGUAGE_TYPE));
+        AssertUtil.notNull(goodsExtend, "未查询到货品，请重试！");
         //查询所有有效规格
         ProductExample productExample = new ProductExample();
         productExample.setGoodsId(goodsId);

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/goods/front/GoodsListController.java

@@ -191,10 +191,10 @@ public class GoodsListController extends BaseController {
             }
             return SldResponse.success(new PageVO<>(vos, pager));
         } else if ("goods".equals(queryType)) {
-            AssertUtil.notNullOrZero(productId, Language.translate("货品id不能为空",Language.EN_LANGUAGE_TYPE));
+            AssertUtil.notNullOrZero(productId, "货品id不能为空");
 
             Product product = productModel.getProductByProductId(productId);
-            AssertUtil.notNull(product, Language.translate("获取货品信息为空",Language.EN_LANGUAGE_TYPE));
+            AssertUtil.notNull(product, "获取货品信息为空");
 
             PagerInfo pager = new PagerInfo(6, 1);
             //查询商品列表
@@ -213,7 +213,7 @@ public class GoodsListController extends BaseController {
             }
             return SldResponse.success(new PageVO<>(vos, null));
         } else if ("hot".equals(queryType)) {
-            AssertUtil.notNullOrZero(categoryId3, Language.translate("三级分类id不能为空",Language.EN_LANGUAGE_TYPE));
+            AssertUtil.notNullOrZero(categoryId3,"三级分类id不能为空");
 
             PagerInfo pager = new PagerInfo(4, 1);
             //查询商品列表

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

@@ -58,12 +58,12 @@ public class MemberFollowProductController extends BaseController {
     @PostMapping("edit")
     public JsonResult<Object> editMemberFollowProduct(HttpServletRequest request, String productIds, Boolean isCollect) {
         //参数校验
-        AssertUtil.notEmpty(productIds, Language.translate("货品id不能为空",Language.EN_LANGUAGE_TYPE));
-        AssertUtil.notFormatFrontIds(productIds, Language.translate("productIds格式错误,请重试",Language.EN_LANGUAGE_TYPE));
+        AssertUtil.notEmpty(productIds,"货品id不能为空");
+        AssertUtil.notFormatFrontIds(productIds, "productIds格式错误,请重试");
 
         Member member = UserUtil.getUser(request, Member.class);
         memberFollowProductModel.editMemberFollowProduct(productIds, isCollect, member.getMemberId());
-        return SldResponse.success(isCollect ? Language.translate("收藏成功",Language.EN_LANGUAGE_TYPE) : Language.translate("取消成功",Language.EN_LANGUAGE_TYPE));
+        return SldResponse.success(isCollect ? "收藏成功" : "取消成功");
     }
 
     @ApiOperation("收藏商品列表")
@@ -87,9 +87,9 @@ public class MemberFollowProductController extends BaseController {
         if (!CollectionUtils.isEmpty(list)) {
             list.forEach(memberFollowProduct -> {
                 Store store = storeModel.getStoreByStoreId(memberFollowProduct.getStoreId());
-                AssertUtil.notNull(store, Language.translate("查询的商铺信息为空",Language.EN_LANGUAGE_TYPE));
+                AssertUtil.notNull(store, "查询的商铺信息为空");
                 Goods goods = goodsModel.getGoodsByGoodsId(memberFollowProduct.getGoodsId());
-                AssertUtil.notNull(goods, Language.translate("查询的商品信息为空",Language.EN_LANGUAGE_TYPE));
+                AssertUtil.notNull(goods, "查询的商品信息为空");
                 FollowProductVO vo = new FollowProductVO(memberFollowProduct, store, goods);
                 vos.add(vo);
             });

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

@@ -65,8 +65,8 @@ public class MemberFollowStoreController extends BaseController {
     public JsonResult<Object> editMemberFollowStore(HttpServletRequest request, String storeIds, Boolean isCollect) {
 
         //参数校验
-        AssertUtil.notEmpty(storeIds, Language.translate("商铺id不能为空",Language.EN_LANGUAGE_TYPE));
-        AssertUtil.notFormatFrontIds(storeIds, Language.translate("storeIds格式错误,请重试",Language.EN_LANGUAGE_TYPE));
+        AssertUtil.notEmpty(storeIds, "商铺id不能为空");
+        AssertUtil.notFormatFrontIds(storeIds, "storeIds格式错误,请重试");
 
         Member member = UserUtil.getUser(request, Member.class);
         memberFollowStoreModel.editMemberFollowStore(storeIds, isCollect, member.getMemberId());
@@ -75,11 +75,11 @@ public class MemberFollowStoreController extends BaseController {
         String[] ids = storeIds.split(",");
         for (String storeId : ids) {
             Store store = storeModel.getStoreByStoreId(Long.valueOf(storeId));
-            AssertUtil.notNull(store, Language.translate("商店信息为空",Language.EN_LANGUAGE_TYPE));
+            AssertUtil.notNull(store, "商店信息为空");
             map.put("followNumber", store.getFollowNumber());
             break;
         }
-        return SldResponse.success(isCollect ? Language.translate("关注店铺成功",Language.EN_LANGUAGE_TYPE) : Language.translate("取消关注店铺成功",Language.EN_LANGUAGE_TYPE), map);
+        return SldResponse.success(isCollect ? "关注店铺成功" : "取消关注店铺成功", map);
     }
 
     @ApiOperation("关注商铺列表")

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

@@ -173,7 +173,7 @@ public class MemberInfoController extends BaseController {
             memberNew.setMemberTrueName("");
         }
         memberModel.updateMember(memberNew);
-        return SldResponse.success(Language.translate("编辑成功",Language.EN_LANGUAGE_TYPE));
+        return SldResponse.success("编辑成功");
     }
 
     @ApiOperation("会员是否绑定手机号")

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

@@ -6,6 +6,7 @@ import com.slodon.b2b2c.core.i18n.Language;
 import com.slodon.b2b2c.core.response.JsonResult;
 import com.slodon.b2b2c.core.response.SldResponse;
 import com.slodon.b2b2c.core.util.*;
+import com.slodon.b2b2c.enums.WebSiteConstant;
 import com.slodon.b2b2c.member.dto.MemberAddLoginPwdDTO;
 import com.slodon.b2b2c.member.dto.MemberAddPayPwdDTO;
 import com.slodon.b2b2c.member.dto.MemberUpdateLoginPwdDTO;
@@ -155,13 +156,13 @@ public class MemberPasswordController extends BaseController {
         String verifyCodeCheck = stringRedisTemplate.opsForValue().get("verification_code_check_is_enable");
         if ("1".equals(verifyCodeCheck)) {
             String verifyEmail = stringRedisTemplate.opsForValue().get(memberEmail);
-            AssertUtil.isTrue(!emailCode.equals(verifyEmail), Language.translate("验证码输入错误，请重试",Language.EN_LANGUAGE_TYPE));
+            AssertUtil.isTrue(!emailCode.equals(verifyEmail), "验证码输入错误，请重试");
         }
 
         Member member = UserUtil.getUser(request, Member.class);
         //查询最新会员信息
         Member member1 = memberModel.getMemberByMemberId(member.getMemberId());
-        AssertUtil.isTrue(!StringUtil.isEmpty(member1.getMemberEmail()) && member1.getMemberEmail().equals(memberEmail), Language.translate("请输入新的邮箱",Language.EN_LANGUAGE_TYPE));
+        AssertUtil.isTrue(!StringUtil.isEmpty(member1.getMemberEmail()) && member1.getMemberEmail().equals(memberEmail), "请输入新的邮箱");
 
         //查询邮箱是否被绑定
         MemberExample example = new MemberExample();
@@ -182,7 +183,7 @@ public class MemberPasswordController extends BaseController {
                 memberModel.updateMember(memberOld);
             } else {
                 //提示被绑定
-                return SldResponse.failSpecial(Language.translate("该邮箱已被绑定，继续操作，将解除与<",Language.EN_LANGUAGE_TYPE) + memberDb.getMemberName() + Language.translate(">账号的绑定关系，是否继续",Language.EN_LANGUAGE_TYPE));
+                return SldResponse.failSpecial("该邮箱已被绑定，继续操作，将解除与<" + memberDb.getMemberName() + ">账号的绑定关系，是否继续");
             }
         }
 
@@ -193,24 +194,35 @@ public class MemberPasswordController extends BaseController {
         memberNew.setMemberEmail(memberEmail);
         memberNew.setUpdateTime(new Date());
         memberModel.updateMember(memberNew);
-        return SldResponse.success(Language.translate("修改/设置电子邮箱成功",Language.EN_LANGUAGE_TYPE));
+        return SldResponse.success("修改/设置电子邮箱成功");
     }
 
     @ApiOperation("修改登录密码")
     @PostMapping("editLoginPwd")
     public JsonResult<Object> editLoginPwd(HttpServletRequest request, MemberUpdateLoginPwdDTO memberUpdateLoginPwdDTO) {
         Member member = UserUtil.getUser(request, Member.class);
-        //参数校验
-        String verifyCode = stringRedisTemplate.opsForValue().get(memberUpdateLoginPwdDTO.getMemberEmail());
-        AssertUtil.isTrue(StringUtil.isEmpty(verifyCode) || !verifyCode.equalsIgnoreCase(memberUpdateLoginPwdDTO.getVerifyCode()), Language.translate("验证码输入错误，请重试",Language.EN_LANGUAGE_TYPE));
+        String webSite = WebUtil.getWebSite(request);
+        String verifyCode = "";
+        if (WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
+            //参数校验
+            verifyCode = stringRedisTemplate.opsForValue().get(memberUpdateLoginPwdDTO.getMemberEmail());
+        } else if (WebSiteConstant.MEMBER_DISTRIBUTOR.equals(webSite)) {
+            //参数校验
+            verifyCode = stringRedisTemplate.opsForValue().get(memberUpdateLoginPwdDTO.getMemberMobile());
+        }
+        AssertUtil.isTrue(StringUtil.isEmpty(verifyCode) || !verifyCode.equalsIgnoreCase(memberUpdateLoginPwdDTO.getVerifyCode()), "验证码输入错误，请重试");
 
         Member memberDb = memberModel.getMemberByMemberId(member.getMemberId());
-        AssertUtil.isTrue(memberUpdateLoginPwdDTO.getOldLoginPwd().equals(memberUpdateLoginPwdDTO.getLoginPwd()), Language.translate("新密码与原密码不能一样",Language.EN_LANGUAGE_TYPE));
-        AssertUtil.isTrue(!Md5.getMd5String(memberUpdateLoginPwdDTO.getOldLoginPwd()).equalsIgnoreCase(memberDb.getLoginPwd()), Language.translate("原密码不对,请重新输入",Language.EN_LANGUAGE_TYPE));
+        AssertUtil.isTrue(memberUpdateLoginPwdDTO.getOldLoginPwd().equals(memberUpdateLoginPwdDTO.getLoginPwd()), "新密码与原密码不能一样");
+        AssertUtil.isTrue(!Md5.getMd5String(memberUpdateLoginPwdDTO.getOldLoginPwd()).equalsIgnoreCase(memberDb.getLoginPwd()), "原密码不对,请重新输入");
 
         memberModel.editLoginPwd(memberUpdateLoginPwdDTO, member.getMemberId());
-        stringRedisTemplate.delete(memberUpdateLoginPwdDTO.getMemberEmail());
-        return SldResponse.success(Language.translate("修改登录密码成功",Language.EN_LANGUAGE_TYPE));
+        if (WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
+            stringRedisTemplate.delete(memberUpdateLoginPwdDTO.getMemberEmail());
+        } else if (WebSiteConstant.MEMBER_DISTRIBUTOR.equals(webSite)) {
+            stringRedisTemplate.delete(memberUpdateLoginPwdDTO.getMemberMobile());
+        }
+        return SldResponse.success("修改登录密码成功");
     }
 
     @ApiOperation("设置登录密码")

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

@@ -61,7 +61,7 @@ public class MemberDownloadCenterController extends BaseController {
     public JsonResult<Object> saveDownloadRecord(HttpServletRequest request, MemberDownloadCenter downloadCenter) throws Exception {
         log.info("********** saveDownloadRecord - downloadCenter:{} *************", JSON.toJSONString(downloadCenter));
         if (downloadCenter.getGoodsId() == null || downloadCenter.getAnnexId() == null) {
-            return SldResponse.fail(Language.translate("文档下载记录保存失败,请重试",Language.EN_LANGUAGE_TYPE));
+            return SldResponse.fail("文档下载记录保存失败,请重试");
         }
         Integer key = memberDownloadCenterModel.saveDownloadRecord(request, downloadCenter);
         return SldResponse.success(key);

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

@@ -147,14 +147,14 @@ public class MemberEmailActiveController extends BaseController {
     public JsonResult<Object> getMemberEmailLink(HttpServletRequest request, String email, Integer source) {
         log.info("getMemberEmailLink - email:{},source:{}", email, source);
         if (StringUtil.isEmpty(email)) {
-            return SldResponse.fail(Language.translate("邮件不能为空", Language.EN_LANGUAGE_TYPE));
+            return SldResponse.fail("邮件不能为空");
         }
         AssertUtil.emailCheck(email);
 
         int count = memberRegisterActiveModel.sendRegisterUserEmail(email, source);
-        AssertUtil.isTrue((count == 0), Language.translate("发送验证邮件失败，请重试", Language.EN_LANGUAGE_TYPE));
-        AssertUtil.isTrue((count == 2), Language.translate("该邮箱已注册，请登录", Language.EN_LANGUAGE_TYPE));
-        return SldResponse.success(Language.translate("发送验证邮件成功", Language.EN_LANGUAGE_TYPE));
+        AssertUtil.isTrue((count == 0), "发送验证邮件失败，请重试");
+        AssertUtil.isTrue((count == 2), "该邮箱已注册，请登录");
+        return SldResponse.success("发送验证邮件成功");
     }
 
 
@@ -180,7 +180,7 @@ public class MemberEmailActiveController extends BaseController {
             return handleVerificationCodeForDistributor(webSite, email, mobile, source, type);
         }
 
-        return SldResponse.success(Language.translate("验证码发送成功", Language.EN_LANGUAGE_TYPE));
+        return SldResponse.success("验证码发送成功");
     }
 
     /**
@@ -188,7 +188,7 @@ public class MemberEmailActiveController extends BaseController {
      */
     private JsonResult<Object> handleVerificationCodeForOversea(String webSite, String email, String mobile, Integer source, Integer type) {
         if (StringUtil.isEmpty(email)) {
-            return SldResponse.fail(Language.translate("邮件不能为空", Language.EN_LANGUAGE_TYPE));
+            return SldResponse.fail("邮件不能为空");
         }
         AssertUtil.emailCheck(email);
 
@@ -201,7 +201,7 @@ public class MemberEmailActiveController extends BaseController {
      */
     private JsonResult<Object> handleVerificationCodeForDistributor(String webSite, String email, String mobile, Integer source, Integer type) {
         if (StringUtil.isEmpty(mobile)) {
-            return SldResponse.fail(Language.translate("手机号码不能为空", Language.EN_LANGUAGE_TYPE));
+            return SldResponse.fail("手机号码不能为空");
         }
         AssertUtil.mobileCheck(mobile);
 
@@ -216,36 +216,36 @@ public class MemberEmailActiveController extends BaseController {
                                                             Integer type, String redisKey) {
         // 1. 判断是否在1分钟内已发送过验证码
         if (Boolean.TRUE.equals(stringRedisTemplate.hasKey(redisKey))) {
-            return SldResponse.fail(Language.translate("请勿频繁操作，请1分钟后重试", Language.EN_LANGUAGE_TYPE));
+            return SldResponse.fail("请勿频繁操作，请1分钟后重试");
         }
 
         int count;
         if (type == 1) {
             count = memberRegisterActiveModel.sendRegisterUserVerificationCode(webSite, email, mobile, source);
-            AssertUtil.isTrue((count == 0), Language.translate("验证码发送失败，请重试", Language.EN_LANGUAGE_TYPE));
+            AssertUtil.isTrue((count == 0),"验证码发送失败，请重试");
 
             if (WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
-                AssertUtil.isTrue((count == 2), Language.translate("该邮箱已注册，请登录", Language.EN_LANGUAGE_TYPE));
+                AssertUtil.isTrue((count == 2), "该邮箱已注册，请登录");
             } else {
-                AssertUtil.isTrue((count == 2), Language.translate("该手机号已注册，请登录", Language.EN_LANGUAGE_TYPE));
+                AssertUtil.isTrue((count == 2), "该手机号已注册，请登录");
             }
         } else {
             count = memberRegisterActiveModel.checkMemberUserInfo(webSite, email, mobile);
-            AssertUtil.isTrue((count == 0), Language.translate("验证码发送失败，请重试", Language.EN_LANGUAGE_TYPE));
+            AssertUtil.isTrue((count == 0),"验证码发送失败，请重试");
 
             if (WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
-                AssertUtil.isTrue((count == 2), Language.translate("该邮箱未激活，请先激活", Language.EN_LANGUAGE_TYPE));
-                AssertUtil.isTrue((count == 3), Language.translate("该邮箱未注册，请先注册", Language.EN_LANGUAGE_TYPE));
+                AssertUtil.isTrue((count == 2), "该邮箱未激活，请先激活");
+                AssertUtil.isTrue((count == 3), "该邮箱未注册，请先注册");
             } else {
-                AssertUtil.isTrue((count == 2), Language.translate("该手机号未激活，请先激活", Language.EN_LANGUAGE_TYPE));
-                AssertUtil.isTrue((count == 3), Language.translate("该手机号未注册，请先注册", Language.EN_LANGUAGE_TYPE));
+                AssertUtil.isTrue((count == 2), "该手机号未激活，请先激活");
+                AssertUtil.isTrue((count == 3), "该手机号未注册，请先注册");
             }
         }
 
         // 2. 设置 Redis 标记，1分钟内不可重复发送
         stringRedisTemplate.opsForValue().set(redisKey, "1", 60, TimeUnit.SECONDS);
 
-        return SldResponse.success(Language.translate("验证码发送成功", Language.EN_LANGUAGE_TYPE));
+        return SldResponse.success("验证码发送成功");
     }
 
 
@@ -277,7 +277,7 @@ public class MemberEmailActiveController extends BaseController {
             return verifyCodeByMobile(mobile, type, verificationCode);
         }
 
-        return SldResponse.success(Language.translate("验证码校验成功", Language.EN_LANGUAGE_TYPE));
+        return SldResponse.success("验证码校验成功");
     }
 
 
@@ -287,7 +287,7 @@ public class MemberEmailActiveController extends BaseController {
     private JsonResult<Object> verifyCodeByEmail(String email, Integer type, String verificationCode) {
         String baseKey = EMAIL_KEY_MAP.get(type);
         if (baseKey == null) {
-            return SldResponse.fail(Language.translate("验证码不能为空", Language.EN_LANGUAGE_TYPE));
+            return SldResponse.fail("验证码不能为空");
         }
 
         String redisKey = baseKey + email;
@@ -300,7 +300,7 @@ public class MemberEmailActiveController extends BaseController {
     private JsonResult<Object> verifyCodeByMobile(String mobile, Integer type, String verificationCode) {
         String baseKey = MOBILE_KEY_MAP.get(type);
         if (baseKey == null) {
-            return SldResponse.fail(Language.translate("验证码不能为空", Language.EN_LANGUAGE_TYPE));
+            return SldResponse.fail("验证码不能为空");
         }
 
         String redisKey = baseKey + mobile;
@@ -313,15 +313,15 @@ public class MemberEmailActiveController extends BaseController {
      */
     private JsonResult<Object> verifyCodeFromRedis(String redisKey, String verificationCode) {
         if (!stringRedisTemplate.hasKey(redisKey)) {
-            return SldResponse.fail(Language.translate("验证码已过期，请重新获取", Language.EN_LANGUAGE_TYPE));
+            return SldResponse.fail("验证码已过期，请重新获取");
         }
 
         String storedCode = stringRedisTemplate.opsForValue().get(redisKey);
         if (!verificationCode.equals(storedCode)) {
-            return SldResponse.fail(ResponseConst.STATE_FAIL, Language.translate("验证码校验失败", Language.EN_LANGUAGE_TYPE));
+            return SldResponse.fail(ResponseConst.STATE_FAIL, "验证码校验失败");
         }
 
-        return SldResponse.success(Language.translate("验证码校验成功", Language.EN_LANGUAGE_TYPE));
+        return SldResponse.success("验证码校验成功");
     }
 
 
@@ -331,18 +331,18 @@ public class MemberEmailActiveController extends BaseController {
     private ValidationResult validateVerificationParams(String webSite, String email, String mobile, String verificationCode) {
         if (WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
             if (StringUtil.isEmpty(email)) {
-                return ValidationResult.invalid(Language.translate("邮件不能为空", Language.EN_LANGUAGE_TYPE));
+                return ValidationResult.invalid("邮件不能为空");
             }
             if (StringUtil.isEmpty(verificationCode)) {
-                return ValidationResult.invalid(Language.translate("验证码不能为空", Language.EN_LANGUAGE_TYPE));
+                return ValidationResult.invalid("验证码不能为空");
             }
             AssertUtil.emailCheck(email);
         } else if (WebSiteConstant.MEMBER_DISTRIBUTOR.equals(webSite)) {
             if (StringUtil.isEmpty(mobile)) {
-                return ValidationResult.invalid(Language.translate("手机号不能为空", Language.EN_LANGUAGE_TYPE));
+                return ValidationResult.invalid("手机号不能为空");
             }
             if (StringUtil.isEmpty(verificationCode)) {
-                return ValidationResult.invalid(Language.translate("验证码不能为空", Language.EN_LANGUAGE_TYPE));
+                return ValidationResult.invalid("验证码不能为空");
             }
             AssertUtil.mobileCheck(mobile);
         }
@@ -377,13 +377,13 @@ public class MemberEmailActiveController extends BaseController {
             String errorMsg = WebSiteConstant.MEMBER_OVERSEA.equals(webSite)
                     ? "会员邮箱不存在，请重新注册"
                     : "会员手机号不存在，请重新注册";
-            return SldResponse.fail(ResponseConst.STATE_FAIL, Language.translate(errorMsg, Language.EN_LANGUAGE_TYPE));
+            return SldResponse.fail(ResponseConst.STATE_FAIL, errorMsg);
         }
 
         // 检查账户是否已激活
         if (isMemberAlreadyActive(memberInfo)) {
             return SldResponse.fail(ResponseConst.STATE_FAIL,
-                    Language.translate("会员账号已激活，无需重复注册，请登录", Language.EN_LANGUAGE_TYPE));
+                    "会员账号已激活，无需重复注册，请登录");
         }
 
         // 更新用户信息
@@ -468,11 +468,11 @@ public class MemberEmailActiveController extends BaseController {
         if (WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
             // 发送账户注册成功邮件
             memberRegisterActiveModel.sendRegisterSuccessEmail(email, nickName);
-            return SldResponse.success(Language.translate("会员邮箱账户激活成功", Language.EN_LANGUAGE_TYPE));
+            return SldResponse.success("会员邮箱账户激活成功");
         } else {
             // 发送账户注册成功短信
             memberRegisterActiveModel.sendRegisterSuccessSms(mobile);
-            return SldResponse.success(Language.translate("会员手机号激活成功", Language.EN_LANGUAGE_TYPE));
+            return SldResponse.success("会员手机号激活成功");
         }
     }
 
@@ -513,7 +513,7 @@ public class MemberEmailActiveController extends BaseController {
             return resetPasswordByMobile(webSite, mobile, verificationCode, loginPwd);
         }
 
-        return SldResponse.fail(ResponseConst.STATE_FAIL, Language.translate("不支持的站点类型", Language.EN_LANGUAGE_TYPE));
+        return SldResponse.fail(ResponseConst.STATE_FAIL, "不支持的站点类型");
     }
 
     /**
@@ -546,12 +546,12 @@ public class MemberEmailActiveController extends BaseController {
         // 查找会员信息
         Member memberInfo = findMemberByEmail(webSite, email);
         if (memberInfo == null) {
-            return SldResponse.fail(ResponseConst.STATE_FAIL, Language.translate("该邮箱不存在，请先注册", Language.EN_LANGUAGE_TYPE));
+            return SldResponse.fail(ResponseConst.STATE_FAIL, "该邮箱不存在，请先注册");
         }
 
         // 检查邮箱是否已激活
         if (memberInfo.getIsEmailActive() != null && memberInfo.getIsEmailActive() == 0) {
-            return SldResponse.fail(ResponseConst.STATE_FAIL, Language.translate("该邮箱未激活，请先激活", Language.EN_LANGUAGE_TYPE));
+            return SldResponse.fail(ResponseConst.STATE_FAIL,"该邮箱未激活，请先激活");
         }
 
         // 验证验证码并重置密码
@@ -566,12 +566,12 @@ public class MemberEmailActiveController extends BaseController {
         // 查找会员信息
         Member memberInfo = findMemberByMobile(webSite, mobile);
         if (memberInfo == null) {
-            return SldResponse.fail(ResponseConst.STATE_FAIL, Language.translate("该手机号不存在，请先注册", Language.EN_LANGUAGE_TYPE));
+            return SldResponse.fail(ResponseConst.STATE_FAIL, "该手机号不存在，请先注册");
         }
 
         // 检查手机号是否已激活
         if (memberInfo.getIsEmailActive() != null && memberInfo.getIsEmailActive() == 0) {
-            return SldResponse.fail(ResponseConst.STATE_FAIL, Language.translate("该手机号未激活，请先激活", Language.EN_LANGUAGE_TYPE));
+            return SldResponse.fail(ResponseConst.STATE_FAIL, "该手机号未激活，请先激活");
         }
 
         // 验证验证码并重置密码
@@ -610,7 +610,7 @@ public class MemberEmailActiveController extends BaseController {
             String verifyNumber = stringRedisTemplate.opsForValue().get(redisKey);
             log.info("verifyNumber:{}", verifyNumber);
             if (!verificationCode.equals(verifyNumber)) {
-                return SldResponse.fail(ResponseConst.STATE_FAIL, Language.translate("验证码校验失败", Language.EN_LANGUAGE_TYPE));
+                return SldResponse.fail(ResponseConst.STATE_FAIL, "验证码校验失败");
             }
 
             // 更新用户密码
@@ -623,9 +623,9 @@ public class MemberEmailActiveController extends BaseController {
             // 删除Redis中的验证码
             stringRedisTemplate.delete(redisKey);
 
-            return SldResponse.success(Language.translate("重置登录密码成功", Language.EN_LANGUAGE_TYPE));
+            return SldResponse.success("重置登录密码成功");
         }
-        return SldResponse.fail(ResponseConst.STATE_FAIL, Language.translate("验证码已过期，请重新获取", Language.EN_LANGUAGE_TYPE));
+        return SldResponse.fail(ResponseConst.STATE_FAIL,"验证码已过期，请重新获取");
     }
 
 
@@ -646,23 +646,23 @@ public class MemberEmailActiveController extends BaseController {
     public JsonResult<Object> activeMemberEmailInfo(HttpServletRequest request, String email, String code, String verifyKey, String verifyCode, String nickName, String password) {
         log.info("activeMemberEmailInfo - email:{},code:{},verifyKey:{},verifyCode:{},nickName:{},password:{}", email, code, verifyKey, verifyCode, nickName, password);
         if (StringUtil.isEmpty(email) || StringUtil.isEmpty(code)) {
-            return SldResponse.fail(ResponseConst.STATE_FAIL, Language.translate("注册链接不正确，请重新注册", Language.EN_LANGUAGE_TYPE));
+            return SldResponse.fail(ResponseConst.STATE_FAIL, "注册链接不正确，请重新注册");
         }
 
         //获得redis中的验证码
         String verify_number = stringRedisTemplate.opsForValue().get(verifyKey);
-        AssertUtil.isTrue(verify_number == null || !verify_number.equalsIgnoreCase(verifyCode), Language.translate("图形验证码不正确", Language.EN_LANGUAGE_TYPE));
+        AssertUtil.isTrue(verify_number == null || !verify_number.equalsIgnoreCase(verifyCode), "图形验证码不正确");
 
         MemberExample memberExample = new MemberExample();
         memberExample.setMemberEmail(email.toLowerCase());
         List<Member> memberList = memberReadMapper.listByExample(memberExample);
         if (CollectionUtils.isEmpty(memberList)) {
-            return SldResponse.fail(ResponseConst.STATE_FAIL, Language.translate("会员邮箱不存在，请重新注册", Language.EN_LANGUAGE_TYPE));
+            return SldResponse.fail(ResponseConst.STATE_FAIL, "会员邮箱不存在，请重新注册");
         }
 
         Member memberInfo = memberList.get(0);
         if (memberInfo.getIsEmailActive() != null && memberInfo.getIsEmailActive() == 1) {
-            return SldResponse.fail(ResponseConst.STATE_FAIL, Language.translate("会员邮箱已激活，无需重复注册，请登录", Language.EN_LANGUAGE_TYPE));
+            return SldResponse.fail(ResponseConst.STATE_FAIL, "会员邮箱已激活，无需重复注册，请登录");
         }
 
         String activeEmailKey = RedisConst.SLD_PC_NEW_REGISTER_USER_EMAIL + email;
@@ -671,7 +671,7 @@ public class MemberEmailActiveController extends BaseController {
             String verifyNumber = stringRedisTemplate.opsForValue().get(activeEmailKey);
             log.info("verifyNumber:{}", verifyNumber);
             if (!code.equals(verifyNumber)) {
-                return SldResponse.fail(ResponseConst.STATE_FAIL, Language.translate("注册链接激活码已失效，请重新注册", Language.EN_LANGUAGE_TYPE));
+                return SldResponse.fail(ResponseConst.STATE_FAIL,"注册链接激活码已失效，请重新注册");
             }
 
             // 更新用户邮箱激活状态
@@ -688,9 +688,9 @@ public class MemberEmailActiveController extends BaseController {
             // 发送账户注册成功邮件
             memberRegisterActiveModel.sendRegisterSuccessEmail(email, nickName);
 
-            return SldResponse.success(Language.translate("会员邮箱账户激活成功", Language.EN_LANGUAGE_TYPE));
+            return SldResponse.success("会员邮箱账户激活成功");
         }
-        return SldResponse.fail(ResponseConst.STATE_FAIL, Language.translate("注册链接已失效，请重新注册", Language.EN_LANGUAGE_TYPE));
+        return SldResponse.fail(ResponseConst.STATE_FAIL, "注册链接已失效，请重新注册");
     }
 
     /**
@@ -704,19 +704,19 @@ public class MemberEmailActiveController extends BaseController {
     public JsonResult<Object> getMemberEmailForgetPwdLink(HttpServletRequest request, String email, String verifyKey, String verifyCode) {
         log.info("getMemberEmailForgetPwdLink - email:{},verifyKey:{},verifyCode:{}", email, verifyKey, verifyCode);
         if (StringUtil.isEmpty(email)) {
-            return SldResponse.fail(Language.translate("邮件不能为空", Language.EN_LANGUAGE_TYPE));
+            return SldResponse.fail("邮件不能为空");
         }
         AssertUtil.emailCheck(email);
 
         //获得redis中的验证码
         String verify_number = stringRedisTemplate.opsForValue().get(verifyKey);
-        AssertUtil.isTrue(verify_number == null || !verify_number.equalsIgnoreCase(verifyCode), Language.translate("图形验证码不正确", Language.EN_LANGUAGE_TYPE));
+        AssertUtil.isTrue(verify_number == null || !verify_number.equalsIgnoreCase(verifyCode), "图形验证码不正确");
 
         int count = memberRegisterActiveModel.checkMemberUserInfo(email);
-        AssertUtil.isTrue((count == 0), Language.translate("发送重置密码邮件失败，请重试", Language.EN_LANGUAGE_TYPE));
-        AssertUtil.isTrue((count == 2), Language.translate("该邮箱未激活，请先激活", Language.EN_LANGUAGE_TYPE));
-        AssertUtil.isTrue((count == 3), Language.translate("该邮箱未注册，请先注册", Language.EN_LANGUAGE_TYPE));
-        return SldResponse.success(Language.translate("重置密码链接已发送", Language.EN_LANGUAGE_TYPE));
+        AssertUtil.isTrue((count == 0), "发送重置密码邮件失败，请重试");
+        AssertUtil.isTrue((count == 2), "该邮箱未激活，请先激活");
+        AssertUtil.isTrue((count == 3), "该邮箱未注册，请先注册");
+        return SldResponse.success("重置密码链接已发送");
     }
 
     /**
@@ -734,24 +734,24 @@ public class MemberEmailActiveController extends BaseController {
     public JsonResult<Object> emailResetPwd(HttpServletRequest request, String email, String code, String loginPwd, String verifyKey, String verifyCode) {
         log.info("emailResetPwd - email:{},code:{},loginPwd:{},verifyKey:{},verifyCode:{}", email, code, loginPwd, verifyKey, verifyCode);
         if (StringUtil.isEmpty(email) || StringUtil.isEmpty(code)) {
-            return SldResponse.fail(ResponseConst.STATE_FAIL, Language.translate("重置密码链接不正确，请重新获取忘记密码链接", Language.EN_LANGUAGE_TYPE));
+            return SldResponse.fail(ResponseConst.STATE_FAIL, "重置密码链接不正确，请重新获取忘记密码链接");
         }
 
         //获得redis中的验证码
         String verify_number = stringRedisTemplate.opsForValue().get(verifyKey);
-        AssertUtil.isTrue(verify_number == null || !verify_number.equalsIgnoreCase(verifyCode), Language.translate("图形验证码不正确", Language.EN_LANGUAGE_TYPE));
+        AssertUtil.isTrue(verify_number == null || !verify_number.equalsIgnoreCase(verifyCode), "图形验证码不正确");
 
         MemberExample memberExample = new MemberExample();
         memberExample.setMemberEmail(email.toLowerCase());
         List<Member> memberList = memberReadMapper.listByExample(memberExample);
 
         if (CollectionUtils.isEmpty(memberList)) {
-            return SldResponse.fail(ResponseConst.STATE_FAIL, Language.translate("该邮箱不存在，请先注册", Language.EN_LANGUAGE_TYPE));
+            return SldResponse.fail(ResponseConst.STATE_FAIL, "该邮箱不存在，请先注册");
         }
 
         Member memberInfo = memberList.get(0);
         if (memberInfo.getIsEmailActive() != null && memberInfo.getIsEmailActive() == 0) {
-            return SldResponse.fail(ResponseConst.STATE_FAIL, Language.translate("该邮箱未激活，请先激活", Language.EN_LANGUAGE_TYPE));
+            return SldResponse.fail(ResponseConst.STATE_FAIL, "该邮箱未激活，请先激活");
         }
 
         String forgetPwdEmailKey = RedisConst.SLD_PC_FORGET_PWD_USER_EMAIL + email;
@@ -760,7 +760,7 @@ public class MemberEmailActiveController extends BaseController {
             String verifyNumber = stringRedisTemplate.opsForValue().get(forgetPwdEmailKey);
             log.info("verifyNumber:{}", verifyNumber);
             if (!code.equals(verifyNumber)) {
-                return SldResponse.fail(ResponseConst.STATE_FAIL, Language.translate("重置密码链接激活码已失效，请重新获取", Language.EN_LANGUAGE_TYPE));
+                return SldResponse.fail(ResponseConst.STATE_FAIL,"重置密码链接激活码已失效，请重新获取");
             }
 
             // 更新用户密码
@@ -772,9 +772,9 @@ public class MemberEmailActiveController extends BaseController {
 
             stringRedisTemplate.delete(forgetPwdEmailKey);
 
-            return SldResponse.success(Language.translate("重置登录密码成功", Language.EN_LANGUAGE_TYPE));
+            return SldResponse.success("重置登录密码成功");
         }
-        return SldResponse.fail(ResponseConst.STATE_FAIL, Language.translate("重置密码链接已失效，请重新获取", Language.EN_LANGUAGE_TYPE));
+        return SldResponse.fail(ResponseConst.STATE_FAIL, "重置密码链接已失效，请重新获取");
     }
 
     private static class ValidationResult {
@@ -791,7 +791,7 @@ public class MemberEmailActiveController extends BaseController {
         }
 
         static ValidationResult invalid(String errorMessage) {
-            return new ValidationResult(false, Language.translate(errorMessage, Language.EN_LANGUAGE_TYPE));
+            return new ValidationResult(false, errorMessage);
         }
 
         public boolean isValid() {

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

@@ -86,15 +86,15 @@ public class MemberEnquiryController extends BaseController {
         log.info("********** addEnquiry - enquiryAddDTO:{} *************", JSON.toJSONString(enquiryAddDTO));
         if (StringUtil.isEmpty(enquiryAddDTO.getName()) || StringUtil.isEmpty(enquiryAddDTO.getMessage()) ||
                 StringUtil.isEmpty(enquiryAddDTO.getPageUrl()) || StringUtil.isEmpty(enquiryAddDTO.getItemType())) {
-            return SldResponse.fail(Language.translate("提交失败,请重试",Language.EN_LANGUAGE_TYPE));
+            return SldResponse.fail("提交失败,请重试");
         }
         // 增加Integer参数长度校验，防止数据库int类型溢出
         if (enquiryAddDTO.getQuantity() != null && (enquiryAddDTO.getQuantity() > Integer.MAX_VALUE || enquiryAddDTO.getQuantity() < Integer.MIN_VALUE)) {
-            return SldResponse.fail(Language.translate("数量超出范围，请重试", Language.EN_LANGUAGE_TYPE));
+            return SldResponse.fail("数量超出范围，请重试");
         }
         enquiryAddDTO.setWebSite(WebUtil.getWebSite(request));
         Integer key = memberEnquiryModel.saveEnquiry(request, enquiryAddDTO);
-        return SldResponse.success(Language.translate("提交成功",Language.EN_LANGUAGE_TYPE),key);
+        return SldResponse.success("提交成功",key);
     }
 
     /**
@@ -110,15 +110,15 @@ public class MemberEnquiryController extends BaseController {
         log.info("********** saveEnquiry - enquiryAddDTO:{} *************", JSON.toJSONString(enquiryAddDTO));
         if (StringUtil.isEmpty(enquiryAddDTO.getName()) || StringUtil.isEmpty(enquiryAddDTO.getMessage()) ||
                 StringUtil.isEmpty(enquiryAddDTO.getPageUrl()) || StringUtil.isEmpty(enquiryAddDTO.getItemType())) {
-            return SldResponse.fail(Language.translate("提交失败,请重试",Language.EN_LANGUAGE_TYPE));
+            return SldResponse.fail("提交失败,请重试");
         }
         // 增加Integer参数长度校验，防止数据库int类型溢出
         if (enquiryAddDTO.getQuantity() != null && (enquiryAddDTO.getQuantity() > Integer.MAX_VALUE || enquiryAddDTO.getQuantity() < Integer.MIN_VALUE)) {
-            return SldResponse.fail(Language.translate("数量超出范围，请重试", Language.EN_LANGUAGE_TYPE));
+            return SldResponse.fail("数量超出范围，请重试");
         }
         enquiryAddDTO.setWebSite(WebUtil.getWebSite(request));
         Integer key = memberEnquiryModel.saveEnquiry(request, enquiryAddDTO);
-        return SldResponse.success(Language.translate("提交成功",Language.EN_LANGUAGE_TYPE),key);
+        return SldResponse.success("提交成功",key);
     }
 
     @ApiOperation("询盘列表列表")

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/msg/front/VerifyController.java

@@ -132,7 +132,7 @@ public class VerifyController extends BaseController {
 
         Member memberDb = memberModel.getMemberByMemberId(member.getMemberId());
         AssertUtil.isTrue(StringUtil.isNullOrZero(verifyType) || verifyType > 2, "请选择接收地址类型");
-        AssertUtil.isTrue(StringUtil.isEmpty(verifyAddr), Language.translate("请输入手机或邮箱",Language.EN_LANGUAGE_TYPE));
+        AssertUtil.isTrue(StringUtil.isEmpty(verifyAddr), "请输入手机或邮箱");
 
         JsonResult result;
         //验证码过期时间,单位秒
@@ -150,12 +150,12 @@ public class VerifyController extends BaseController {
             String oldAddr = verifyType == 1 ? memberDb.getMemberEmail() : memberDb.getMemberMobile();
             if (StringUtils.isEmpty(oldAddr)) {
                 //未绑定手机号或邮箱，不能修改
-                return SldResponse.fail(Language.translate("系统异常",Language.EN_LANGUAGE_TYPE));
+                return SldResponse.fail("系统异常");
             }
             String oldVerify = stringRedisTemplate.opsForValue().get(oldAddr);
             if (StringUtils.isEmpty(oldVerify)) {
                 //未生成验证码或验证码过期
-                return SldResponse.failSpecial(Language.translate("验证失效，请重新验证",Language.EN_LANGUAGE_TYPE));
+                return SldResponse.failSpecial("验证失效，请重新验证");
             }
         }
         switch (verifyType) {
@@ -229,9 +229,9 @@ public class VerifyController extends BaseController {
     private JsonResult sendEmail(String email, long expireTime) {
         String verif = RandomUtil.randomNumber(4);
         // 邮件发送服务
-        StringBuffer content = new StringBuffer(Language.translate("本次操作的验证码：",Language.EN_LANGUAGE_TYPE));
+        StringBuffer content = new StringBuffer("本次操作的验证码：");
         content.append(verif);
-        msgSendModel.sendMail(email, Language.translate("邮箱验证码",Language.EN_LANGUAGE_TYPE), content.toString());
+        msgSendModel.sendMail(email, "邮箱验证码", content.toString());
         //将随机数存在redis中
         stringRedisTemplate.opsForValue().set(email, verif, expireTime, TimeUnit.SECONDS);
         return SldResponse.success("发送成功");

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

@@ -96,7 +96,6 @@ public class SellerStoreController extends BaseController {
                 store.setStoreGradeName(null);
                 store.setStoreMapInfo(null);
                 store.setStoreMapInfoW(null);
-                store.setBusinessState(StoreConst.STORE_BUSINESS_STATE_TO_AUDIT);
             }
             StoreNameExample storeNameExample = new StoreNameExample();
             storeNameExample.setStoreId(vendor.getStoreId());
@@ -221,7 +220,6 @@ public class SellerStoreController extends BaseController {
             }
         } else {
             store = storeSiteInfoModel.getStoreByStoreIdAndWebSite(vendor.getStoreId(), webSite);
-            store.setBusinessState(store.getBusinessState() == null ? StoreConst.STORE_BUSINESS_STATE_TO_AUDIT : store.getBusinessState());
             SysSeo seoInfo = storeModel.getRecordByTargetIdAndType(vendor.getStoreId(), SeoTypeConstant.SEO_TYPE_SHOP + "_" + webSite);
             if (seoInfo != null) {
                 store.setStoreSeoTitle(seoInfo.getTitle());
@@ -242,10 +240,84 @@ public class SellerStoreController extends BaseController {
         return SldResponse.success(vo);
     }
 
+
+    /**
+     * 获取店铺经营状态接口
+     * @param request
+     * @param webSite
+     * @return
+     */
+    @ApiOperation("获取店铺经营信息接口")
+    @ApiImplicitParam(name = "webSite", value = "站点", paramType = "query")
+    @GetMapping("getBusinessState")
+    public JsonResult<Integer> getBusinessState(HttpServletRequest request, @RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite) {
+        Vendor vendor = UserUtil.getUser(request, Vendor.class);
+
+        Store store;
+        if (WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
+            store = storeModel.getStoreByStoreId(vendor.getStoreId());
+            AssertUtil.notNull(store, "未获取到店铺信息");
+        } else {
+            store = storeSiteInfoModel.getStoreByStoreIdAndWebSite(vendor.getStoreId(), webSite);
+            if (store.getStoreId() == null) {
+                AssertUtil.notNull(store, "未获取到店铺信息");
+            }
+        }
+        return SldResponse.success(store.getBusinessState());
+    }
+
+    /**
+     * 编辑店铺经营状态接口
+     * @param request
+     * @param webSite
+     * @param businessState
+     * @return
+     */
+    @ApiOperation("编辑店铺经营状态接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点", paramType = "query"),
+            @ApiImplicitParam(name = "businessState", value = "经营状态", paramType = "query")
+    })
+    @VendorLogger(option = "编辑店铺经营状态接口")
+    @PostMapping("updateBusinessState")
+    public JsonResult<Integer> updateStoreBusinessState(HttpServletRequest request,
+                                                        @RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite,
+                                                        @RequestParam(value = "businessState") Integer businessState) {
+        Vendor vendor = UserUtil.getUser(request, Vendor.class);
+
+        String logMsg = "店铺id:" + vendor.getStoreId();
+        if (WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
+            Store store = new Store();
+            store.setStoreId(vendor.getStoreId());
+            store.setBusinessState(businessState);
+            storeModel.updateStore(store);
+        } else {
+            StoreSiteInfoExample storeSiteInfoExample = new StoreSiteInfoExample();
+            storeSiteInfoExample.setStoreId(vendor.getStoreId());
+            storeSiteInfoExample.setWebSite(webSite);
+            Store store = storeSiteInfoModel.getStoreByStoreIdAndWebSite(vendor.getStoreId(), webSite);
+
+            StoreSiteInfo storeSiteInfo = new StoreSiteInfo();
+            storeSiteInfo.setStoreId(vendor.getStoreId());
+            storeSiteInfo.setWebSite(webSite);
+            storeSiteInfo.setBusinessState(businessState);
+            if (StringUtils.isEmpty(store.getStoreId())) {
+                storeSiteInfo.setCreateId(vendor.getVendorId());
+                storeSiteInfo.setCreateTime(new Date());
+                storeSiteInfoModel.saveStoreSiteInfo(storeSiteInfo);
+            } else {
+                storeSiteInfo.setUpdateId(vendor.getVendorId());
+                storeSiteInfo.setUpdateTime(new Date());
+                storeSiteInfoModel.updateStoreSiteInfo(storeSiteInfo);
+            }
+        }
+        return SldResponse.success("设置成功", logMsg);
+    }
+
+
     @ApiOperation("编辑店铺设置接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "webSite", value = "站点", paramType = "query"),
-            @ApiImplicitParam(name = "businessState", value = "经营状态", paramType = "query"),
             @ApiImplicitParam(name = "mainBusiness", value = "店铺主营商品名称，用','分隔，例如'男装,女装,童装'"),
             @ApiImplicitParam(name = "storeLogo", value = "店铺logo"),
             @ApiImplicitParam(name = "servicePhone", value = "店铺客服电话"),
@@ -265,7 +337,6 @@ public class SellerStoreController extends BaseController {
     @PostMapping("updateSetting")
     public JsonResult<Integer> updateStoreSetting(HttpServletRequest request,
                                                   @RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite,
-                                                  @RequestParam(value = "businessState", required = false) Integer businessState,
                                                   @RequestParam(value = "mainBusiness", required = false) String mainBusiness,
                                                   @RequestParam(value = "storeLogo", required = false) String storeLogo,
                                                   @RequestParam(value = "servicePhone", required = false) String servicePhone,
@@ -287,7 +358,6 @@ public class SellerStoreController extends BaseController {
         if (WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
             Store store = new Store();
             store.setStoreId(vendor.getStoreId());
-            store.setBusinessState(businessState);
             store.setMainBusiness(mainBusiness);
             store.setStoreLogo(storeLogo);
             store.setServicePhone(servicePhone);
@@ -308,7 +378,6 @@ public class SellerStoreController extends BaseController {
             StoreSiteInfo storeSiteInfo = new StoreSiteInfo();
             storeSiteInfo.setStoreId(vendor.getStoreId());
             storeSiteInfo.setWebSite(webSite);
-            storeSiteInfo.setBusinessState(businessState);
             storeSiteInfo.setMainBusiness(mainBusiness);
             storeSiteInfo.setStoreLogo(storeLogo);
             storeSiteInfo.setServicePhone(servicePhone);

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/sso/front/FrontAuthController.java

@@ -121,33 +121,33 @@ public class FrontAuthController {
                     // 检测gp系统用户是否存在
                     GpUserInfoDto gpUserInfoDto = oneClickLoginModel.checkGpSystemUserIsExist(request, username, password, "PC",webSite);
                     if (gpUserInfoDto == null) {
-                        AssertUtil.notEmpty(memberList, Language.translate("用户不存在",Language.EN_LANGUAGE_TYPE));
-                        AssertUtil.isTrue(!memberList.get(0).getLoginPwd().equals(Md5.getMd5String(password)), Language.translate("会员邮箱或密码错误",Language.EN_LANGUAGE_TYPE));
+                        AssertUtil.notEmpty(memberList, "用户不存在");
+                        AssertUtil.isTrue(!memberList.get(0).getLoginPwd().equals(Md5.getMd5String(password)), "会员账号或密码错误");
                     } else {
                         memberList = memberModel.getMemberList(memberExample, null);
                     }
                 } else {
-                    AssertUtil.notEmpty(memberList, Language.translate("会员账号或密码错误",Language.EN_LANGUAGE_TYPE));
+                    AssertUtil.notEmpty(memberList, "会员账号或密码错误");
                     if (ssoType != null && ssoType == 1) {
-                        AssertUtil.isTrue(!memberList.get(0).getLoginPwd().equals(password), Language.translate("会员账号或密码错误",Language.EN_LANGUAGE_TYPE));
+                        AssertUtil.isTrue(!memberList.get(0).getLoginPwd().equals(password), "会员账号或密码错误");
                     } else {
                         oneClickLoginModel.checkGpSystemUserIsExist(request, username, password, "PC", webSite);
                         memberList = memberModel.getMemberList(memberExample, null);
-                        AssertUtil.isTrue(!memberList.get(0).getLoginPwd().equals(Md5.getMd5String(password)), Language.translate("会员账号或密码错误",Language.EN_LANGUAGE_TYPE));
+                        AssertUtil.isTrue(!memberList.get(0).getLoginPwd().equals(Md5.getMd5String(password)), "会员账号或密码错误");
                     }
                 }
             } else {
-                AssertUtil.notEmpty(memberList, Language.translate("用户不存在",Language.EN_LANGUAGE_TYPE));
+                AssertUtil.notEmpty(memberList, "用户不存在");
                 //开关开启需要验证
                 String verifyCodeCheck = stringRedisTemplate.opsForValue().get("verification_code_check_is_enable");
                 if ("1".equals(verifyCodeCheck)) {
                     //验证手机验证码
                     String verifyCode = stringRedisTemplate.opsForValue().get(username);
-                    AssertUtil.isTrue(verifyCode == null || !verifyCode.equals(password), Language.translate("验证码输入错误，请重试",Language.EN_LANGUAGE_TYPE));
+                    AssertUtil.isTrue(verifyCode == null || !verifyCode.equals(password), "验证码输入错误，请重试");
                 }
             }
             member = memberList.get(0);
-            AssertUtil.isTrue(!member.getState().equals(MemberConst.STATE_1), Language.translate("会员账户被禁用，请联系平台",Language.EN_LANGUAGE_TYPE));
+            AssertUtil.isTrue(!member.getState().equals(MemberConst.STATE_1), "会员账户被禁用，请联系平台");
         }
 
         //定义一个uuid，用做存储redis的key，并且设置到token中
@@ -220,7 +220,7 @@ public class FrontAuthController {
      * @return refreshToken中存放用户信息的uuid
      */
     private String checkRefreshToken(String refreshToken) {
-        AssertUtil.notEmpty(refreshToken, Language.translate("未登录",Language.EN_LANGUAGE_TYPE));
+        AssertUtil.notEmpty(refreshToken, "未登录");
         try {
             //解析 refreshToken
             JWTClaimsSet jwtClaimsSet = JWTParser.parse(refreshToken).getJWTClaimsSet();
@@ -246,7 +246,7 @@ public class FrontAuthController {
         String uuid = this.checkRefreshToken(refresh_token);
         if (uuid == null) {
             //refresh_token已失效，不做处理
-            return SldResponse.success(Language.translate("退出成功",Language.EN_LANGUAGE_TYPE));
+            return SldResponse.success("退出成功");
         }
         //解析 refreshToken
         JWTClaimsSet jwtClaimsSet = JWTParser.parse(refresh_token).getJWTClaimsSet();
@@ -255,7 +255,7 @@ public class FrontAuthController {
         //清除redis中的用户信息
         objectRedisTemplate.opsForHash().delete(jwtClaimsSet.getStringClaim("webIdentify") + "-" + userId, uuid);
 
-        return SldResponse.success(Language.translate("退出成功",Language.EN_LANGUAGE_TYPE));
+        return SldResponse.success("退出成功");
     }
 
     @ApiOperation("注册会员账号")

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

@@ -74,7 +74,7 @@ public class MemberFollowProductModel {
                 followProductExample.setMemberId(memberId);
                 List<MemberFollowProduct> memberFollowProductList = memberFollowProductReadMapper.listByExample(followProductExample);
                 Goods goods = goodsReadMapper.getByPrimaryKey(product.getGoodsId());
-                AssertUtil.isTrue(!goods.getState().equals(GoodsConst.GOODS_STATE_UPPER), Language.translate("该商品已下架",Language.EN_LANGUAGE_TYPE));
+                AssertUtil.isTrue(!goods.getState().equals(GoodsConst.GOODS_STATE_UPPER), "该商品已下架");
                 if (CollectionUtils.isEmpty(memberFollowProductList)) {
                     //goodsId 未收藏,直接新增
                     MemberFollowProduct memberFollowProduct = new MemberFollowProduct();
@@ -93,7 +93,7 @@ public class MemberFollowProductModel {
                     memberFollowProduct.setStoreCategoryId(1);                  //待确认
 
                     int count = memberFollowProductWriteMapper.insert(memberFollowProduct);
-                    AssertUtil.notNullOrZero(count, Language.translate("添加会员收藏商品表失败，请重试",Language.EN_LANGUAGE_TYPE));
+                    AssertUtil.notNullOrZero(count, "添加会员收藏商品表失败，请重试");
 
                 } else {
                     //goodsId 收藏,再次查询 sku表 货品表 productId
@@ -106,7 +106,7 @@ public class MemberFollowProductModel {
                             followProduct.setCreateTime(new Date());
 
                             int count = memberFollowProductWriteMapper.updateByPrimaryKeySelective(followProduct);
-                            AssertUtil.notNullOrZero(count, Language.translate("更新会员收藏商品表失败，请重试",Language.EN_LANGUAGE_TYPE));
+                            AssertUtil.notNullOrZero(count, "更新会员收藏商品表失败，请重试");
                         }
                     }
                 }

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

@@ -222,7 +222,7 @@ public class MemberProductLookLogModel {
                         productLookLogInfo.setIsFollowProduct(true);
                     }
                     Goods goods = goodsModel.getGoodsByGoodsId(productLookLog.getGoodsId());
-                    AssertUtil.notNull(goods, Language.translate("查询的商品信息为空",Language.EN_LANGUAGE_TYPE));
+                    AssertUtil.notNull(goods,"查询的商品信息为空");
                     productLookLogInfo.setState(goods.getState());
                     infos.add(productLookLogInfo);
                 });
@@ -237,9 +237,9 @@ public class MemberProductLookLogModel {
                 String yesterday = simpleDateFormat.format(calendar.getTime());
 
                 if (day.equals(today)) {
-                    vo.setTime(Language.translate("今天",Language.EN_LANGUAGE_TYPE));
+                    vo.setTime("今天");
                 } else if (day.equals(yesterday)) {
-                    vo.setTime(Language.translate("昨天",Language.EN_LANGUAGE_TYPE));
+                    vo.setTime("昨天");
                 } else {
                     vo.setTime(day);
                 }

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/member/MemberEnquiryVO.java

@@ -77,10 +77,10 @@ public class MemberEnquiryVO implements Serializable {
         }
         switch (itemType) {
             case "MALL":
-                value = Language.translate("平台端",Language.EN_LANGUAGE_TYPE);
+                value = "平台端";
                 break;
             case "SHOP":
-                value = Language.translate("商户端",Language.EN_LANGUAGE_TYPE);
+                value = "商户端";
                 break;
             case "GOODS":
                 value = "商品";

xinkeaboard-server/doc/DDL/update.sql

@@ -338,7 +338,9 @@ WHERE name = 'es_index_update_time';
 
 CREATE INDEX idx_goods_click_follow ON goods_extend (goods_id, click_number, follow_number)
 
+ALTER TABLE member_product_look_log MODIFY COLUMN goods_name VARCHAR(200) COMMENT '商品名称';
 
+ALTER TABLE member_product_look_log MODIFY COLUMN goods_brief VARCHAR(1000) COMMENT '商品副标题，长度建议140个字符内';