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

Commit 857f06ff authored by 胡佳晨's avatar 胡佳晨

修改 同步大麦

parent 9ed5595b
...@@ -233,9 +233,9 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl ...@@ -233,9 +233,9 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
} }
if (item.getStatus() == 4) { if (item.getIsPayment() == 3) {
taobaoTicketUtils.withdrawDamaiOrder(timemId, orderTicketEntitiesKey); taobaoTicketUtils.withdrawDamaiOrder(timemId, orderTicketEntitiesKey);
} else if(item.getStatus() == 0){ } else if(item.getIsPayment() == 1){
log.info("FOREACH STEP 3 "); log.info("FOREACH STEP 3 ");
list2.add(obj3); list2.add(obj3);
obj3.setUserName(item.getEnterName());//用户名 入场人姓名 obj3.setUserName(item.getEnterName());//用户名 入场人姓名
......
...@@ -21,6 +21,7 @@ public class OrderPushDamaiDto { ...@@ -21,6 +21,7 @@ public class OrderPushDamaiDto {
String enterMobile; String enterMobile;
String timePay; String timePay;
String timeId; String timeId;
Integer isPayment;
String ticketId; String ticketId;
Integer isMember; Integer isMember;
String orderTicketEntitiesId; String orderTicketEntitiesId;
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
<result column="order_tickets_id" property="orderTicketsId"/> <result column="order_tickets_id" property="orderTicketsId"/>
<result column="mid" property="mid"/> <result column="mid" property="mid"/>
<result column="status" property="status"/> <result column="status" property="status"/>
<result column="is_payment" property="isPayment"/>
<result column="enter_name" property="enterName"/> <result column="enter_name" property="enterName"/>
<result column="enter_id_code" property="enterIdCode"/> <result column="enter_id_code" property="enterIdCode"/>
<result column="enter_mobile" property="enterMobile"/> <result column="enter_mobile" property="enterMobile"/>
...@@ -232,6 +233,7 @@ ...@@ -232,6 +233,7 @@
enter_name, enter_name,
enter_id_code, enter_id_code,
ote.status, ote.status,
ote.is_payment,
enter_type, enter_type,
enter_mobile, enter_mobile,
time_pay, time_pay,
...@@ -245,8 +247,7 @@ ...@@ -245,8 +247,7 @@
LEFT JOIN kylin_order_ticket_relations AS otr ON otr.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 LEFT JOIN kylin_order_ticket_entities AS ote ON ote.order_id = ot.order_tickets_id
LEFT JOIN kylin_ticket_status AS kys ON kys.ticket_id = otr.ticket_id LEFT JOIN kylin_ticket_status AS kys ON kys.ticket_id = otr.ticket_id
WHERE ots.pay_status = 1 WHERE ots.pay_status = 1
AND ote.is_payment = 1
AND kys.sync_damai = 1 AND kys.sync_damai = 1
AND ote.ticket_id = ${ticketsId} AND ote.ticket_id = ${ticketsId}
</select> </select>
......
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