修改 代理相关数据存储

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinAgentVo.java

@@ -14,6 +14,14 @@ public class KylinAgentVo implements Serializable, Cloneable {
     private int isBlack;
     @ApiModelProperty(value = "票提")
     private BigDecimal carry;
+    @ApiModelProperty(value = "抽成票提")
+    private BigDecimal exCarry;
+
+    @ApiModelProperty(value = "代理id")
+    private String agentId;
+    @ApiModelProperty(value = "总代id")
+    private String agentMasterId;
+
 
     private static final KylinAgentVo obj = new KylinAgentVo();
 

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTicketRelations.java

@@ -67,6 +67,18 @@ public class KylinOrderTicketRelations implements Serializable, Cloneable {
      */
     private BigDecimal agentDistributions;
 
+    /**
+     * 总代ID
+     */
+    private String agentIdMaster;
+
+
+    /**
+     * 抽成票提
+     */
+    private BigDecimal agentDistributionsMaster;
+
+
     /**
      * 购买者是否是会员
      */
@@ -104,7 +116,7 @@ public class KylinOrderTicketRelations implements Serializable, Cloneable {
      */
     public Object[] getAddObject() {
         return new Object[]{
-                orderTicketRelationsId, orderId, transferId, liveId, agentId, isMember, performanceId, timeId, ticketId, createdAt, updatedAt,agentStatus,agentDistributions
+                orderTicketRelationsId, orderId, transferId, liveId, agentId, isMember, performanceId, timeId, ticketId, createdAt, updatedAt, agentStatus, agentDistributions, agentIdMaster, agentDistributionsMaster
         };
     }
 

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

@@ -518,10 +518,14 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             orderTicketRelations.setAgentId("0");
             orderTicketRelations.setAgentDistributions(BigDecimal.ZERO);
             orderTicketRelations.setAgentStatus(0);
+            orderTicketRelations.setAgentIdMaster("0");
+            orderTicketRelations.setAgentDistributionsMaster(BigDecimal.ZERO);
         } else {
             orderTicketRelations.setAgentId(payOrderParam.getAgentId());
             orderTicketRelations.setAgentDistributions(agentVo.getCarry());
             orderTicketRelations.setAgentStatus(agentVo.getIsBlack() == 1 ? 2 : 1);
+            orderTicketRelations.setAgentIdMaster(agentVo.getAgentMasterId());
+            orderTicketRelations.setAgentDistributionsMaster(agentVo.getExCarry());
         }
 
         orderTicketRelations.setIsMember(isMember ? 1 : 0);

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/OrderUtils.java

@@ -67,8 +67,8 @@ public class OrderUtils {
         } else {
             integers = roadShowOrderLimit(userId, idCard, performanceId, ticketId, performanceBuyCount, ticketBuyCount, isTrueName);
         }
-        log.debug("演出购买数量="+integers[0]);
-        log.debug("票种购买数量="+integers[1]);
+        log.debug("演出购买数量=" + integers[0]);
+        log.debug("票种购买数量=" + integers[1]);
         return judgeMemberType(performanceLimitCount, performanceMemberLimitCount, ticketLimitCount, ticketMemberLimitCount, memberType, integers[0], integers[1], isTrueName);
     }
 
@@ -118,10 +118,10 @@ public class OrderUtils {
     }
 
     public String judgeMemberType(int performanceLimitCount, int performanceMemberLimitCount, int ticketLimitCount, int ticketMemberLimitCount, int memberType, int performanceBuyCount, int ticketBuyCount, int isTrueName) {
-        log.debug("会员限购演出="+performanceMemberLimitCount);
-        log.debug("限购演出="+performanceLimitCount);
-        log.debug("会员限购票种="+ticketMemberLimitCount);
-        log.debug("限购票种="+ticketLimitCount);
+        log.debug("会员限购演出=" + performanceMemberLimitCount);
+        log.debug("限购演出=" + performanceLimitCount);
+        log.debug("会员限购票种=" + ticketMemberLimitCount);
+        log.debug("限购票种=" + ticketLimitCount);
         if (memberType == 1 || memberType == 2) {
             if (performanceBuyCount > performanceMemberLimitCount && performanceMemberLimitCount != 0) {
                 return (1 == isTrueName ? "实名制" : "本场") + "演出限购" + performanceMemberLimitCount + "张，已超出";//超过演出维度购买量
@@ -406,24 +406,28 @@ public class OrderUtils {
                     SmileUserVO vo = res.getData();
                     int identity = vo.getType();//代理类型（0：未审核，1：总代，2：普代，3：未认证）
                     int isBlack = vo.getState();//0正常/1黑名单
+                    String masterId = vo.getAgentId();//总代id
                     BigDecimal totalCarry = vo.getSmileAgentVo().getTotalCarry();//总代票提
                     BigDecimal ordCarry = vo.getSmileAgentVo().getOrdCarry();//普代票提
                     KylinAgentVo agentVo = KylinAgentVo.getNew();
                     agentVo.setIdentity(identity);
                     agentVo.setIsBlack(isBlack);
-                    if (identity == 1) {
+                    agentVo.setAgentId(agentId);
+                    if (agentId.equals(masterId)) {
+                        agentVo.setAgentMasterId("0");
                         agentVo.setCarry(totalCarry);
-                    } else if (identity == 2) {
-                        agentVo.setCarry(ordCarry);
+                        agentVo.setExCarry(BigDecimal.ZERO);
                     } else {
-                        return null;
+                        agentVo.setAgentMasterId(masterId);
+                        agentVo.setCarry(ordCarry);
+                        agentVo.setExCarry(totalCarry.subtract(ordCarry));
                     }
                     return agentVo;
                 } else {
                     return null;
                 }
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return null;
         }

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/resources/sqlmap.properties

@@ -5,7 +5,7 @@ kylin_lack_register.insert=INSERT INTO `kylin_lack_registers`(`lack_registers_id
 bi_ticket_access_records.insert=INSERT INTO `bi_ticket_access_records` (  `user_id`,  `access_type`,  `performance_id`,  `order_id`,  `order_code`,`ip_address`,  `area`,  `area_province`,  `area_city`,  `area_county`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?);
 # ------------------------创建订单----------------------------
 kylin_order_ticket.add=INSERT INTO kylin_order_tickets(order_tickets_id,user_id,user_name,user_mobile,performance_title,order_code,qr_code,order_type,order_version,`number`,price,price_member,price_total,price_voucher,price_actual,price_express,price_refund,refund_number,pay_type,payment_type,time_pay,express_contacts,express_address,express_phone,coupon_type,get_ticket_type,get_ticket_describe,pay_countdown_minute,`comment`,created_at,updated_at,pay_code,ip_address,area,area_province,area_city,area_county)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
-kylin_order_ticket_relation.add=INSERT INTO kylin_order_ticket_relations(order_ticket_relations_id ,order_id ,transfer_id ,live_id ,agent_id ,is_member ,performance_id ,time_id ,ticket_id ,created_at ,updated_at,agent_status,agent_distributions)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)
+kylin_order_ticket_relation.add=INSERT INTO kylin_order_ticket_relations(order_ticket_relations_id ,order_id ,transfer_id ,live_id ,agent_id ,is_member ,performance_id ,time_id ,ticket_id ,created_at ,updated_at,agent_status,agent_distributions.agent_id_master,agent_distributions_master)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 kylin_order_ticket_status.add=INSERT INTO kylin_order_ticket_status(order_ticket_status_id ,order_id ,express_type ,is_student ,transfer_status ,`status` ,pay_status , produce_code ,created_at ,updated_at)VALUES(?,?,?,?,?,?,?,?,?,?)
 kylin_order_ticket_entities.add=INSERT INTO kylin_order_ticket_entities(order_ticket_entities_id ,order_id ,ticket_id ,user_id ,time_id ,performance_id ,enter_type ,enter_name ,enter_mobile,enter_id_code,`status`,sys_damai,check_client,is_payment,`comment`,created_at,updated_at)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 kylin_order_coupon.add=INSERT INTO kylin_order_coupons(order_id ,coupon_code ,coupon_type ,coupon_price,created_at,updated_at)VALUES(?,?,?,?,?,?)

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/docu/db_ln_goblin_initialdata.sql

@@ -9,10 +9,11 @@
         add agent_status int default 1 comment '代理状态[1-开启|2-关闭]';
     alter table kylin_order_ticket_relations
         add agent_distributions decimal (8,3) default 0 comment '票提';
+
     alter table kylin_order_ticket_relations
-        add agent_distributions decimal (8,3) default 0 comment '票提';
+        add agent_id_master decimal (8,3) default 0 comment '总代id';
     alter table kylin_order_ticket_relations
-        add agent_distributions decimal (8,3) default 0 comment '票提';
+        add agent_distributions_master decimal (8,3) default 0 comment '总代抽成票提';
 
 -- ----------------------------
 -- Table structure for smile_user