记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 7243132f authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

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

parents 3c470f16 7d2c8e46
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 20 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderTicketsService.java
View file @ 7243132f
......@@ -32,10 +32,10 @@ public interface IKylinOrderTicketsService {
ResponseDto<Integer> orderUnPayCount();
//想要退款详情
KylinOrderTicketPreVo toOrderRefundDetails(String orderId);
ResponseDto<KylinOrderTicketPreVo> toOrderRefundDetails(String orderId);
//退款详情
OrderRefundVo orderRefundDetails(String orderId,String orderRefundId);
ResponseDto<OrderRefundVo> orderRefundDetails(String orderId,String orderRefundId);
/**
* 发起退款
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml
View file @ 7243132f
......@@ -156,15 +156,74 @@
<if test="orderStatus!=null and orderStatus!=''">
AND kots.status = #{orderStatus}
</if>
<if test="sponsor!=null and sponsor!=''">
AND kp.sponsor = #{sponsor}
</if>
</where>
<!-- <if test="orderItem!=''">-->
<!-- ORDER BY ${orderItem} ${orderSc}-->
<!-- </if>-->
</select>
<select id="orderList_COUNT" resultType="Long">
<choose>
<when test="(sponsor!=null and sponsor!='') or (orderStatus!=null and orderStatus!='')">
SELECT count(1)
FROM kylin_order_tickets kot
inner join kylin_order_ticket_status kots on kot.order_tickets_id = kots.order_id
inner join kylin_order_ticket_relations kotr on kot.order_tickets_id = kotr.order_id
inner join kylin_performances kp on kotr.performance_id = kp.performances_id
</when>
<otherwise>
SELECT
count(1)
FROM kylin_order_tickets kot
</otherwise>
</choose>
<where>
<if test="userId != null and userId != ''">and kot.user_id = #{userId}</if>
<if test="userName != null and userName != ''">and kot.user_name like concat('%', #{userName}, '%')</if>
<if test="userMobile != null and userMobile != ''">and kot.user_mobile = #{userMobile}</if>
<if test="performanceTitle != null and performanceTitle != ''">
and kot.performance_title like concat('%', #{performanceTitle}, '%')
</if>
<if test="orderCode != null and orderCode != ''">and kot.order_code = #{orderCode}</if>
<if test="orderType != null and orderType != ''">and kot.order_type = #{orderType}</if>
<if test="orderVersion != null and orderVersion != ''">and kot.order_version = #{orderVersion}</if>
<if test="number != null ">and kot.number = #{number}</if>
<if test="price != null ">and kot.price = #{price}</if>
<if test="priceMember != null ">and kot.price_member = #{priceMember}</if>
<if test="priceTotal != null ">and kot.price_total = #{priceTotal}</if>
<if test="priceVoucher != null ">and kot.price_voucher = #{priceVoucher}</if>
<if test="priceActual != null ">and kot.price_actual = #{priceActual}</if>
<if test="priceExpress != null ">and kot.price_express = #{priceExpress}</if>
<if test="priceRefund != null ">and kot.price_refund = #{priceRefund}</if>
<if test="refundNumber != null ">and kot.refund_number = #{refundNumber}</if>
<if test="payType != null and payType != ''">and kot.pay_type = #{payType}</if>
<if test="paymentType != null and paymentType != ''">and kot.payment_type = #{paymentType}</if>
<if test="timePay != null and timePay != ''">and kot.time_pay = #{timePay}</if>
<if test="expressContacts != null and expressContacts != ''">and kot.express_contacts =
#{expressContacts}
</if>
<if test="expressAddress != null and expressAddress != ''">and kot.express_address = #{expressAddress}</if>
<if test="expressPhone != null and expressPhone != ''">and kot.express_phone = #{expressPhone}</if>
<if test="couponType != null and couponType != ''">and kot.coupon_type = #{couponType}</if>
<if test="getTicketType != null and getTicketType != ''">and kot.get_ticket_type = #{getTicketType}</if>
<if test="getTicketDescribe != null and getTicketDescribe != ''">and kot.get_ticket_describe =
#{getTicketDescribe}
</if>
<if test="payCountdownMinute != null ">and kot.pay_countdown_minute = #{payCountdownMinute}</if>
<if test="comment != null and comment != ''">and kot.comment = #{comment}</if>
<if test="createdAt != null ">and kot.created_at = #{createdAt}</if>
<if test="updatedAt != null ">and kot.updated_at = #{updatedAt}</if>
<if test="orderSource != null and orderSource != ''">and kot.order_source = #{orderSource}</if>
<if test="orderType != null and orderType != ''">and kot.order_type = #{orderType}</if>
<if test="sponsor!=null and sponsor!=''">
AND kp.sponsor = #{sponsor}
</if>
<if test="orderStatus!=null and orderStatus!=''">
AND kots.status = #{orderStatus}
</if>
</where>
</select>
<select id="pushDamaiDetailsList" parameterType="java.lang.String" resultMap="orderPushDamaiDto">
SELECT ote.mid,
order_tickets_id,
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinOrderTicketsController.java
View file @ 7243132f
......@@ -89,12 +89,7 @@ public class KylinOrderTicketsController {
@ApiOperation("想要退款订单详情")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<KylinOrderTicketPreVo> toOrderRefundDetails(@RequestParam(value = "orderId", required = false) @NotNull(message = "订单id不能为空") String orderId) {
KylinOrderTicketPreVo vo = orderTicketsService.toOrderRefundDetails(orderId);
if (null == vo) {
return ResponseDto.failure(ErrorMapping.get("20003"));
} else {
return ResponseDto.success(vo);
}
return orderTicketsService.toOrderRefundDetails(orderId);
}
@PostMapping("sendOrderRefunds")
......@@ -119,7 +114,7 @@ public class KylinOrderTicketsController {
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<OrderRefundVo> orderRefundDetails(@RequestParam(value = "orderId", required = true) @NotNull(message = "订单id不能为空") String orderId,
@RequestParam(value = "orderRefundId", required = true) @NotNull(message = "退款订单id不能为空") String orderRefundId) {
return orderTicketsService.orderRefundDetails(orderId, orderRefundId) == null ? ResponseDto.failure("获取失败") : ResponseDto.success(orderTicketsService.orderRefundDetails(orderId, orderRefundId));
return orderTicketsService.orderRefundDetails(orderId, orderRefundId);
}
@PostMapping("orderRefundWithdraw")
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
View file @ 7243132f
......@@ -270,7 +270,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
}
@Override
public KylinOrderTicketPreVo toOrderRefundDetails(String orderId) {
public ResponseDto<KylinOrderTicketPreVo> toOrderRefundDetails(String orderId) {
try {
KylinOrderTicketPreVo vo = new KylinOrderTicketPreVo();
String uid = CurrentUtil.getCurrentUid();
......@@ -278,7 +278,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(orderTicketVo.getPerformanceId());
List<KylinOrderRefundsVo> kylinOrderRefundsVoBaseList = dataUtils.getOrderRefundVoByOrderId(orderTicketVo.getOrderTicketsId());
if (!orderTicketVo.getUserId().equals(uid)) {
return null;
return ResponseDto.failure(ErrorMapping.get("20003"));
}
List<KylinOrderTicketEntitiesVo> kylinOrderTicketEntitiesVoList = orderTicketVo.getEntitiesVoList();
List<KylinOrderTicketEntitiesPreRefundVo> kylinOrderTicketEntitiesPreRefundVos = new ArrayList<>();
......@@ -301,15 +301,15 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
BeanUtils.copyProperties(orderTicketVo, vo);
vo.setIsTrueName(performanceVo.getIsTrueName());
vo.setEntitiesPreRefundVos(kylinOrderTicketEntitiesPreRefundVos);
return vo;
return ResponseDto.success(vo);
} catch (Exception e) {
e.printStackTrace();
return null;
return ResponseDto.failure(ErrorMapping.get("20030"));
}
}
@Override
public OrderRefundVo orderRefundDetails(String orderId, String orderRefundId) {
public ResponseDto<OrderRefundVo> orderRefundDetails(String orderId, String orderRefundId) {
try {
OrderRefundVo vo = new OrderRefundVo();
String uid = CurrentUtil.getCurrentUid();
......@@ -317,15 +317,15 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(orderTicketVo.getPerformanceId());
if (!orderTicketVo.getUserId().equals(uid)) {
return null;
return ResponseDto.failure(ErrorMapping.get("20003"));
}
orderTicketVo.setFieldName(performanceVo.getFieldName());
KylinOrderRefundsVo kylinOrderRefundsVoBase = dataUtils.getOrderRefundVo(orderRefundId);
vo.setKylinOrderRefundsVoBaseList(kylinOrderRefundsVoBase);
vo.setOrderTicketVo(orderTicketVo);
return vo;
return ResponseDto.success(vo);
} catch (Exception e) {
return null;
return ResponseDto.failure(ErrorMapping.get("20030"));
}
}
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/errors.properties
View file @ 7243132f
......@@ -33,6 +33,7 @@
20028=订单已失效
20027=您已支付请刷新再试
20029=未选择支付方式
20030=无权查看
#APP PARTNER
20101=添加失败
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment