fixed 验证码bug修复

fuint-application/src/main/java/com/fuint/common/service/impl/VerifyCodeServiceImpl.java

@@ -43,12 +43,12 @@ public class VerifyCodeServiceImpl extends ServiceImpl<MtVerifyCodeMapper, MtVer
         reqVerifyCodeDto.setVerifyCode(verifyCode);
         reqVerifyCodeDto.setValidFlag("0");
 
-        Date addTime = new Date();
-        reqVerifyCodeDto.setAddTime(addTime);
+        Date now = new Date();
+        reqVerifyCodeDto.setAddTime(now);
 
         // 验证码过期时间5分钟
-        addTime.setTime(addTime.getTime()+5*60*1000);
-        Date expireTime = addTime;
+        Date expireTime = new Date();
+        expireTime.setTime(expireTime.getTime()+5*60*1000);
         reqVerifyCodeDto.setExpireTime(expireTime);
 
         // 发送验证码2分钟后才能继续发送,取最后一条
@@ -100,11 +100,11 @@ public class VerifyCodeServiceImpl extends ServiceImpl<MtVerifyCodeMapper, MtVer
      * 根据手机号,验证码，查询时间
      *
      * @param mobile 电话号码
-     * @param verifycode 验证码
+     * @param verifyCode 验证码
      * @throws BusinessCheckException
      */
-    public MtVerifyCode checkVerifyCode(String mobile, String verifycode) {
-        MtVerifyCode  reVerifyCode;
+    public MtVerifyCode checkVerifyCode(String mobile, String verifyCode) {
+        MtVerifyCode reVerifyCode;
         Date queryTime;
         try {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -113,7 +113,7 @@ public class VerifyCodeServiceImpl extends ServiceImpl<MtVerifyCodeMapper, MtVer
         } catch (ParseException e) {
             throw new BusinessRuntimeException("日期转换异常" + e.getMessage());
         }
-        reVerifyCode = mtVerifyCodeMapper.queryByMobileVerifyCode(mobile, verifycode, queryTime);
+        reVerifyCode = mtVerifyCodeMapper.queryByMobileVerifyCode(mobile, verifyCode, queryTime);
         return reVerifyCode;
     }
 }

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendGoodsController.java

@@ -500,7 +500,9 @@ public class BackendGoodsController extends BaseController {
 
         MtGoods info = new MtGoods();
         info.setId(Integer.parseInt(goodsId));
-        info.setMerchantId(accountInfo.getMerchantId());
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            info.setMerchantId(accountInfo.getMerchantId());
+        }
         if (StringUtil.isNotEmpty(type)) {
             info.setType(type);
         }
@@ -520,7 +522,7 @@ public class BackendGoodsController extends BaseController {
         if (StringUtil.isNotEmpty(description)) {
             info.setDescription(description);
         }
-        if (storeId != null) {
+        if (storeId != null && storeId > 0) {
             info.setStoreId(storeId);
         }
         if (images.size() > 0) {

fuint-repository/src/main/java/com/fuint/repository/mapper/MtVerifyCodeMapper.java

@@ -17,8 +17,6 @@ public interface MtVerifyCodeMapper extends BaseMapper<MtVerifyCode> {
 
     MtVerifyCode queryByMobileVerifyCode(@Param("mobile") String mobile, @Param("verifyCode") String verifyCode, @Param("queryTime") Date queryTime);
 
-    List<MtVerifyCode> queryVerifyCodeListByMobile(@Param("mobile") String mobile, @Param("queryTime") Date queryTime);
-
     List<MtVerifyCode> queryVerifyCodeLastRecord(@Param("mobile") String mobile);
 
 }

fuint-repository/src/main/resources/mapper/MtVerifyCodeMapper.xml

@@ -5,10 +5,6 @@
         select * from mt_verify_code t where t.MOBILE = #{mobile} and t.VERIFY_CODE = #{verifyCode} and t.VERIFY_CODE = 0 and t.EXPIRE_TIME >= #{queryTime}
     </select>
 
-    <select id="queryVerifyCodeListByMobile" resultType="com.fuint.repository.model.MtVerifyCode">
-        select * from mt_verify_code t where t.MOBILE = #{mobile} and t.VALID_FLAG = 0 and t.EXPIRE_TIME >= #{queryTime}
-    </select>
-
     <select id="queryVerifyCodeLastRecord" resultType="com.fuint.repository.model.MtVerifyCode">
         select * from mt_verify_code t where t.MOBILE = #{mobile}
     </select>