Merge branch 'dev' into test

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java

@@ -378,12 +378,12 @@ public class AdamLoginController {
     /* ---------------------------- Internal Method ---------------------------- */
 
     private ResponseDto<AdamLoginInfoVo> checkSmsCode(String mobile, String code) {
-//        if (Arrays.asList(LnsEnum.ENV.dev.name(), LnsEnum.ENV.test.name()).contains(env.getProperty(CurrentUtil.CK_ENV_ACTIVE))
-//                || reviewMobile.equals(mobile)) {
+        if (Arrays.asList(LnsEnum.ENV.dev.name(), LnsEnum.ENV.test.name()).contains(env.getProperty(CurrentUtil.CK_ENV_ACTIVE))
+                || reviewMobile.equals(mobile)) {
             if (CurrentUtil.GRAY_LOGIN_SMS_CODE.equals(code)) {
                 return ResponseDto.success();
             }
-//        }
+        }
 
 //        LinkedMultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
 //        paramsMap.add("mobile", mobile);

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/service/impl/DragonOrderRefundsServiceImpl.java

@@ -422,7 +422,7 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
                     "\"trade_no\":\"" + tradeNo + "\"," +
                     "\"out_request_no\":\"" + outBizNo + "\"}"); //设置业务参数
             AlipayTradeFastpayRefundQueryResponse response = PayAlipayUtils.getInstance().getHttpClient().execute(request);
-            log.info("AlipayTradeFastpayRefundQueryRequest -> data = " + JSON.toJSONString(response));
+            log.info("AlipayTradeFastpayRefundQueryRequest -> data = " + response);
 
             if (response.isSuccess()) {
                 try {
@@ -435,11 +435,13 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
                     dto.setOrderRefundCode(response.getOutRequestNo());
                     dto.setRefundCode(response.getOutTradeNo());
                     dto.setRefundPrice(response.getRefundAmount());
-                    dto.setRefundAt(DateUtil.format(response.getGmtRefundPay(), DateUtil.Formatter.yyyyMMddHHmmss));
+                    dto.setRefundAt(DateUtil.Formatter.yyyyMMddHHmmss.format(LocalDateTime.now()));
                     dto.setRefundPrice(response.getRefundAmount());
                     dto.setRefundError("");
                     sendNotifyUrl(dto,callBackUrl);
 
+                    log.debug("SEND ALIPAY NOTIFTURL2 = " + JSON.toJSONString(dto));
+
                     mqHandleUtil.sendMySqlRedis(
                             SqlMapping.get("dragon_order_refund_log.insert"),
                             new Object[]{outBizNo, "ALIPAY", JSON.toJSONString(response), nowTime, nowTime},