Merge branch 'zjp_20241105_daili' into 'master'

Zjp 20241105 daili

See merge request !372

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/service/impl/SmileShowServiceImpl.java

@@ -592,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"));
@@ -703,7 +704,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
         arrayListTile.add("");
         arrayListTile.add("");
         for (int i=0;i<agentVoList.size();i++){
-            arrayListTile.add("");
+            arrayListTile.add(agentVoList.get(i).getPrice());
         }
         arrayListTile.add("所有票种销售数量总和\n" +
                 "(不包括全退、阶梯退票 ))");

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

@@ -132,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">