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

Skip to content

L
liquidnet-bus-v1
Commit 8524f705 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

Merge branch 'test'

parents b3308887 6b60edd0
Hide whitespace changes
Inline Side-by-side
Showing with 143 additions and 42 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performanceOrderList.html
View file @ 8524f705
......@@ -107,19 +107,6 @@
return $.table.selectDictLabel(orderStatusDic, value);
}
},
{
field: '',
title: '快递',
formatter: function (value, row, index) {
var expressType = '';
if (row.expressType == 1) {
expressType = "寄付";
} else {
expressType = "到付";
}
return '快递方式：'+expressType+'<br>'+'快递费：'+row.priceExpress;
}
},
{
field: '',
title: '购买用户',
......@@ -140,6 +127,54 @@
return '姓名：'+expressContacts+'<br>'+'地址：'+expressAddress+'<br>'+'手机号：'+expressPhone;
}
},
{
field: '',
title: '快递费',
formatter: function (value, row, index) {
var expressType = '';
if (row.expressType == 1) {
expressType = "寄付";
} else {
expressType = "到付";
}
return '快递方式：'+expressType+'<br>'+'快递费：'+row.priceExpress;
}
},
{
field: '',
title: '快递信息',
formatter: function(value, row, index) {
var mailno = row.mailno;
var expressStatus = row.expressStatus;
var expressStatusName = '';
if (null == mailno) {
mailno = '';
}
if (null != expressStatus) {
switch (expressStatus) {
case 1:
expressStatusName = '下单失败';
break;
case 2:
expressStatusName = '下单成功';
break;
case 3:
expressStatusName = '下单取消';
break;
case 50:
expressStatusName = '已揽收';
break;
case 80:
expressStatusName = '已签收';
break;
default:
expressStatusName = '运输中';
break;
}
}
return '快递单号：'+mailno+'<br>'+'快递状态：'+expressStatusName;
}
},
{
title: '操作',
align: 'center',
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceExpressPerformanceOrderListAdminDao.java
View file @ 8524f705
......@@ -19,8 +19,10 @@ public class PerformanceExpressPerformanceOrderListAdminDao {
String expressContacts;
String expressAddress;
String expressPhone;
String expressStatus;
Integer expressType;
String mailno;
Integer expressStatus;
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml
View file @ 8524f705
......@@ -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,
......@@ -221,11 +280,16 @@
kot.express_phone,
kots.status,
kots.express_type
kots.express_type,
oe.mailno,
oe.express_status
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_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
LEFT JOIN (SELECT * FROM kylin_order_express WHERE express_status NOT IN (1, 3)) AS oe ON oe.order_tickets_id = kot.order_tickets_id
LEFT JOIN (SELECT * FROM kylin_order_express_route ORDER BY mid DESC LIMIT 1) AS oer ON oe.order_express_id = oer.order_express_id
<where>
kotr.performance_id = #{performancesId}
AND kot.get_ticket_type = 'express'
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
View file @ 8524f705
......@@ -196,39 +196,39 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
Integer orderExpressStatus = dataUtils.getOrderExpressInfo(orderTicketVo.getOrderTicketsId());
vo.setExpressStatus(orderExpressStatus);
if (null != performanceVo.getIsCanRefund() && performanceVo.getIsCanRefund() == 1) {
LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate) && orderTicketVo.getExpressAddress().trim().equals("") && ticketVo.getCounts()==1) {
vo.setIsCanRefund(1);
} else {
vo.setIsCanRefund(0);
}
} else {
vo.setIsCanRefund(0);
}
currentTime = System.currentTimeMillis() - currentTime;
log.debug("是否支持退款 -> time:" + (currentTime) + "毫秒");
List<KylinOrderRefundsOrderCodeVo> orderRefundsVoBaseList = new ArrayList<>();
List<KylinOrderRefundsVo> orderRefundsVoList = dataUtils.getOrderRefundVoByOrderId(orderId);
currentTime = System.currentTimeMillis() - currentTime;
log.debug("获取退款详情 -> time:" + (currentTime) + "毫秒");
for (KylinOrderRefundsVo item : orderRefundsVoList) {
KylinOrderRefundsOrderCodeVo data = new KylinOrderRefundsOrderCodeVo();
data.setOrderRefundsId(item.getOrderRefundsId());
data.setOrderRefundCode(item.getOrderRefundCode());
data.setStatus(item.getStatus());
}
List<OrderRefundListVo> orderRefundListVos = new ArrayList<>();
BigDecimal lockPrice = new BigDecimal("0.00");
for (KylinOrderRefundsVo item : orderRefundsVoList) {
OrderRefundListVo data = new OrderRefundListVo();
data.setOrderRefundCode(item.getOrderRefundCode().substring(item.getOrderRefundCode().length() - 10));
data.setOrderRefundsId(item.getOrderRefundsId());
data.setStatus(item.getStatus());
if (item.getStatus().equals(0) || item.getStatus().equals(1) || item.getStatus().equals(7) || item.getStatus().equals(3) || item.getStatus().equals(4)) {
lockPrice = lockPrice.add(item.getPrice());
}
orderRefundListVos.add(data);
}
if (null != performanceVo.getIsCanRefund() && performanceVo.getIsCanRefund() == 1) {
LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate) && orderTicketVo.getExpressAddress().trim().equals("")
&& ticketVo.getCounts() == 1 && lockPrice.compareTo(orderTicketVo.getPriceActual()) == 0) {
vo.setIsCanRefund(1);
} else {
vo.setIsCanRefund(0);
}
} else {
vo.setIsCanRefund(0);
}
currentTime = System.currentTimeMillis() - currentTime;
log.debug("是否支持退款 -> time:" + (currentTime) + "毫秒");
currentTime = System.currentTimeMillis() - currentTime;
log.debug("循环退款详情 -> time:" + (currentTime) + "毫秒");
orderTicketVo.setOrderRefundListVos(orderRefundListVos);
......@@ -361,7 +361,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
if (null != performanceVo.getIsCanRefund() && performanceVo.getIsCanRefund() == 1) {
LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate) && orderTicketVo.getExpressAddress().trim().equals("") && ticketVo.getCounts()==1) {
if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate) && orderTicketVo.getExpressAddress().trim().equals("") && ticketVo.getCounts() == 1) {
} else {
return "暂不支持退款";
......@@ -381,7 +381,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
}
BigDecimal refundSinglePrice = dataUtils.getCanRefundOrderEntitiesPrice(orderTicketVo, kylinOrderRefundsVoBaseList, orderTicketEntitiesId);
if (refundSinglePrice.compareTo(BigDecimal.ZERO)<=0) {
if (refundSinglePrice.compareTo(BigDecimal.ZERO) <= 0) {
return "申请金额不得小于0";
}
Map token = CurrentUtil.getTokenClaims();
......
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