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

Skip to content

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

同步大麦

parent 6f6ca89f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 202 additions and 64 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/other/DamaiService.java
View file @ 6d45a994
...@@ -11,7 +11,9 @@ public interface DamaiService { ...@@ -11,7 +11,9 @@ public interface DamaiService {
//同步演出 //同步演出
Boolean sycPerformance(String performanceId); Boolean sycPerformance(String performanceId);
//同步场次 //同步场次
Boolean sycTimes(String performanceId, KylinTicketTimes timesData); Boolean sycTimes(long performanceId, KylinTicketTimes timesData);
//同步票 //同步票
Boolean sycTicket(String timeId, KylinTickets ticketsData); Boolean sycTicket(long timeId, KylinTickets ticketsData);
//订单
Boolean sycOrder(long timeId, String ticketsId,long ticketsmId);
} }
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/OrderPushDamaiDto.java 0 → 100644
View file @ 6d45a994
package com.liquidnet.service.kylin.dao;
import lombok.Data;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0
* @class: PerformanceOrderListDao
* @Package com.liquidnet.service.kylin.dao
* @Copyright: LightNet @ Copyright (c) 2021
* @date 2021/6/4 13:31
*/
@Data
public class OrderPushDamaiDto {
String orderTicketsId;
Integer mid;
String enterName;
String enterIdCode;
Integer enterType;
String enterMobile;
String timePay;
String timeId;
String ticketId;
Integer isMember;
String orderTicketEntitiesId;
String getTicketType;
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinOrderTicketsMapper.java
View file @ 6d45a994
package com.liquidnet.service.kylin.mapper; package com.liquidnet.service.kylin.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.liquidnet.service.kylin.dao.OrderPushDamaiDto;
import com.liquidnet.service.kylin.dao.OrderTicketsListDao; import com.liquidnet.service.kylin.dao.OrderTicketsListDao;
import com.liquidnet.service.kylin.entity.KylinOrderTickets; import com.liquidnet.service.kylin.entity.KylinOrderTickets;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
...@@ -28,4 +29,9 @@ public interface KylinOrderTicketsMapper extends BaseMapper<KylinOrderTickets> { ...@@ -28,4 +29,9 @@ public interface KylinOrderTicketsMapper extends BaseMapper<KylinOrderTickets> {
List<KylinOrderTickets> getOrderList(@Param("targetId") String targetId, @Param("mid") int mid, @Param("limitNum") int limitNum); List<KylinOrderTickets> getOrderList(@Param("targetId") String targetId, @Param("mid") int mid, @Param("limitNum") int limitNum);
List<OrderTicketsListDao> orderList(HashMap<String, Object> map); List<OrderTicketsListDao> orderList(HashMap<String, Object> map);
List<OrderTicketsListDao> orderDamaiList(String ticketsId);
List<OrderPushDamaiDto> pushDamaiDetailsList(String ticketsId);
} }
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml
View file @ 6d45a994
...@@ -25,6 +25,22 @@ ...@@ -25,6 +25,22 @@
<result column="user_mobile" property="userMobile"/> <result column="user_mobile" property="userMobile"/>
<result column="order_source" property="orderSource"/> <result column="order_source" property="orderSource"/>
</resultMap> </resultMap>
<resultMap id="orderPushDamaiDto" type="com.liquidnet.service.kylin.dao.OrderPushDamaiDto">
<result column="order_tickets_id" property="orderTicketsId"/>
<result column="mid" property="mid"/>
<result column="enter_name" property="enterName"/>
<result column="enter_id_code" property="enterIdCode"/>
<result column="enter_mobile" property="enterMobile"/>
<result column="enter_type" property="enterType"/>
<result column="time_pay" property="timePay"/>
<result column="time_id" property="timeId"/>
<result column="ticket_id" property="ticketId"/>
<result column="is_member" property="isMember"/>
<result column="order_ticket_entities_id" property="orderTicketEntitiesId"/>
<result column="get_ticket_type" property="getTicketType"/>
</resultMap>
<select id="getPriceNum" resultType="java.util.HashMap"> <select id="getPriceNum" resultType="java.util.HashMap">
SELECT SUM(o.price_actual) as total_price, SUM(o.number) as total_num SELECT SUM(o.price_actual) as total_price, SUM(o.number) as total_num
FROM kylin_order_tickets AS o FROM kylin_order_tickets AS o
...@@ -54,7 +70,8 @@ ...@@ -54,7 +70,8 @@
</foreach> </foreach>
</where> </where>
</select> </select>
<select id="getOrderList" parameterType="java.lang.String" resultType="com.liquidnet.service.kylin.entity.KylinOrderTickets"> <select id="getOrderList" parameterType="java.lang.String"
resultType="com.liquidnet.service.kylin.entity.KylinOrderTickets">
SELECT o.mid, order_tickets_id, number, price_actual, performance_title SELECT o.mid, order_tickets_id, number, price_actual, performance_title
FROM kylin_order_tickets AS o FROM kylin_order_tickets AS o
JOIN kylin_order_ticket_relations AS r ON r.order_id = o.order_tickets_id JOIN kylin_order_ticket_relations AS r ON r.order_id = o.order_tickets_id
...@@ -97,42 +114,72 @@ ...@@ -97,42 +114,72 @@
inner join kylin_order_ticket_relations kotr on kot.order_tickets_id = kotr.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 inner join kylin_performances kp on kotr.performance_id = kp.performances_id
<where> <where>
<if test="orderTicketsId != null and orderTicketsId != ''"> and kot.order_tickets_id = #{orderTicketsId}</if> <if test="orderTicketsId != null and orderTicketsId != ''">and kot.order_tickets_id = #{orderTicketsId}
<if test="userId != null and userId != ''"> and kot.user_id = #{userId}</if> </if>
<if test="userName != null and userName != ''"> and kot.user_name like concat('%', #{userName}, '%')</if> <if test="userId != null and userId != ''">and kot.user_id = #{userId}</if>
<if test="userMobile != null and userMobile != ''"> and kot.user_mobile = #{userMobile}</if> <if test="userName != null and userName != ''">and kot.user_name like concat('%', #{userName}, '%')</if>
<if test="performanceTitle != null and performanceTitle != ''"> and kot.performance_title = #{performanceTitle}</if> <if test="userMobile != null and userMobile != ''">and kot.user_mobile = #{userMobile}</if>
<if test="orderCode != null and orderCode != ''"> and kot.order_code = #{orderCode}</if> <if test="performanceTitle != null and performanceTitle != ''">and kot.performance_title =
<if test="payCode != null and payCode != ''"> and kot.pay_code = #{payCode}</if> #{performanceTitle}
<if test="qrCode != null and qrCode != ''"> and kot.qr_code = #{qrCode}</if> </if>
<if test="orderType != null and orderType != ''"> and kot.order_type = #{orderType}</if> <if test="orderCode != null and orderCode != ''">and kot.order_code = #{orderCode}</if>
<if test="orderVersion != null and orderVersion != ''"> and kot.order_version = #{orderVersion}</if> <if test="payCode != null and payCode != ''">and kot.pay_code = #{payCode}</if>
<if test="number != null "> and kot.number = #{number}</if> <if test="qrCode != null and qrCode != ''">and kot.qr_code = #{qrCode}</if>
<if test="price != null "> and kot.price = #{price}</if> <if test="orderType != null and orderType != ''">and kot.order_type = #{orderType}</if>
<if test="priceMember != null "> and kot.price_member = #{priceMember}</if> <if test="orderVersion != null and orderVersion != ''">and kot.order_version = #{orderVersion}</if>
<if test="priceTotal != null "> and kot.price_total = #{priceTotal}</if> <if test="number != null ">and kot.number = #{number}</if>
<if test="priceVoucher != null "> and kot.price_voucher = #{priceVoucher}</if> <if test="price != null ">and kot.price = #{price}</if>
<if test="priceActual != null "> and kot.price_actual = #{priceActual}</if> <if test="priceMember != null ">and kot.price_member = #{priceMember}</if>
<if test="priceExpress != null "> and kot.price_express = #{priceExpress}</if> <if test="priceTotal != null ">and kot.price_total = #{priceTotal}</if>
<if test="priceRefund != null "> and kot.price_refund = #{priceRefund}</if> <if test="priceVoucher != null ">and kot.price_voucher = #{priceVoucher}</if>
<if test="refundNumber != null "> and kot.refund_number = #{refundNumber}</if> <if test="priceActual != null ">and kot.price_actual = #{priceActual}</if>
<if test="payType != null and payType != ''"> and kot.pay_type = #{payType}</if> <if test="priceExpress != null ">and kot.price_express = #{priceExpress}</if>
<if test="paymentType != null and paymentType != ''"> and kot.payment_type = #{paymentType}</if> <if test="priceRefund != null ">and kot.price_refund = #{priceRefund}</if>
<if test="timePay != null and timePay != ''"> and kot.time_pay = #{timePay}</if> <if test="refundNumber != null ">and kot.refund_number = #{refundNumber}</if>
<if test="expressContacts != null and expressContacts != ''"> and kot.express_contacts = #{expressContacts}</if> <if test="payType != null and payType != ''">and kot.pay_type = #{payType}</if>
<if test="expressAddress != null and expressAddress != ''"> and kot.express_address = #{expressAddress}</if> <if test="paymentType != null and paymentType != ''">and kot.payment_type = #{paymentType}</if>
<if test="expressPhone != null and expressPhone != ''"> and kot.express_phone = #{expressPhone}</if> <if test="timePay != null and timePay != ''">and kot.time_pay = #{timePay}</if>
<if test="couponType != null and couponType != ''"> and kot.coupon_type = #{couponType}</if> <if test="expressContacts != null and expressContacts != ''">and kot.express_contacts =
<if test="getTicketType != null and getTicketType != ''"> and kot.get_ticket_type = #{getTicketType}</if> #{expressContacts}
<if test="getTicketDescribe != null and getTicketDescribe != ''"> and kot.get_ticket_describe = #{getTicketDescribe}</if> </if>
<if test="payCountdownMinute != null "> and kot.pay_countdown_minute = #{payCountdownMinute}</if> <if test="expressAddress != null and expressAddress != ''">and kot.express_address = #{expressAddress}</if>
<if test="comment != null and comment != ''"> and kot.comment = #{comment}</if> <if test="expressPhone != null and expressPhone != ''">and kot.express_phone = #{expressPhone}</if>
<if test="createdAt != null "> and kot.created_at = #{createdAt}</if> <if test="couponType != null and couponType != ''">and kot.coupon_type = #{couponType}</if>
<if test="updatedAt != null "> and kot.updated_at = #{updatedAt}</if> <if test="getTicketType != null and getTicketType != ''">and kot.get_ticket_type = #{getTicketType}</if>
<if test="orderSource != null and orderSource != ''"> and kot.order_source = #{orderSource}</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>
</where> </where>
<!-- <if test="orderItem!=''">--> <!-- <if test="orderItem!=''">-->
<!-- ORDER BY ${orderItem} ${orderSc}--> <!-- ORDER BY ${orderItem} ${orderSc}-->
<!-- </if>--> <!-- </if>-->
</select>
<select id="pushDamaiDetailsList" parameterType="java.lang.String" resultMap="orderPushDamaiDto">
SELECT ote.mid,
order_tickets_id,
enter_name,
enter_id_code,
enter_type,
enter_mobile,
time_pay,
otr.time_id,
otr.ticket_id,
otr.is_member,
ote.order_ticket_entities_id,
get_ticket_type
FROM kylin_order_tickets AS ot
LEFT JOIN kylin_order_ticket_status AS ots ON ots.order_id = ot.order_tickets_id
LEFT JOIN kylin_order_ticket_relations AS otr ON otr.order_id = ot.order_tickets_id
LEFT JOIN kylin_order_ticket_entities AS ote ON ote.order_id = ot.order_tickets_id
WHERE ots.pay_status = 1
AND ote.is_payment = 1
AND ote.sys_damai = 1
AND ote.ticket_id = ${ticketsId}
</select> </select>
</mapper> </mapper>
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/bootstrap-service-kylin.yml
View file @ 6d45a994
...@@ -9,9 +9,9 @@ eureka: ...@@ -9,9 +9,9 @@ eureka:
spring: spring:
cloud: cloud:
config: config:
# uri: http://127.0.0.1:7002/support-config uri: http://39.106.122.201:7002/support-config
profile: ${liquidnet.cloudConfig.profile} # profile: ${liquidnet.cloudConfig.profile}
name: ${spring.application.name} #默认为spring.application.name # name: ${spring.application.name} #默认为spring.application.name
discovery: # discovery:
enabled: true # enabled: true
service-id: liquidnet-support-config # service-id: liquidnet-support-config
\ No newline at end of file
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