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

Commit ac68e08a authored by 胡佳晨's avatar 胡佳晨

用户 订单 申请退款

预退款详情 check
发起退了 check
退款详情 uncheck
发起撤回 uncheck
parent 1809958b
...@@ -766,7 +766,7 @@ CREATE TABLE `kylin_order_refund_pic` ...@@ -766,7 +766,7 @@ CREATE TABLE `kylin_order_refund_pic`
`mid` int unsigned NOT NULL AUTO_INCREMENT, `mid` int unsigned NOT NULL AUTO_INCREMENT,
`refund_pic_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'refund_pic_id', `refund_pic_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'refund_pic_id',
`order_refunds_id` varchar(255) NOT NULL DEFAULT '' COMMENT '订单退款表id', `order_refunds_id` varchar(255) NOT NULL DEFAULT '' COMMENT '订单退款表id',
`pic_url` tinyint NOT NULL DEFAULT '0' COMMENT '图片地址', `pic_url` varchar(255) NOT NULL DEFAULT '' COMMENT '图片地址',
`created_at` timestamp NULL DEFAULT NULL, `created_at` timestamp NULL DEFAULT NULL,
`updated_at` timestamp NULL DEFAULT NULL, `updated_at` timestamp NULL DEFAULT NULL,
KEY `kylin_refund_pic_refund_pic_id_index` (`refund_pic_id`), KEY `kylin_refund_pic_refund_pic_id_index` (`refund_pic_id`),
......
...@@ -1279,7 +1279,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM ...@@ -1279,7 +1279,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
} }
BigDecimal refundSinglePrice = dataUtils.getCanRefundOrderEntitiesPrice(orderTicketVo, kylinOrderRefundsVoBaseList, orderTicketEntitiesId); BigDecimal refundSinglePrice = dataUtils.getCanRefundOrderEntitiesPrice(orderTicketVo, kylinOrderRefundsVoBaseList, orderTicketEntitiesId);
if(refundSinglePrice.doubleValue()<=0){
return ResponseDto.failure("申请金额不得小于0");
}
Map token = CurrentUtil.getTokenClaims(); Map token = CurrentUtil.getTokenClaims();
String username = StringUtils.defaultString(((String) token.get("nickname")), ""); String username = StringUtils.defaultString(((String) token.get("nickname")), "");
boolean result = refundsStatusService.userOrderTicketRefunding(orderTicketVo, refundSinglePrice.doubleValue(), orderTicketEntitiesId, reason, picList, uid, username, kylinOrderRefundsVoBaseList.size()); boolean result = refundsStatusService.userOrderTicketRefunding(orderTicketVo, refundSinglePrice.doubleValue(), orderTicketEntitiesId, reason, picList, uid, username, kylinOrderRefundsVoBaseList.size());
...@@ -1428,7 +1430,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM ...@@ -1428,7 +1430,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
sqls.add(SqlMapping.get("kylin_order_refund.withDraw")); sqls.add(SqlMapping.get("kylin_order_refund.withDraw"));
//TODO 生成新QUERY //TODO 生成新QUERY
rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_PAY, MQConst.ROUTING_KEY_SQL_ORDER_PAY, rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_WITHDRAW, MQConst.ROUTING_KEY_SQL_ORDER_WITHDRAW,
SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC)); SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC));
return true; return true;
} catch (Exception e) { } catch (Exception e) {
......
...@@ -403,6 +403,7 @@ public class KylinRefundsStatusServiceImpl { ...@@ -403,6 +403,7 @@ public class KylinRefundsStatusServiceImpl {
mongoTemplate.insert(orderRefundsVo, KylinOrderRefundsVoBase.class.getSimpleName()); mongoTemplate.insert(orderRefundsVo, KylinOrderRefundsVoBase.class.getSimpleName());
// 退款入场人表 // 退款入场人表
KylinOrderRefundEntities kylinOrderRefundEntities = new KylinOrderRefundEntities(); KylinOrderRefundEntities kylinOrderRefundEntities = new KylinOrderRefundEntities();
String orderRefundsEntitiesId = IDGenerator.nextSnowId(); String orderRefundsEntitiesId = IDGenerator.nextSnowId();
...@@ -413,29 +414,30 @@ public class KylinRefundsStatusServiceImpl { ...@@ -413,29 +414,30 @@ public class KylinRefundsStatusServiceImpl {
kylinOrderRefundEntities.setCreatedAt(time); kylinOrderRefundEntities.setCreatedAt(time);
KylinOrderRefundEntitiesVo orderRefundEntitiesVo = new KylinOrderRefundEntitiesVo(); KylinOrderRefundEntitiesVo orderRefundEntitiesVo = new KylinOrderRefundEntitiesVo();
BeanUtils.copyProperties(orderRefundEntitiesVo,kylinOrderRefundEntities); BeanUtils.copyProperties(kylinOrderRefundEntities,orderRefundEntitiesVo);
orderRefundEntitiesVo.setCreatedAt(strTime); orderRefundEntitiesVo.setCreatedAt(strTime);
mongoTemplate.insert(orderRefundEntitiesVo,KylinOrderRefundEntitiesVo.class.getSimpleName()); mongoTemplate.insert(orderRefundEntitiesVo,KylinOrderRefundEntitiesVo.class.getSimpleName());
//退款图片 //退款图片
KylinOrderRefundPic orderRefundPic = new KylinOrderRefundPic(); KylinOrderRefundPic orderRefundPic = new KylinOrderRefundPic();
orderRefundPic.setOrderRefundsId(IDGenerator.nextSnowId()); orderRefundPic.setRefundPicId(IDGenerator.nextSnowId());
orderRefundPic.setOrderRefundsId(kylinOrderRefunds.getOrderRefundsId()); orderRefundPic.setOrderRefundsId(kylinOrderRefunds.getOrderRefundsId());
orderRefundPic.setPicUrl(picList); orderRefundPic.setPicUrl(picList);
orderRefundPic.setCreatedAt(time); orderRefundPic.setCreatedAt(time);
KylinOrderRefundPicVo orderRefundPicVo = new KylinOrderRefundPicVo(); KylinOrderRefundPicVo orderRefundPicVo = new KylinOrderRefundPicVo();
BeanUtils.copyProperties(orderRefundPicVo,orderRefundPic); BeanUtils.copyProperties(orderRefundPic,orderRefundPicVo);
orderRefundPicVo.setCreatedAt(strTime); orderRefundPicVo.setCreatedAt(strTime);
mongoTemplate.insert(orderRefundPicVo,KylinOrderRefundPicVo.class.getSimpleName()); mongoTemplate.insert(orderRefundPicVo,KylinOrderRefundPicVo.class.getSimpleName());
dataUtils.delOrderRefundVoByOrderId(orderInfo.getOrderTicketsId());
//MQ //MQ
LinkedList<String> sqls = new LinkedList<>(); LinkedList<String> sqls = new LinkedList<>();
LinkedList<Object[]> sqlsDataA = new LinkedList<>(); LinkedList<Object[]> sqlsDataA = new LinkedList<>();
LinkedList<Object[]> sqlsDataB = new LinkedList<>(); LinkedList<Object[]> sqlsDataB = new LinkedList<>();
LinkedList<Object[]> sqlsDataC = new LinkedList<>(); LinkedList<Object[]> sqlsDataC = new LinkedList<>();
LinkedList<Object[]> sqlsDataD = new LinkedList<>(); LinkedList<Object[]> sqlsDataD = new LinkedList<>();
LinkedList<Object[]> sqlsDataE = new LinkedList<>(); LinkedList <Object[]> sqlsDataE = new LinkedList<>();
sqls.add(SqlMapping.get("kylin_order_ticket_status.refund")); sqls.add(SqlMapping.get("kylin_order_ticket_status.refund"));
sqls.add(SqlMapping.get("kylin_order_ticket_entities.refund")); sqls.add(SqlMapping.get("kylin_order_ticket_entities.refund"));
...@@ -465,7 +467,7 @@ public class KylinRefundsStatusServiceImpl { ...@@ -465,7 +467,7 @@ public class KylinRefundsStatusServiceImpl {
}); });
//TODO 生成新QUERY //TODO 生成新QUERY
rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_PAY, MQConst.ROUTING_KEY_SQL_ORDER_PAY, rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_REFUND, MQConst.ROUTING_KEY_SQL_ORDER_REFUND,
SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC, sqlsDataD, sqlsDataE)); SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC, sqlsDataD, sqlsDataE));
return true; return true;
......
...@@ -619,6 +619,14 @@ public class DataUtils { ...@@ -619,6 +619,14 @@ public class DataUtils {
return (List<KylinOrderRefundsVoBase>) redisUtil.get(KylinRedisConst.ORDER_REFUND_BY_ORDER_ID + orderId); return (List<KylinOrderRefundsVoBase>) redisUtil.get(KylinRedisConst.ORDER_REFUND_BY_ORDER_ID + orderId);
} }
public void delOrderRefundVo(String orderRefundsId){
redisUtil.del(KylinRedisConst.ORDER_REFUND + orderRefundsId);
}
public void delOrderRefundVoByOrderId(String orderId){
redisUtil.del(KylinRedisConst.ORDER_REFUND_BY_ORDER_ID + orderId);
}
/** /**
* 获取可退款票单价格 * 获取可退款票单价格
* @param orderTicketVo 订单vo数据 * @param orderTicketVo 订单vo数据
......
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