修改bug

src/main/java/com/diaoyun/zion/chinafrica/service/impl/FlutterWaveServiceImpl.java

@@ -150,12 +150,12 @@ public class FlutterWaveServiceImpl implements FlutterWaveService {
                     TbCfFinanceEntity finance = createFinance(paymentid, authurl, tbCfOrderVo);
                     TbCfFinanceVo tbCfFinanceVo = new TbCfFinanceVo();
                     BeanUtils.copyProperties(finance, tbCfFinanceVo);
-                    //清空订单
-                    removeRedisCache(tbCfOrderVo);
                 }
                 result.setData(JSON.parseObject(data));
                 result.setCode(ResultCodeEnum.SUCCESS.getCode()).setMessage("payment success!");
                 logger.info(tbCfOrderVo.getUserName() + ":Pay for success! The order number is:" + tbCfOrderVo.getOrderId());
+                //清空订单
+                removeRedisCache(tbCfOrderVo);
             } else {
                 result.setData(JSON.parseObject(data));
                 //支付失败

src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfItemDetailServiceImpl.java

@@ -100,7 +100,7 @@ public class TbCfItemDetailServiceImpl implements TbCfItemDetailService {
         String token = jwtTokenProvider.resolveToken(request);
         TbCfUserInfoVo tbCfUserInfoVo = tokenManager.validate(token);
         boolean flag = false;
-        if (tbCfItemDetailVo.getItemPrice().toString() != null) {
+        if (tbCfItemDetailVo.getItemPrice() != null) {
             int compare = tbCfItemDetailVo.getItemPrice().compareTo(BigDecimal.ZERO);
             if (compare > 0) {
                 flag = true;

src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfUserInfoServiceImpl.java

@@ -302,6 +302,10 @@ public class TbCfUserInfoServiceImpl implements TbCfUserInfoService {
         Result result = new Result();
         TbCfUserInfoEntity user = tbCfUserInfoDao.checkUserByPhone(phone);
         String phoneCode = (String) captchaRedisCache.get(KeyConstant.CAPTCHA_PHONE + phone);
+        if (phoneCode == null) {
+            result.setCode(ResultCodeEnum.VALIDATE_ERROR.getCode()).setMessage("Verification code failure");
+            return result;
+        }
         if (user != null && phoneCode.equals(code)) {
             result = loginByPhoneCode(ip, phone);
         } else {
@@ -551,7 +555,7 @@ public class TbCfUserInfoServiceImpl implements TbCfUserInfoService {
     }
 
     @Override
-    public List<TbCfUserInfoEntity>selectUserByPhone() {
+    public List<TbCfUserInfoEntity> selectUserByPhone() {
         return tbCfUserInfoDao.selectUserByPhone();
     }
 
@@ -562,8 +566,8 @@ public class TbCfUserInfoServiceImpl implements TbCfUserInfoService {
 
     @Override
     public String sendRegister(String email) throws EmailException, TemplateException, IOException {
-            emailHelper.sendEmail(email, EmailTemplateConstant.REGISTERS);
-             return "s";
+        emailHelper.sendEmail(email, EmailTemplateConstant.REGISTERS);
+        return "s";
     }
 
 

src/main/java/com/diaoyun/zion/master/enums/ResultCodeEnum.java

@@ -12,6 +12,7 @@ public enum ResultCodeEnum {
     CACHE_ERROR(9003,"cache error"),
     DAO_ERROR(9004,"dao error"),
     NEED_LOGIN(10,"need login"),
+    SYSTEM_ERROR(100,"Other system anomalies"),
     ILLEGAL_ARGUMENT(2,"illegal argument");
 
 

src/main/java/com/diaoyun/zion/master/exception/GlobalExceptionHandlerController.java

@@ -26,6 +26,7 @@ import org.springframework.web.context.request.async.AsyncRequestTimeoutExceptio
 import org.springframework.web.multipart.support.MissingServletRequestPartException;
 import org.springframework.web.servlet.NoHandlerFoundException;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
+
 import java.io.IOException;
 import java.util.Date;
 
@@ -34,132 +35,137 @@ import java.util.Date;
  */
 @RestControllerAdvice
 public class GlobalExceptionHandlerController extends ResponseEntityExceptionHandler {
-  private final Logger logger = LoggerFactory.getLogger(getClass());
-
-  @ExceptionHandler(ApplicationException.class)
-  public final ResponseEntity<ErrorDetails> handleCustomException( ApplicationException ex, WebRequest request)  {
-    ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
-            request.getDescription(false),HttpStatus.OK.value(),ex.getCode());
-    return new ResponseEntity<>(errorDetails, HttpStatus.OK);
-  }
-
-  @ExceptionHandler(AccessDeniedException.class)
-  public final ResponseEntity<ErrorDetails> handleAccessDeniedException(AccessDeniedException ex, WebRequest request) throws IOException {
-    ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
-            request.getDescription(false),HttpStatus.OK.value(),ResultCodeEnum.NEED_LOGIN.getCode());
-    return new ResponseEntity<>(errorDetails, HttpStatus.OK);
-  }
-
-  @Override
-  protected ResponseEntity<Object> handleHttpRequestMethodNotSupported(HttpRequestMethodNotSupportedException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
-    ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
-            request.getDescription(false),status.value(),ResultCodeEnum.ERROR.getCode());
-    return new ResponseEntity<>(errorDetails,status);
-  }
-
-  @Override
-  protected ResponseEntity<Object> handleHttpMediaTypeNotSupported(HttpMediaTypeNotSupportedException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
-    ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
-            request.getDescription(false),status.value(),ResultCodeEnum.ERROR.getCode());
-    return new ResponseEntity<>(errorDetails,status);
-  }
-
-  @Override
-  protected ResponseEntity<Object> handleHttpMediaTypeNotAcceptable(HttpMediaTypeNotAcceptableException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
-    ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
-            request.getDescription(false),status.value(),ResultCodeEnum.ERROR.getCode());
-    return new ResponseEntity<>(errorDetails,status);
-  }
-
-  @Override
-  protected ResponseEntity<Object> handleMissingPathVariable(MissingPathVariableException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
-    ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
-            request.getDescription(false),status.value(),ResultCodeEnum.ERROR.getCode());
-    return new ResponseEntity<>(errorDetails,status);
-  }
-
-  @Override
-  protected ResponseEntity<Object> handleMissingServletRequestParameter(MissingServletRequestParameterException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
-    ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
-            request.getDescription(false),status.value(),ResultCodeEnum.ERROR.getCode());
-    return new ResponseEntity<>(errorDetails,status);
-  }
-
-  @Override
-  protected ResponseEntity<Object> handleServletRequestBindingException(ServletRequestBindingException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
-    ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
-            request.getDescription(false),status.value(),ResultCodeEnum.ERROR.getCode());
-    return new ResponseEntity<>(errorDetails,status);
-  }
-
-  @Override
-  protected ResponseEntity<Object> handleConversionNotSupported(ConversionNotSupportedException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
-    ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
-            request.getDescription(false),status.value(),ResultCodeEnum.ERROR.getCode());
-    return new ResponseEntity<>(errorDetails,status);
-  }
-
-  @Override
-  protected ResponseEntity<Object> handleTypeMismatch(TypeMismatchException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
-    ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
-            request.getDescription(false),status.value(),ResultCodeEnum.ERROR.getCode());
-    return new ResponseEntity<>(errorDetails,status);
-  }
-
-  @Override
-  protected ResponseEntity<Object> handleHttpMessageNotReadable(HttpMessageNotReadableException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
-    ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
-            request.getDescription(false),status.value(),ResultCodeEnum.ERROR.getCode());
-    return new ResponseEntity<>(errorDetails,status);
-  }
-
-  @Override
-  protected ResponseEntity<Object> handleHttpMessageNotWritable(HttpMessageNotWritableException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
-    ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
-            request.getDescription(false),status.value(),ResultCodeEnum.ERROR.getCode());
-    return new ResponseEntity<>(errorDetails,status);
-  }
-
-  @Override
-  protected ResponseEntity<Object> handleMethodArgumentNotValid(MethodArgumentNotValidException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
-    ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
-            request.getDescription(false),status.value(),ResultCodeEnum.ERROR.getCode());
-    return new ResponseEntity<>(errorDetails,status);
-  }
-
-  @Override
-  protected ResponseEntity<Object> handleMissingServletRequestPart(MissingServletRequestPartException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
-    ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
-            request.getDescription(false),status.value(),ResultCodeEnum.ERROR.getCode());
-    return new ResponseEntity<>(errorDetails,status);
-  }
-
-  @Override
-  protected ResponseEntity<Object> handleBindException(BindException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
-    ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
-            request.getDescription(false),status.value(),ResultCodeEnum.ERROR.getCode());
-    return new ResponseEntity<>(errorDetails,status);
-  }
-
-  @Override
-  protected ResponseEntity<Object> handleNoHandlerFoundException(NoHandlerFoundException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
-    ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
-            request.getDescription(false),status.value(),ResultCodeEnum.ERROR.getCode());
-    return new ResponseEntity<>(errorDetails,status);
-  }
-
-  @Override
-  protected ResponseEntity<Object> handleAsyncRequestTimeoutException(AsyncRequestTimeoutException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
-    ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
-            request.getDescription(false),status.value(),ResultCodeEnum.ERROR.getCode());
-    return new ResponseEntity<>(errorDetails,status);
-  }
-
-  @Override
-  protected ResponseEntity<Object> handleExceptionInternal(Exception ex, Object body, HttpHeaders headers, HttpStatus status, WebRequest request) {
-    ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
-            request.getDescription(false),status.value(),ResultCodeEnum.ERROR.getCode());
-    return new ResponseEntity<>(errorDetails,status);
-  }
+    private final Logger logger = LoggerFactory.getLogger(getClass());
+
+    @ExceptionHandler(ApplicationException.class)
+    public final ResponseEntity<ErrorDetails> handleCustomException(ApplicationException ex, WebRequest request) {
+        ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
+                request.getDescription(false), HttpStatus.OK.value(), ex.getCode());
+        return new ResponseEntity<>(errorDetails, HttpStatus.OK);
+    }
+
+    @ExceptionHandler(AccessDeniedException.class)
+    public final ResponseEntity<ErrorDetails> handleAccessDeniedException(AccessDeniedException ex, WebRequest request) throws IOException {
+        ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
+                request.getDescription(false), HttpStatus.OK.value(), ResultCodeEnum.NEED_LOGIN.getCode());
+        return new ResponseEntity<>(errorDetails, HttpStatus.OK);
+    }
+
+    @Override
+    protected ResponseEntity<Object> handleHttpRequestMethodNotSupported(HttpRequestMethodNotSupportedException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
+        ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
+                request.getDescription(false), status.value(), ResultCodeEnum.ERROR.getCode());
+        return new ResponseEntity<>(errorDetails, status);
+    }
+
+    @Override
+    protected ResponseEntity<Object> handleHttpMediaTypeNotSupported(HttpMediaTypeNotSupportedException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
+        ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
+                request.getDescription(false), status.value(), ResultCodeEnum.ERROR.getCode());
+        return new ResponseEntity<>(errorDetails, status);
+    }
+
+    @Override
+    protected ResponseEntity<Object> handleHttpMediaTypeNotAcceptable(HttpMediaTypeNotAcceptableException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
+        ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
+                request.getDescription(false), status.value(), ResultCodeEnum.ERROR.getCode());
+        return new ResponseEntity<>(errorDetails, status);
+    }
+
+    @Override
+    protected ResponseEntity<Object> handleMissingPathVariable(MissingPathVariableException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
+        ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
+                request.getDescription(false), status.value(), ResultCodeEnum.ERROR.getCode());
+        return new ResponseEntity<>(errorDetails, status);
+    }
+
+    @Override
+    protected ResponseEntity<Object> handleMissingServletRequestParameter(MissingServletRequestParameterException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
+        ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
+                request.getDescription(false), status.value(), ResultCodeEnum.ERROR.getCode());
+        return new ResponseEntity<>(errorDetails, status);
+    }
+
+    @Override
+    protected ResponseEntity<Object> handleServletRequestBindingException(ServletRequestBindingException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
+        ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
+                request.getDescription(false), status.value(), ResultCodeEnum.ERROR.getCode());
+        return new ResponseEntity<>(errorDetails, status);
+    }
+
+
+    @Override
+    protected ResponseEntity<Object> handleConversionNotSupported(ConversionNotSupportedException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
+        ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
+                request.getDescription(false), status.value(), ResultCodeEnum.ERROR.getCode());
+        return new ResponseEntity<>(errorDetails, status);
+    }
+
+    @Override
+    protected ResponseEntity<Object> handleTypeMismatch(TypeMismatchException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
+        ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
+                request.getDescription(false), status.value(), ResultCodeEnum.ERROR.getCode());
+        return new ResponseEntity<>(errorDetails, status);
+    }
+
+    @Override
+    protected ResponseEntity<Object> handleHttpMessageNotReadable(HttpMessageNotReadableException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
+        ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
+                request.getDescription(false), status.value(), ResultCodeEnum.ERROR.getCode());
+        return new ResponseEntity<>(errorDetails, status);
+    }
+
+
+    @Override
+    protected ResponseEntity<Object> handleHttpMessageNotWritable(HttpMessageNotWritableException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
+        ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
+                request.getDescription(false), status.value(), ResultCodeEnum.ERROR.getCode());
+        return new ResponseEntity<>(errorDetails, status);
+    }
+
+    @Override
+    protected ResponseEntity<Object> handleMethodArgumentNotValid(MethodArgumentNotValidException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
+        ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
+                request.getDescription(false), status.value(), ResultCodeEnum.ERROR.getCode());
+        return new ResponseEntity<>(errorDetails, status);
+    }
+
+    @Override
+    protected ResponseEntity<Object> handleMissingServletRequestPart(MissingServletRequestPartException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
+        ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
+                request.getDescription(false), status.value(), ResultCodeEnum.ERROR.getCode());
+        return new ResponseEntity<>(errorDetails, status);
+    }
+
+    @Override
+    protected ResponseEntity<Object> handleBindException(BindException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
+        ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
+                request.getDescription(false), status.value(), ResultCodeEnum.ERROR.getCode());
+        return new ResponseEntity<>(errorDetails, status);
+    }
+
+
+    @Override
+    protected ResponseEntity<Object> handleNoHandlerFoundException(NoHandlerFoundException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
+        ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
+                request.getDescription(false), status.value(), ResultCodeEnum.ERROR.getCode());
+        return new ResponseEntity<>(errorDetails, status);
+    }
+
+    @Override
+    protected ResponseEntity<Object> handleAsyncRequestTimeoutException(AsyncRequestTimeoutException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
+        ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
+                request.getDescription(false), status.value(), ResultCodeEnum.ERROR.getCode());
+        return new ResponseEntity<>(errorDetails, status);
+    }
+
+    @Override
+    protected ResponseEntity<Object> handleExceptionInternal(Exception ex, Object body, HttpHeaders headers, HttpStatus status, WebRequest request) {
+        ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(),
+                request.getDescription(false), status.value(), ResultCodeEnum.ERROR.getCode());
+        return new ResponseEntity<>(errorDetails, status);
+    }
+
+
 
 }

src/main/resources/application.yml

@@ -21,7 +21,7 @@ spring:
     #Redis数据库分片索引（默认为0）
     database: 0
     #    host: 192.168.1.211
-    host: 127.0.0.1
+    host: 49.235.150.107
     port: 6379
     password:
 

src/main/resources/mapper/TbCfToiCouponDao.xml

@@ -84,7 +84,7 @@
       update  tb_cf_toicoupon t set  enable_flag = 0  where  t.user_id=#{userId} and  t.coupon_id=#{couponId}
     </update>
     <!--修改优惠券领取发放记录-->
-    <update id="updateEnableFlag">
+    <update id="updateEnableFlag" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfToicouponEntity">
         update tb_cf_toicoupon set enable_flag=#{enableFlag} where user_id=#{userId} and coupon_id=#{couponId}
 	</update>
     <insert id="save" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfToicouponEntity">

src/test/java/com/diaoyun/zion/PayTest.java

@@ -36,6 +36,7 @@ import springfox.documentation.spring.web.json.Json;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URLDecoder;
@@ -235,4 +236,9 @@ public class PayTest {
         System.out.println(false);
     }
 
+    @Test
+    public void testBigdecimal(){
+        BigDecimal b=new BigDecimal("0");
+        System.out.println(b!=null);
+    }
 }