Merge branch 'dev' into test

liquidnet-bus-api/liquidnet-service-dragon-api/src/main/java/com/liquidnet/service/dragon/service/IDragonOrderRefundsService.java

@@ -22,6 +22,6 @@ public interface IDragonOrderRefundsService {
 
     String wePayRefundCallBack(HttpServletRequest request , HttpServletResponse response);
 
-
+    String aliPayRefundCodeStatus(String outTradeNo ,String tradeNo ,String outBizNo,String callBackUrl);
 
 }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml

@@ -199,7 +199,7 @@
             <if test="status=='0'">
                 AND ps.STATUS = #{status}
             </if>
-            <if test="merchantId!='1'">
+            <if test="merchantId != 1">
                 AND pr.merchant_id = #{merchantId}
             </if>
         </where>

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-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserServiceImpl.java

@@ -130,12 +130,12 @@ public class AdamUserServiceImpl implements IAdamUserService {
 //                    mongoTemplate.insert(userInfoVo, AdamUserInfoVo.class.getSimpleName());
 //                    log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
 
-            userInfoVo.setMobile(SensitizeUtil.custom(param.getMobile(), 3, 4));
+//            userInfoVo.setMobile(SensitizeUtil.custom(param.getMobile(), 3, 4));
 
             adamRdmService.setUserInfoVoByUid(userInfoVo.getUid(), userInfoVo);
 
             toMqSqls.add(SqlMapping.get("adam_user.add"));
-            initUserObjs.add(new Object[]{userInfoVo.getUid(), userInfoVo.getMobile(), userInfoVo.getState(), now});
+            initUserObjs.add(new Object[]{userInfoVo.getUid(), userInfoVo.getMobile(), userInfoVo.getState(), 0, now});
             toMqSqls.add(SqlMapping.get("adam_user_info.add"));
             initUserInfoObjs.add(new Object[]{userInfoVo.getUid(), userInfoVo.getNickname(), userInfoVo.getAvatar(), userInfoVo.getQrCode()});
 

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

@@ -46,4 +46,16 @@ public class RefundController {
         return orderRefundsService.wePayRefundCallBack(request, response);
     }
 
+    @PostMapping("refund/alipay/result")
+    @ApiOperation("支付宝查询退款结果")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public String refundSingle(
+            @RequestParam(value = "orderCode") String orderCode,
+            @RequestParam(value = "paymentId") String paymentId,
+            @RequestParam(value = "orderRefundCode") String orderRefundCode,
+            @RequestParam(value = "callBackUrl") String callBackUrl) {
+        return orderRefundsService.aliPayRefundCodeStatus(orderCode, paymentId, orderRefundCode, callBackUrl);
+    }
+
+
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinBannersController.java

@@ -2,7 +2,6 @@ package com.liquidnet.service.kylin.controller;
 
 
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.kylin.dto.vo.KylinBannersVo;
 import com.liquidnet.service.kylin.entity.KylinBanners;
 import com.liquidnet.service.kylin.service.impl.BannersServiceImpl;
 import io.swagger.annotations.Api;
@@ -12,6 +11,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -41,9 +41,12 @@ public class KylinBannersController {
             @RequestParam() String position,
             @RequestParam(defaultValue = "") String provinceName
     ) {
-        List<KylinBanners> result = bannersServiceImpl.blist(position, provinceName);
-
-        return ResponseDto.success(result);
+        try {
+            List<KylinBanners> result = bannersServiceImpl.blist(position, provinceName);
+            return ResponseDto.success(result);
+        } catch (Exception e) {
+            return ResponseDto.success(new ArrayList<>());
+        }
     }
 
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/BannersServiceImpl.java

@@ -11,11 +11,8 @@ import com.liquidnet.service.kylin.utils.ObjectUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
 import java.util.Iterator;
 import java.util.List;
 
@@ -56,9 +53,11 @@ public class BannersServiceImpl implements IKylinBannersService {
                     if (null != StartTime && null != endTime && !StartTime.isEmpty() && !endTime.isEmpty()) {
                         if (DateUtil.compareStrDay(nowTime, StartTime) < 0) { // 当前时间小雨开始时间 还未开始呢
                             itBannerList.remove();
+                            continue;
                         }
                         if (DateUtil.compareStrDay(endTime, nowTime) < 0) { // 解释时间大于当前时间 已过期
                             itBannerList.remove();
+                            continue;
                         }
                     }
 
@@ -74,6 +73,7 @@ public class BannersServiceImpl implements IKylinBannersService {
                     }
                     if (!pis || null == pList) {
                         itBannerList.remove();
+                        continue;
                     }
 
                     if (bannerInfo.getPromotionType() != 1) {
@@ -88,6 +88,7 @@ public class BannersServiceImpl implements IKylinBannersService {
                         }
                         if (!prois || null == proList) {
                             itBannerList.remove();
+                            continue;
                         }
                     }
 

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

@@ -412,6 +412,11 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
         }
     }
 
+    @Override
+    public String aliPayRefundCodeStatus(String outTradeNo, String tradeNo, String outBizNo,String callBackUrl) {
+        return null;
+    }
+
     public String aliPayRefundCallBack(String jsonStr) {
         LocalDateTime nowTime = LocalDateTime.now();
         try {

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java

@@ -47,6 +47,7 @@ public class RedisDataUtils {
         List<SweetManualAppletDto> data = sweetManualMapper.getManualAppletDto();
         for (SweetManualAppletDto item : data) {
             item.setFieldName((String) redisUtil.hget("kylin:fields:id" + ":" + item.getFieldId(), "name"));
+            item.setCityName((String) redisUtil.hget("kylin:fields:id" + ":" + item.getFieldId(), "city_name"));
             item.setLatitude((String) redisUtil.hget("kylin:fields:id" + ":" + item.getFieldId(), "latitude"));
             item.setLongitude((String) redisUtil.hget("kylin:fields:id" + ":" + item.getFieldId(), "longitude"));
         }