21

src/main/java/com/fdkankan/manage/service/impl/CameraServiceImpl.java

@@ -353,9 +353,10 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         HashMap<String,Object> resultMap = new HashMap<>();
         List<String> snCodeList = params.parallelStream().map(CameraInOutParam::getSnCode).collect(Collectors.toList());
         checkSnCode(snCodeList);
-
         List<Camera> cameraList = this.getBySnCodes(snCodeList);
-
+        if(cameraList.size() <=0){
+            throw new BusinessException(-1,"snCode不存在");
+        }
         List<Long> cameraIds = cameraList.parallelStream().map(Camera::getId).collect(Collectors.toList());
         List<CameraDetail> cameraDetails = cameraDetailService.getByCameraIds(cameraIds);
         HashMap<Long,CameraDetail> detailMap = new HashMap<>();

src/main/java/com/fdkankan/manage/service/impl/SceneApplyServiceImpl.java

@@ -63,12 +63,13 @@ public class SceneApplyServiceImpl extends ServiceImpl<ISceneApplyMapper, SceneA
             throw new BusinessException(-1,"场景申请不存在");
         }
         MailTemplate mailTemplate = mailTemplateService.getById(emailTemplateId);
+        String msg = mailTemplate.getMsg();
+        mailTemplate.setMsg( msg.replace("${username}",sceneApply.getName()));
         Boolean flag = mailTemplateService.sendMail(sceneApply.getEmail(), mailTemplate,null);
-        if(flag){
-            sceneApply.setState(1);
-        }else {
-            sceneApply.setState(2);
+        if(!flag){
+            throw new BusinessException(-1,"邮件发送失败");
         }
+        sceneApply.setState(1);
         this.updateById(sceneApply);
     }
 

src/main/java/com/fdkankan/manage/vo/response/DownOrderVo.java

@@ -8,7 +8,7 @@ import java.math.BigDecimal;
 @Data
 public class DownOrderVo {
 
-    @ExcelProperty("序号")
+    @ExcelProperty("ID")
     private Long id;
 
     @ExcelProperty("下单时间")

src/main/java/com/fdkankan/manage/vo/response/IncrementOrderVo.java

@@ -8,7 +8,7 @@ import java.math.BigDecimal;
 @Data
 public class IncrementOrderVo {
 
-    @ExcelProperty("序号")
+    @ExcelProperty("ID")
     private Long id;
 
     @ExcelProperty("下单时间")

src/main/java/com/fdkankan/manage/vo/response/OrderVo.java

@@ -35,16 +35,14 @@ public class OrderVo {
     @ExcelProperty("订单状态")
     private String paymentStatus;           //付款状态（未付款unpaid、已付款paid、已取消cancel, 部分支付partPayment, 部分退款partRefund, 全额退款refunded）
 
-    @ExcelProperty("收货地区")
-    private String shipAreaPath;
 
-    @ExcelProperty("收货详细地址")
+    @ExcelProperty("地址")
     private String shipAddress;
 
-    @ExcelProperty("收货手机号码")
+    @ExcelProperty("手机号码")
     private String shipMobile;
 
-    @ExcelProperty("收货名称")
+    @ExcelProperty("收件人")
     private String shipName;
 
     public String getPaymentTypeName() {