Merge remote-tracking branch 'origin/dev-smile' into dev-smile

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

+package com.liquidnet.service.kylin.dto.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class KylinAgentVo implements Serializable, Cloneable {
+    @ApiModelProperty(value = "代理类型（1：总代，2：普代）")
+    private int identity;
+    @ApiModelProperty(value = "0-正常|1-黑名单")
+    private int isBlack;
+    @ApiModelProperty(value = "票提")
+    private BigDecimal carry;
+
+    private static final KylinAgentVo obj = new KylinAgentVo();
+
+    public static KylinAgentVo getNew() {
+        try {
+            return (KylinAgentVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new KylinAgentVo();
+        }
+    }
+}

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -97,6 +97,8 @@ liquidnet:
       url: http://testgoblin.zhengzai.tv
     stone:
       url: http://teststone.zhengzai.tv/stone
+    smile:
+      url: http://testsmile.zhengzai.tv
     order:
       adam:
         url: http://testadam.zhengzai.tv/adam

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

@@ -104,7 +104,7 @@ public class KylinOrderTicketRelations implements Serializable, Cloneable {
      */
     public Object[] getAddObject() {
         return new Object[]{
-                orderTicketRelationsId, orderId, transferId, liveId, agentId, isMember, performanceId, timeId, ticketId, createdAt, updatedAt
+                orderTicketRelationsId, orderId, transferId, liveId, agentId, isMember, performanceId, timeId, ticketId, createdAt, updatedAt,agentStatus,agentDistributions
         };
     }
 

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/pom.xml

@@ -36,6 +36,11 @@
             <artifactId>liquidnet-service-goblin-api</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-service-smile-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>com.liquidnet</groupId>
             <artifactId>liquidnet-api-feign-candy</artifactId>

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

@@ -10,6 +10,7 @@ import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dto.param.*;
+import com.liquidnet.service.kylin.dto.vo.KylinAgentVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinIpAreaVo;
@@ -65,10 +66,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
     @Autowired
     private DataUtils dataUtils;
     @Autowired
-    private RedisUtil redisUtil;
-    @Autowired
-    private InnerService innerService;
-    @Autowired
     private OrderUtils orderUtils;
     @Autowired
     private MongoTemplate mongoTemplate;
@@ -144,10 +141,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             if (payOrderParam.getNumber() % ticketData.getCounts() != 0) {
                 return ResponseDto.failure(ErrorMapping.get("20007"));//数量错误
             }
-            //判断代理
-            if (!checkAgent(payOrderParam.getAgentId(), ticketData)) {
-                return ResponseDto.failure(ErrorMapping.get("20008"));//无权购买
-            }
+//            //判断代理
+//            if (!checkAgent(payOrderParam.getAgentId(), ticketData)) {
+//                return ResponseDto.failure(ErrorMapping.get("20008"));//无权购买
+//            }
             //校验快递相关参数
             if (payOrderParam.getIsExpress() == 1 && payOrderParam.getExpressType() == 1) {
                 if (payOrderParam.getProductCode() == null) {
@@ -512,7 +509,17 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         orderTicketRelations.setOrderId(orderTicketId);
         orderTicketRelations.setTransferId("");
         orderTicketRelations.setLiveId("");
-        orderTicketRelations.setAgentId(payOrderParam.getAgentId());
+        KylinAgentVo agentVo = orderUtils.checkAgent(payOrderParam.getAgentId(), performanceData.getPerformancesId(), ticketData);
+        if (agentVo == null) {
+            orderTicketRelations.setAgentId("0");
+            orderTicketRelations.setAgentDistributions(BigDecimal.ZERO);
+            orderTicketRelations.setAgentStatus(0);
+        } else {
+            orderTicketRelations.setAgentId(payOrderParam.getAgentId());
+            orderTicketRelations.setAgentDistributions(agentVo.getCarry());
+            orderTicketRelations.setAgentStatus(agentVo.getIsBlack() == 1 ? 2 : 1);
+        }
+
         orderTicketRelations.setIsMember(isMember ? 1 : 0);
         orderTicketRelations.setPerformanceId(payOrderParam.getPerformanceId());
         orderTicketRelations.setTimeId(payOrderParam.getTimeId());
@@ -1047,25 +1054,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         }
     }
 
-    public boolean checkAgent(String agentId, KylinTicketVo ticketData) {
-        if (agentId.equals(0)) {
-            return true;
-        } else {
-            boolean isAgent = ticketData.getIsAgent() == 1;
-            if (isAgent) {
-                return true;
-            } else {
-                return !redisUtil.getDB15RedisHasKey(KylinRedisConst.AGENT, agentId);
-            }
-        }
-//        boolean isAgent = ticketData.getIsAgent() == 1;
-//        if (isAgent) {
-//            return redisUtil.getDB15RedisHasKey(KylinRedisConst.AGENT, agentId);
-//        } else {
-//            return true;
-//        }
-    }
-
     /**
      * 同步 退款大麦订单
      *

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

@@ -10,8 +10,11 @@ import com.liquidnet.service.adam.dto.vo.*;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.candy.param.BackCouponParam;
 import com.liquidnet.service.candy.vo.CandyUseResultVo;
+import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dao.KylinFreightChargeDao;
+import com.liquidnet.service.kylin.dto.vo.KylinAgentVo;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.returns.InnerReturnVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
@@ -38,6 +41,8 @@ public class OrderUtils {
     private String adamUrl;
     @Value("${liquidnet.candy.url}")
     private String candyUrl;
+    @Value("${liquidnet.smile.url}")
+    private String smile;
     @Value("${liquidnet.service.stone.url}")
     private String stoneUrl;
 
@@ -371,4 +376,47 @@ public class OrderUtils {
                 return false;
         }
     }
+
+    //获取代理信息
+    public KylinAgentVo checkAgent(String agentId, String performanceId, KylinTicketVo ticketData) {
+        try {
+            if (agentId.equals("0")) {
+                return null;
+            } else {
+                boolean isAgent = ticketData.getIsAgent() == 1;
+                if (isAgent) {
+                    MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
+                    header.add("Accept", "application/json;charset=UTF-8");
+                    MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
+                    params.add("performanceId", performanceId);
+                    params.add("ticketId", ticketData.getTicketsId());
+                    params.add("userId", agentId);
+                    String returnData = HttpUtil.post(smile + "/smile/frontNoLogin/getUser", params, header);
+                    ResponseDto<SmileUserVO> res = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<SmileUserVO>>() {
+                    });
+                    SmileUserVO vo = res.getData();
+                    int identity = vo.getType();//代理类型（0：未审核，1：总代，2：普代，3：未认证）
+                    int isBlack = vo.getState();//0正常/1黑名单
+                    BigDecimal totalCarry = vo.getSmileAgentVo().getTotalCarry();//总代票提
+                    BigDecimal ordCarry = vo.getSmileAgentVo().getOrdCarry();//普代票提
+                    KylinAgentVo agentVo = KylinAgentVo.getNew();
+                    agentVo.setIdentity(identity);
+                    agentVo.setIsBlack(isBlack);
+                    if (identity == 1) {
+                        agentVo.setCarry(totalCarry);
+                    } else if (identity == 2) {
+                        agentVo.setCarry(ordCarry);
+                    } else {
+                        return null;
+                    }
+                    return agentVo;
+                } else {
+                    return null;
+                }
+            }
+        }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)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_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

@@ -2,7 +2,7 @@
 ----    1.redis用sweet
 ----    2.消费用sweet消费
 ----    3.config、order、smile、consumer-sweet、需要上线
-----    4.order需要上线 修改了数据库 未修改vo
+----    4.order需要上线 修改了数据库 未修改vo 纪录代理是否黑名单 代理票提
 
 ----                添加代理字段              ----
     alter table kylin_order_ticket_relations

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/sqlmap.properties

@@ -3,13 +3,6 @@ kylin_order_ticket_entities.updateStatusByStation=UPDATE kylin_order_ticket_enti
 # ------------------------缺票登记(不用考虑并发)----------------------------
 kylin_lack_register.insert=INSERT INTO `kylin_lack_registers`(`lack_registers_id` ,`performance_id` ,`ticket_id` ,`user_id` ,`user_name` ,`user_mobile` ,`send_status` ,`ip_address` ,`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)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)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 ,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_ticket.synPay=UPDATE  kylin_order_tickets SET payment_type = ? ,pay_code = ? , time_pay = ?, qr_code = ? , updated_at = ? WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ?)
 kylin_order_ticket_status.synPay=UPDATE kylin_order_ticket_status SET `status` = ?,pay_status = ?,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ?)