Merge branch 'bug_sonar_20240426' into release

performance-web/src/main/java/com/clx/performance/dto/payment/WalletResidueDTO.java

@@ -14,19 +14,19 @@ import java.math.BigDecimal;
  */
 
 public class WalletResidueDTO {
-	//余额
+
 	@ApiModelProperty(value = "余额", dataType = "double", example = "11.10")
 	private Long residue;
-	//冻结的资金
+
 	@ApiModelProperty(value = "冻结的资金", dataType = "double", example = "11.10")
 	private Long frozen;
-	//保证金
+
 	@ApiModelProperty(value = "保证金", dataType = "double", example = "11.10")
 	private Double deposit;
-	//状态0锁定1正常2异常
+
 	@ApiModelProperty(value = "状态0锁定1正常2异常", dataType = "int", example = "1")
 	private Integer status;
-	//是否设置交易密码0没有1有
+
 	@ApiModelProperty(value = "是否设置交易密码0没有1有", dataType = "String", example = "1")
 	private String pwd;
 	
@@ -56,7 +56,7 @@ public class WalletResidueDTO {
 	}
 	@JsonGetter(value="frozen")
 	public BigDecimal frozenFormat() {
-		return new BigDecimal(new Double(this.frozen)/100);
+		return BigDecimal.valueOf(new Double(this.frozen)/100);
 	}
 	@JsonGetter(value="residue")
 	public Double residueFormat() {
@@ -64,7 +64,7 @@ public class WalletResidueDTO {
 	}
 	@JsonGetter(value="deposit")
 	public Double depositFormat() {
-		return new Double(this.deposit)/100;
+		return this.deposit/100;
 	}
 
 	public Double getDeposit() {

performance-web/src/main/java/com/clx/performance/job/OrderNoGenerateJob.java

@@ -38,7 +38,7 @@ public class OrderNoGenerateJob implements InitializingBean {
      * 提前生成订单号
      */
     @XxlJob("generateOrderNo")
-    public void generateOrderNo()throws InterruptedException {
+    public void generateOrderNo(){
         LocalDateTime today = LocalDateTime.now();
         //检验今天的订单池有没有，没有就生成一套
         String todayKey = RedisConstants.CARRIER_ORDER_NUM_POOL_KEY.replace("{date}", today.format(DateTimeFormatter.BASIC_ISO_DATE));
@@ -150,14 +150,14 @@ public class OrderNoGenerateJob implements InitializingBean {
      */
 
     @Override
-    public void afterPropertiesSet() throws Exception {
+    public void afterPropertiesSet(){
         //初始化redis中的订单池
         executor.execute(new Runnable() {
             @Override
             public void run() {
                 try {
                     generateOrderNo();
-                } catch (InterruptedException e) {
+                } catch (Exception e) {
                     e.printStackTrace();
                 }
             }

performance-web/src/main/java/com/clx/performance/service/impl/PaymentServiceImpl.java

@@ -89,8 +89,10 @@ public class PaymentServiceImpl implements PaymentService {
         log.info("发起支付请求日志 {}", JSON.toJSONString(payUserDTO));
         Result<Object> notify = (Result<Object>) postRequest(mslPaymentConfig.getHost()+ PERFORMANCE_PAY_CLX_PAYMENT.getUrl(), JSON.toJSONString(payUserDTO));
         log.info("支付返回日志 {}", notify);
-        if (notify == null || notify.getCode() != 0) {
-            //FEGIN返回null
+        if (notify == null) {
+            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR);
+        }
+        if (notify.getCode() != 0) {
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, notify.getMsg());
         }
         return notify;
@@ -130,8 +132,10 @@ public class PaymentServiceImpl implements PaymentService {
         log.info("发起支付请求日志 {}", payUserDTO);
         Result<Object> notify = (Result<Object>) postRequest(mslPaymentConfig.getHost()+ PERFORMANCE_PAY_CLX_PAYMENT.getUrl(), JSON.toJSONString(payUserDTO));
         log.info("支付返回日志 {}", notify);
-        if (notify == null || notify.getCode() != 0) {
-            //FEGIN返回null
+        if (notify == null) {
+            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR);
+        }
+        if (notify.getCode() != 0) {
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, notify.getMsg());
         }
         return notify;

performance-web/src/main/java/com/clx/performance/service/impl/thirdparty/nbbank/NbBankThirdpartyServiceImpl.java

@@ -68,9 +68,10 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
      */
     private static void downloadUsingStream(String urlStr, String file) throws IOException {
         URL url = new URL(urlStr);
-        BufferedInputStream bis = new BufferedInputStream(url.openStream());
+        BufferedInputStream bis = null;
         FileOutputStream fis = null;
         try {
+            bis = new BufferedInputStream(url.openStream());
             fis = new FileOutputStream(file);
             byte[] buffer = new byte[1024];
             int count = 0;
@@ -79,7 +80,7 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
             }
         }finally {
             if (fis != null){fis.close();}
-            bis.close();
+            if (bis != null){bis.close();}
         }
     }