Merge branch 'pre' into 'master'

Pre

See merge request !54

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderRefundsVo.java

@@ -66,6 +66,7 @@ public class KylinOrderRefundsVo implements Serializable,Cloneable {
     private Integer status;
 
     private String statusName;
+    private Integer refundCate;
 
     @ApiModelProperty(value = "退款差异: 0申请退款返还库存 1自动退款无法取消退款不返还库存")
     private Integer type;

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

@@ -50,7 +50,7 @@ public class AdamMemberController {
 
                 memberVo.setUserMemberVo(userMemberVo);
 
-                if (null == userMemberVo) {
+                if (null == userMemberVo || !userMemberVo.isActive()) {
                     memberVo.setRightsVoList(adamRdmService.getMemberRightsVoByMemberId(memberVo.getMemberId(), 0));
                 } else if (userMemberVo.isActive()) {
                     memberVo.setRightsVoList(

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

@@ -139,6 +139,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
         memberOrderVo.setState(0);// 0-待支付
         memberOrderVo.setUid(currentUid);
         memberOrderVo.setPrice(param.getPrice());
+        memberOrderVo.setPricePaid(paymentPrice);
         memberOrderVo.setClientIp(clientIp);
         String headerCliVersion = CurrentUtil.getHeaderCliVersion(), headerCliSource = CurrentUtil.getHeaderCliSource();
         memberOrderVo.setSource(null == headerCliSource ? "" : headerCliSource);
@@ -201,11 +202,10 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
         if (1 == shotMemberOrderVo.getState() || 3 == shotMemberOrderVo.getState()) {
             return ResponseDto.failure(ErrorMapping.get("10502"), parameter);
         }
-        // 因不同阶段用户购买金额不一样，这里不方便判断实际取值，停用金额校验
-//        if (parameter.getPrice().compareTo(shotMemberOrderVo.getPrice()) != 0) {
-//            // 订单金额比对
-//            return ResponseDto.failure(ErrorMapping.get("10503"), parameter);
-//        }
+        if (parameter.getPrice().compareTo(shotMemberOrderVo.getPricePaid()) != 0) {
+            // 订单金额比对
+            return ResponseDto.failure(ErrorMapping.get("10503"), parameter);
+        }
         AdamMemberPriceVo memberPriceVo = adamRdmService.getMemberPriceVoByPriceId(
                 shotMemberOrderVo.getMemberId(), shotMemberOrderVo.getMemberPriceId());
         if (null == memberPriceVo) {