Merge branch 'pre' into 'master'

Pre

See merge request !347

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/PerformancesExpressServiceImpl.java

@@ -20,6 +20,7 @@ import com.liquidnet.service.kylin.dto.param.*;
 import com.liquidnet.service.kylin.dto.vo.basicServices.UploadVo;
 import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressPrintVo;
 import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressVo;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.IKylinOrderExpress;
@@ -100,6 +101,9 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
     @Autowired
     private KylinTicketsMapper kylinTicketsMapper;
 
+    @Autowired
+    private KylinTicketTimesMapper kylinTicketTimesMapper;
+
     @Autowired
     private DataUtils dataUtils;
 
@@ -222,6 +226,18 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
             hBody.put("jCity", jCity);
             hBody.put("jAddress", jAddress);
 
+            //胡佳晨添加
+            //获取票种名称
+            KylinTickets kylinTickets = kylinTicketsMapper.selectOne(
+                    Wrappers.lambdaQuery(KylinTickets.class).eq(KylinTickets::getTicketsId, Relations.getTicketId())
+            );
+            //获取场次名称
+            KylinTicketTimes kylinTicketTimes = kylinTicketTimesMapper.selectOne(
+                    Wrappers.lambdaQuery(KylinTicketTimes.class).eq(KylinTicketTimes::getTicketTimesId, Relations.getTimeId())
+            );
+            //添加备注
+            hBody.put("remark", kylinTicketTimes.getTitle()+"，"+kylinTickets.getTitle());
+
             // 1寄付|2到付|3包邮
             // 运费付款方式：0-寄付月结；1-寄付现结；2-收方付；3-第三方付；
             if (orderStatus.getExpressType() == 1 || orderStatus.getExpressType() == 3) {
@@ -251,7 +267,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
                 return ResponseDto.failure(result);
             }
             if (null == hashMap.get("succ") || hashMap.get("succ").equals("fail")) {
-                String msg = "";
+                String msg = "" ;
                 if (null == hashMap.get("succ")) {
                     msg = result;
                 } else {
@@ -611,7 +627,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
             ossPath = generateImage(performanceExpressSearchAdminParam);
         }
         return ossPath;*/
-        return "";
+        return "" ;
     }
 
     public KylinOrderExpressPrintVo printExpress(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
@@ -708,7 +724,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
                 successMsg.append("<br/>" + successNum + "、订单编号 " + info.getOrderCode() + " 导入成功");
             } catch (Exception e) {
                 failureNum++;
-                String msg = "<br/>" + failureNum + "、订单编号 " + info.getOrderCode() + " 导入失败：";
+                String msg = "<br/>" + failureNum + "、订单编号 " + info.getOrderCode() + " 导入失败：" ;
                 failureMsg.append(msg + e.getMessage());
                 log.error(msg, e);
             }