Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinOrderTicketEntitiesVo.java

@@ -34,8 +34,8 @@ public class KylinOrderTicketEntitiesVo implements Serializable, Cloneable {
     private String createdAt;
     private String updatedAt;
 
-//    private Integer ticketsmId;
-//    private Integer timemId;
+    private Integer ticketsmId;
+    private Integer timemId;
 
     private BigDecimal refundPrice;
 

liquidnet-bus-common/liquidnet-common-exception/liquidnet-common-exception-handler-service/src/main/java/com/liquidnet/common/exception/RestControllerAdviceHandler.java

@@ -39,8 +39,9 @@ public class RestControllerAdviceHandler {
     @ExceptionHandler(value = Exception.class)
     @ResponseBody
     public ResponseEntity<Error> serviceExceptionHandler(Exception rex, HttpServletRequest req) {
-        logger.error("Ex.Handler.RestController:{},ex:{},request:{},param:{}",
-                rex.getClass().getSimpleName(), rex.getLocalizedMessage(), req.getRequestURI(), JSON.toJSONString(req.getParameterMap()));
+        logger.error("Ex.Handler.RestController:uri:{},param:{},ex:{},msg:{},",
+                req.getRequestURI(), JSON.toJSONString(req.getParameterMap()), rex.getClass().getSimpleName(), rex.getLocalizedMessage());
+
         if (rex instanceof MissingServletRequestParameterException) {
             MissingServletRequestParameterException ygex = (MissingServletRequestParameterException) rex;
             String message = ygex.getMessage();

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

@@ -4,7 +4,10 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.liquidnet.commons.lang.constant.LnsEnum;
 import com.liquidnet.commons.lang.constant.LnsRegex;
-import com.liquidnet.commons.lang.util.*;
+import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.commons.lang.util.CurrentUtil;
+import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.commons.lang.util.SensitizeUtil;
 import com.liquidnet.service.adam.dto.AdamThirdPartParam;
 import com.liquidnet.service.adam.dto.AdamUserInfoParam;
 import com.liquidnet.service.adam.dto.vo.*;
@@ -23,14 +26,16 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import javax.validation.constraints.Pattern;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 @ApiSupport(order = 10020)
 @Api(tags = "用户中心")
@@ -55,15 +60,19 @@ public class AdamUserController {
         log.debug("parameter:{}", JsonUtils.toJson(parameter));
 
         AdamTagVo sex = parameter.getSex();
-        if (null == sex) {
-            return ResponseDto.failure(ErrorMapping.get("10011"));
-        }
+//        if (null == sex) {
+//            return ResponseDto.failure(ErrorMapping.get("10011"));
+//        }
+        if (null != sex) {
+            String sexVal = sex.getVal();
             List<AdamTagVo> allSexTagVos = this.getTagsForSex().getData();
-        Optional<AdamTagVo> existSexTagVoOptional = allSexTagVos.stream().filter(r -> r.getVal().equals(sex.getVal())).findAny();
+            Optional<AdamTagVo> existSexTagVoOptional = allSexTagVos.stream().filter(r -> r.getVal().equals(sexVal)).findAny();
             if (!existSexTagVoOptional.isPresent()) {
                 // 已选中的性别标签不在系统性别标签库中
                 return ResponseDto.failure(ErrorMapping.get("10011"));
             }
+            sex = existSexTagVoOptional.get();
+        }
 //        List<AdamTagParentVo> tagMeVos = parameter.getTagMe();
 //        if (null == tagMeVos) {
 //            return ResponseDto.failure(ErrorMapping.get("10012"));
@@ -113,7 +122,7 @@ public class AdamUserController {
         editVo.setAvatar(parameter.getAvatar());
         editVo.setBackground(parameter.getBackground());
         editVo.setNickname(parameter.getNickname());
-        editVo.setSex(existSexTagVoOptional.get());
+        editVo.setSex(sex);
         editVo.setBirthday(parameter.getBirthday());
         editVo.setArea(parameter.getArea());
         editVo.setSignature(parameter.getSignature());

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

@@ -81,7 +81,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
                 userInfoVo = AdamUserInfoVo.getNew();
                 userInfoVo.setUid(IDGenerator.nextSnowId() + "");
                 userInfoVo.setMobile(mobile);
-                userInfoVo.setNickname("Now_".concat(SensitizeUtil.custom(mobile, 3, 4)));
+                userInfoVo.setNickname("Now_".concat(RandomStringUtils.randomAlphanumeric(3)).concat(mobile.substring(6)));
                 userInfoVo.setIsComplete(0);
                 userInfoVo.setState(1);
                 userInfoVo.setQrCode("lN".concat(userInfoVo.getUid()).concat(RandomStringUtils.randomAlphanumeric(5).toUpperCase()));
@@ -139,7 +139,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
 
                     userInfoVo.setUid(IDGenerator.nextSnowId() + "");
                     userInfoVo.setMobile(param.getMobile());
-                    userInfoVo.setNickname("Now_".concat(SensitizeUtil.custom(param.getMobile(), 3, 4)));
+                    userInfoVo.setNickname("Now_".concat(RandomStringUtils.randomAlphanumeric(3)).concat(param.getMobile().substring(6)));
                     userInfoVo.setIsComplete(0);
                     userInfoVo.setState(1);
                     userInfoVo.setQrCode("lN".concat(userInfoVo.getUid()).concat(RandomStringUtils.randomAlphanumeric(5).toUpperCase()));

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

@@ -117,9 +117,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
 
     @Override
     public OrderDetailsVo orderDetails(String orderId) {
+        try {
             Long currentTime = System.currentTimeMillis();
             OrderDetailsVo vo = OrderDetailsVo.getNew();
-        try {
             String uid = CurrentUtil.getCurrentUid();
 //            checkOrderTime(uid);
             KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
@@ -155,16 +155,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 orderTicketVo.setTicketType(ticketVo.getType());
                 orderTicketVo.setFieldName(performanceVo.getFieldName());
 
-                List<KylinOrderRefundsVo> orderRefundsVoList;
-                log.debug("getQrCode:" +orderTicketVo.getQrCode());
-                if (orderTicketVo.getQrCode().equalsIgnoreCase("")) {
-                    log.debug("getQrCode:" +orderTicketVo.getQrCode());
-                    orderRefundsVoList = new ArrayList<>();
-                } else {
-                    orderRefundsVoList = dataUtils.getOrderRefundVoByOrderId(orderId);
-                    currentTime = System.currentTimeMillis() - currentTime;
-                    log.debug("获取退款详情 -> time:" + (currentTime) + "毫秒");
-                }
+                List<KylinOrderRefundsVo> orderRefundsVoList = dataUtils.getOrderRefundVoByOrderId(orderId);
 
                 if (ticketVo.getIsShowCode() == 1 && orderTicketVo.getStatus() != 0 && orderTicketVo.getStatus() != 2 && orderTicketVo.getStatus() != 4) {
                     LocalDateTime date = DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketVo.getQrCodeShowTime());
@@ -212,6 +203,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 List<OrderRefundListVo> orderRefundListVos = new ArrayList<>();
                 BigDecimal lockPrice = BigDecimal.valueOf(0.00);
                 for (KylinOrderRefundsVo item : orderRefundsVoList) {
+                    if(item.getType().equals(1)){
+                        break;
+                    }
                     OrderRefundListVo data = OrderRefundListVo.getNew();
                     data.setOrderRefundCode(item.getOrderRefundCode().substring(item.getOrderRefundCode().length() - 10));
                     data.setOrderRefundsId(item.getOrderRefundsId());
@@ -250,8 +244,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             log.info(UserPathDto.setData("订单详情", orderId, vo));
             return vo;
         } catch (Exception e) {
-            e.printStackTrace();
-            return vo;
+            log.info("DETAIL ERROR = ",e);
+            return null;
         }
     }
 

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

@@ -597,12 +597,12 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
     public ResponseDto<PayInnerResultVo> payAgain(PayAgainParam payAgainParam) {
         try {
             String uid = CurrentUtil.getCurrentUid();
-//            checkOrderTime(uid);
             //检查订单时间 是否关闭
             KylinOrderTicketVo orderTicketData = dataUtils.getOrderTicketVo(payAgainParam.getOrderId());
+            log.info("data  uid = "+orderTicketData.getUserId());
+            log.info("param uid = "+uid);
+            log.info("param data = "+orderTicketData);
             if (!orderTicketData.getUserId().equals(uid)) {
-                log.debug("data  uid = "+orderTicketData.getUserId());
-                log.debug("param uid = "+uid);
                 return ResponseDto.failure(ErrorMapping.get("20003"));
             }
             if (orderTicketData == null) {
@@ -651,7 +651,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                     httpData.add("returnUrl", payAgainParam.getReturnUrl() + payAgainParam.getOrderId());
                 }
 
-                String returnData = HttpUtil.post(payUrl + payAgainParam.getDeviceFrom() + "/" + payAgainParam.getPayType(), httpData);
+                String returnData = HttpUtil.post(payUrl , httpData);
                 PayResultVo payResultVo = JsonUtils.fromJson(returnData, PayResultVo.class);
                 payResultVo.getData().setOrderId(orderTicketData.getOrderTicketsId());
                 payResultVo.getData().setPrice(orderTicketData.getPriceActual());
@@ -716,7 +716,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             }
             return ResponseDto.failure(ErrorMapping.get("20029"));
         } catch (Exception e) {
-            e.printStackTrace();
+            log.info("PAY AGAIN = ",e);
             return ResponseDto.failure(ErrorMapping.get("20028"));
         }