Merge branch '2024112_enter_log' into container

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/smileTickets/saleData.html

@@ -55,9 +55,12 @@
                         <td th:text="${item.title}"></td>
                     </div>
                     <td>总销售张数</td>
-                    <td>总销售金额</td>
-                    <td>实际销售金额</td>
+                    <td>票面票房金额</td>
+                    <td>总支付金额</td>
+                    <td>快递费总金额</td>
                     <td>优惠券金额</td>
+                    <td>实际销售金额</td>
+                    <td>佣金比例</td>
                     <td>总销售佣金</td>
                     <td>打款状态</td>
                     <td>是否黑名单</td>
@@ -77,9 +80,12 @@
                         <td th:text="${item.agentName}"></td>
                         <td th:each="itemAgent : ${item.dataAgentVos}" th:text="${itemAgent.number}"></td>
                         <td th:text="${#aggregates.sum(item.dataAgentVos.![number])}"></td>
+                        <td th:text="${#aggregates.sum(item.dataAgentVos.![faceTotalPrice])}"></td>
                         <td th:text="${#aggregates.sum(item.dataAgentVos.![priceReal])}"></td>
-                        <td th:text="${#aggregates.sum(item.dataAgentVos.![realTotalPrice])}"></td>
+                        <td th:text="${#aggregates.sum(item.dataAgentVos.![totalPriceExpress])}"></td>
                         <td th:text="${#aggregates.sum(item.dataAgentVos.![voucherPrice])}"></td>
+                        <td th:text="${#aggregates.sum(item.dataAgentVos.![realTotalPrice])}"></td>
+                        <td th:text="${item.agentDistributions}"></td>
                         <td th:text="${item.totalCommission}"></td>
                         <td th:if="${item.priceStatus!=0}" th:text="待打款"></td>
                         <td th:if="${item.priceStatus==0}" th:text="已打款"></td>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/ShowAgentVo.java

@@ -45,4 +45,8 @@ public class ShowAgentVo {
      */
     @ApiModelProperty(value = "普代票提", example = "")
     private BigDecimal ordCarry;
+
+
+    @ApiModelProperty(value = "票种单价", example = "")
+    private BigDecimal price;
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/UserData.java

@@ -77,7 +77,8 @@ public class UserData implements Serializable, Cloneable {
 
     @ApiModelProperty(value = "总佣金")
     private BigDecimal totalCommission;
-
+    @ApiModelProperty(value = "票提", example = "")
+    private BigDecimal agentDistributions;
 
     private static final UserData obj = new UserData();
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/UserDataAgentVo.java

@@ -67,6 +67,26 @@ public class UserDataAgentVo implements Serializable, Cloneable{
     @ApiModelProperty(value = "优惠券金额", example = "")
     private BigDecimal voucherPrice;
 
+
+
+    /**
+     * 票面金额
+     */
+    @ApiModelProperty(value = "票面金额", example = "")
+    private BigDecimal faceTotalPrice;
+
+    /**
+     * 快递费总金额
+     */
+    @ApiModelProperty(value = "快递费总金额", example = "")
+    private BigDecimal totalPriceExpress;
+
+    /**
+     * 票提
+     */
+    @ApiModelProperty(value = "票提", example = "")
+    private BigDecimal agentDistributions;
+
     private static final UserDataAgentVo obj = new UserDataAgentVo();
 
     public static UserDataAgentVo getNew() {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileShowServiceImpl.java

@@ -388,6 +388,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                 List<UserDataAgentVo> userDataAgentVos = new ArrayList<>();
                 //当前list不为null，遍历有数据，方便后期判断是否总代取uid
                 ShowBaseVoDto baseVoDto = showBaseVoDtoList.get(0);
+
                 //根据票提id分组 list数量小于等于票提数量
                 Map<String, List<ShowBaseVoDto>> tidMapByUid = showBaseVoDtoList.stream().collect(Collectors.groupingBy(ShowBaseVoDto::getTid));
 
@@ -412,6 +413,8 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                         userDataAgentVo.setCommission(new BigDecimal(showBaseVoDto.getTotalPrice().stripTrailingZeros().toPlainString()));
                         userDataAgentVo.setRealTotalPrice(new BigDecimal(showBaseVoDto.getRealTotalPrice().stripTrailingZeros().toPlainString()));
                         userDataAgentVo.setVoucherPrice(new BigDecimal(showBaseVoDto.getVoucherPrice().stripTrailingZeros().toPlainString()));
+                        userDataAgentVo.setFaceTotalPrice(new BigDecimal(showBaseVoDto.getFaceTotalPrice().stripTrailingZeros().toPlainString()));
+                        userDataAgentVo.setTotalPriceExpress(new BigDecimal(showBaseVoDto.getTotalPriceExpress().stripTrailingZeros().toPlainString()));
                     } else {
                         //没有买过
                         userDataAgentVo.setTicketsId(smileAgent.getTicketsId());
@@ -423,6 +426,8 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                         userDataAgentVo.setCommission(BigDecimal.ZERO);
                         userDataAgentVo.setRealTotalPrice(BigDecimal.ZERO);
                         userDataAgentVo.setVoucherPrice(BigDecimal.ZERO);
+                        userDataAgentVo.setFaceTotalPrice(BigDecimal.ZERO);
+                        userDataAgentVo.setTotalPriceExpress(BigDecimal.ZERO);
                     }
                     totalCommission = totalCommission.add(userDataAgentVo.getCommission());
                     userDataAgentVos.add(userDataAgentVo);
@@ -444,6 +449,10 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                 userData.setPhone(showBaseVoDtoList.get(0).getPhone());
                 userData.setIdCard(showBaseVoDtoList.get(0).getIdCard());
                 userData.setState(showBaseVoDtoList.get(0).getState());
+                //特邀代理票提
+                if(userData.getType()==5){
+                    userData.setAgentDistributions(showBaseVoDtoList.get(0).getAgentDistributions());
+                }
                 if (userData.getType() != 2) {
                     userData.setAgentName(showBaseVoDtoList.get(0).getName());
                 } else {
@@ -472,6 +481,8 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                         userDataAgentVo.setPriceReal(BigDecimal.ZERO);
                         userDataAgentVo.setRealTotalPrice(BigDecimal.ZERO);
                         userDataAgentVo.setVoucherPrice(BigDecimal.ZERO);
+                        userDataAgentVo.setFaceTotalPrice(BigDecimal.ZERO);
+                        userDataAgentVo.setTotalPriceExpress(BigDecimal.ZERO);
                         userDataAgentVo.setCommission(BigDecimal.ZERO);
                         userDataAgentVos.add(userDataAgentVo);
                     }
@@ -507,6 +518,18 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                 }
             });
         }
+        if(userDataList.size()>0){
+            for (UserData userData : userDataList) {
+                //总代
+                if(userData.getType()==1){
+                    userData.setAgentDistributions(new BigDecimal("0.06"));
+                }
+                //普代
+                if(userData.getType()==2){
+                    userData.setAgentDistributions(new BigDecimal("0.05"));
+                }
+            }
+        }
         saleDataVo.setUserDataList(userDataList);
         saleDataVo.setShowAgentVoList(showAgentVoList);
         return saleDataVo;
@@ -569,6 +592,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
         showAgentVo.setPerformanceId(performancesId);
         showAgentVo.setTicketId(ticketAndStatusDao.getTicketsId());
         showAgentVo.setTitle(ticketAndStatusDao.getTitle());
+        showAgentVo.setPrice(ticketAndStatusDao.getPrice());
         //开始结束时间转换年月日
         String start = ticketAndStatusDao.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         String end = ticketAndStatusDao.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
@@ -661,7 +685,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
 
         //做表
         ticketList.forEach(title -> headTitles.add(Lists.newArrayList(ticket, ticket, title)));
-        ArrayList<String> dataList = Lists.newArrayList("总销售张数", "总销售金额","实际销售金额","优惠券金额", "总销售佣金","打款状态");
+        ArrayList<String> dataList = Lists.newArrayList("总销售张数","总销售张数(人工核验技术不填写)","票面票房金额","票面票房金额(人工核验技术不填写)","总支付金额","总支付金额(人工核验技术不填写)","快递费总金额","优惠券金额","实际销售金额","实际销售金额(人工核验技术不填写)","佣金比例","总销售佣金","总销售佣金(人工核验技术不填写)","打款状态");
         //做表
         dataList.forEach(dataStr -> headTitles.add(Lists.newArrayList(saleData, saleData, dataStr)));
 
@@ -670,6 +694,39 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
 
     private List<List<Object>> contentData(List<UserData> userDataList, List<ShowAgentVo> agentVoList) {
         List<List<Object>> contentList = Lists.newArrayList();
+        ArrayList<Object> arrayListTile = Lists.newArrayList();
+        arrayListTile.add("");
+        arrayListTile.add("");
+        arrayListTile.add("");
+        arrayListTile.add("");
+        arrayListTile.add("");
+        arrayListTile.add("");
+        arrayListTile.add("");
+        arrayListTile.add("");
+        for (int i=0;i<agentVoList.size();i++){
+            arrayListTile.add(agentVoList.get(i).getPrice());
+        }
+        arrayListTile.add("所有票种销售数量总和\n" +
+                "(不包括全退、阶梯退票 ))");
+        arrayListTile.add("");
+        arrayListTile.add(" 所有票种单价*销售数量 总和 ");
+        arrayListTile.add("");
+        arrayListTile.add("用户实际支付金额总和\n" +
+                "(包含快递费和使用券优惠后的用户实际支付金额的总和)");
+        arrayListTile.add("");
+        arrayListTile.add("电子票为0,快递纸质票会生成快递费,所有快递费的总金额");
+        arrayListTile.add("用户使用券,优惠券面值金额总和");
+        arrayListTile.add("实际销售金额即为代理提成的基数,公式为:总支付金额-快递费-=提成基数;(实际销售金额中不包括全退、阶梯退票 )");
+        arrayListTile.add("");
+        arrayListTile.add("普代佣金*5%\n" +
+                "总代佣金 6%\n" +
+                "特邀代理佣金不确定");
+        arrayListTile.add("普代总销售佣金 = 实际销售金额*5%\n" +
+                "总代总销售佣金 = 总代名下代理的所有实际销售金额*1%+自己实际销售金额*6%\n" +
+                "特邀代理总销售佣金 =实际销售金额*佣金比例(不固定后台取的)%");
+        arrayListTile.add("");
+        arrayListTile.add("需要运营和财务核实,研发导出默认 「待打款」");
+        contentList.add(arrayListTile);
         //这里一个List<Object>才代表一行数据，需要映射成每行数据填充，横向填充（把实体数据的字段设置成一个List<Object>）
         userDataList.forEach(userData -> {
             //总销售张数
@@ -680,6 +737,10 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
             BigDecimal realTotalPrice=new BigDecimal("0");
             //优惠券金额
             BigDecimal voucherPrice=new BigDecimal("0");
+            //票面票房金额
+            BigDecimal faceTotalPrice=new BigDecimal("0");
+            //快递费总金额
+            BigDecimal totalPriceExpress=new BigDecimal("0");
 
             ArrayList<Object> arrayList = Lists.newArrayList();
             arrayList.add(userData.getUid());
@@ -718,16 +779,26 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                     price = price.add(userDataAgentVo.getPriceReal());
                     realTotalPrice=realTotalPrice.add(userDataAgentVo.getRealTotalPrice());
                     voucherPrice=voucherPrice.add(userDataAgentVo.getVoucherPrice());
+                    faceTotalPrice=faceTotalPrice.add(userDataAgentVo.getFaceTotalPrice());
+                    totalPriceExpress=totalPriceExpress.add(userDataAgentVo.getTotalPriceExpress());
                     arrayList.add(userDataAgentVo.getNumber());
                 } else {
                     arrayList.add(0);
                 }
             }
             arrayList.add(num);
+            arrayList.add("");
+            arrayList.add(faceTotalPrice);
+            arrayList.add("");
             arrayList.add(price);
-            arrayList.add(realTotalPrice);
+            arrayList.add("");
+            arrayList.add(totalPriceExpress);
             arrayList.add(voucherPrice);
+            arrayList.add(realTotalPrice);
+            arrayList.add("");
+            arrayList.add(userData.getAgentDistributions());
             arrayList.add(userData.getTotalCommission());
+            arrayList.add("");
             arrayList.add(userData.getPriceStatus() != null && userData.getPriceStatus() == 0 ? "已打款" : "待打款");
             contentList.add(arrayList);
         });

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/IdentityUtils.java

@@ -20,6 +20,7 @@ public class IdentityUtils {
         params.add("cardNo", cardNo);
         MultiValueMap<String, String> header = new LinkedMultiValueMap<>();
         header.add("Authorization", "APPCODE " + aliThirdAppCode);
+        log.info("实名认证开始realName==============={}",realName);
         try {
             return HttpUtil.post(aliThirdUrl, params, header);
         } catch (Exception e) {

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/dto/ShowBaseVoDto.java

@@ -89,6 +89,21 @@ public class ShowBaseVoDto implements Serializable, Cloneable{
      */
     private BigDecimal voucherPrice;
 
+    /**
+     * 票面金额
+     */
+    private BigDecimal faceTotalPrice;
+
+    /**
+     * 快递费总金额
+     */
+    private BigDecimal totalPriceExpress;
+
+    /**
+     * 佣金比例
+     */
+    private BigDecimal agentDistributions;
+
     private static final ShowBaseVoDto obj = new ShowBaseVoDto();
 
     public static ShowBaseVoDto getNew() {

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileAgentMapper.xml

@@ -88,7 +88,10 @@
             SUM( kot.number ) number,
             SUM( (kot.price_actual - kot.price_express) * sukotr.agent_distributions ) totalPrice,
             SUM( (kot.price_actual - kot.price_express) ) realTotalPrice,
-            SUM( kot.price_voucher ) voucherPrice
+            SUM( kot.price_voucher ) voucherPrice,
+            SUM( kot.price_express )  totalPriceExpress,
+            SUM( kot.price_total - kot.price_express ) faceTotalPrice,
+            MAX(sukotr.agent_distributions ) agentDistributions
         FROM
             kylin_order_tickets AS kot
                 INNER JOIN (
@@ -129,6 +132,13 @@
         GROUP BY
             sukotr.uid,
             sukotr.ticket_id
+        ORDER BY
+            CASE sukotr.type
+            WHEN 2 THEN 1
+            WHEN 1 THEN 2
+            WHEN 5 THEN 3
+            ELSE 4
+        END
     </select>
 
     <update id="upTakeByPerId">

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileUserMapper.xml

@@ -186,7 +186,7 @@
                              FROM kylin_order_ticket_relations AS kotr
                                       INNER JOIN kylin_order_ticket_status AS kots ON kots.order_id = kotr.order_id
                              WHERE kotr.performance_id = #{performancesId}
-                               AND kotr.agent_id != 0 AND kots.status IN (1,6,3)) kk ON su.uid = kk.agent_id_master
+                               AND kotr.agent_id != 0 AND kots.status IN (1)) kk ON su.uid = kk.agent_id_master
         GROUP BY su.uid
     </select>
 

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/controller/SmileUserController.java

@@ -163,6 +163,7 @@ public class SmileUserController {
         if(StringUtil.isNotBlank(smileUserVO.getIdCard())&&StringUtil.isNotBlank(smileUserVO.getName())){
             String userId = CurrentUtil.getCurrentUid();
           /*  String status=smileRedisUtils.getValidate(smileUserVO.getName(), smileUserVO.getIdCard());*/
+            log.info("小家伙增加或者删除第二步实名认证开始userId={},ip={}",userId,CurrentUtil.getCliIpAddr());
             if(utils.validate(smileUserVO.getName(),smileUserVO.getIdCard())){
                 smileUserVO.setUid(userId);
                 SmileUserVO smileUserVORedis=smileRedisUtils.getSmileUserVo(userId);