全景看看

src/main/java/com/fdkankan/manage/common/ResultCode.java

@@ -123,6 +123,7 @@ public enum ResultCode  {
 
     RTK_SN_CODE_NOT_AUTH(50095, "板卡暂无授权信息"),
     VISIT_OPENAPI_ERROR(50096, "访问openApi接口出错"),
+    EMAIL_BLANK(50097, "邮件地址为空"),
 
     ;
 

src/main/java/com/fdkankan/manage/entity/AuthorizeRtk.java

@@ -14,6 +14,7 @@ import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fdkankan.manage.common.CustomDateConverter;
 import com.fdkankan.manage.common.DictUtil;
+import com.fdkankan.manage.vo.response.OrderVoStatus;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -195,4 +196,8 @@ public class AuthorizeRtk implements Serializable {
         return DictUtil.toStringUseType(useType);
 
     }
+
+    public String getPayStatus() {
+        return OrderVoStatus.getPayStatus(payStatus, customerPayTime, useType);
+    }
 }

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

@@ -65,9 +65,11 @@ public class AgentNewServiceImpl extends ServiceImpl<IAgentNewMapper, AgentNew>
         List<Integer> createIds = page.getRecords().stream().map(AgentNew::getCreateAgentId).collect(Collectors.toList());
 
         HashMap<Long,SysUser> sysUserHashMap = sysUserService.getByIds(sysUserIds);
-        List<AgentNew> agentNews = this.listByIds(createIds);
         HashMap<Integer,AgentNew> agentNewHashMap = new HashMap<>();
-        agentNews.forEach(e -> agentNewHashMap.put(e.getId(),e));
+        if(!createIds.isEmpty()){
+            List<AgentNew> agentNews = this.listByIds(createIds);
+            agentNews.forEach(e -> agentNewHashMap.put(e.getId(),e));
+        }
 
 
         List<AgentVo> voList = new ArrayList<>();

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

@@ -79,9 +79,6 @@ public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> imp
             if(record.getType() == 3 && StringUtils.isBlank(record.getShipMobile()) && map.get(record.getUserId())!= null){
                 record.setShipMobile(map.get(record.getUserId()).getShipMobile());
             }
-            if(record.getType() == 3 && StringUtils.isBlank(record.getEmail()) ){
-                record.setEmail(record.getOrganizedAddress());
-            }
         }
         return invoiceVOPage ;
     }
@@ -99,6 +96,9 @@ public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> imp
         if(InvoiceType.NO_NEAD.code().equals(type)){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
+        if(StringUtils.isBlank(invoice.getEmailAddress())){
+            throw new BusinessException(ResultCode.EMAIL_BLANK);
+        }
 
         InvoiceRegister invoiceRegister = invoiceRegisterService.getByInvoiceId(id);
         if(Objects.isNull(invoiceRegister)){
@@ -141,9 +141,8 @@ public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> imp
         String userName = user == null ? null : user.getNickName();
 
         MailTemplate mailTemplate = this.setMailMsg(orderNum,userName);
-        String email = StringUtils.isNotBlank(invoice.getEmailAddress())?invoice.getEmailAddress(): invoice.getOrganizedAddress();
 
-        Boolean mail = mailTemplateService.sendMail(email, mailTemplate,localFile.getPath());
+        Boolean mail = mailTemplateService.sendMail(invoice.getEmailAddress(), mailTemplate,localFile.getPath());
         if(!mail){
             throw new BusinessException(ResultCode.MAIL_SEND_ERROR);
         }

src/main/java/com/fdkankan/manage/vo/request/CameraParam.java

@@ -25,7 +25,8 @@ public class CameraParam extends RequestBase {
     private Integer bindStatus;         //绑定状态查询 0 未绑定，1已绑定
     private String bindUserName;        //绑定账号查询
 
-
+    private String colour;
+    private String version;
 
     public String getActivatedStartTime() {
         if(activatedTime != null && activatedTime.size() >1){

src/main/resources/mapper/manage/CameraMapper.xml

@@ -53,6 +53,12 @@
         <if test="param.bindStatus !=null and param.bindStatus ==1 ">
             and u.user_name is not null
         </if>
+        <if test="param.colour !=null and param.colour !=''  ">
+            and d.colour like  concat('%',#{param.colour},'%')
+        </if>
+        <if test="param.version !=null and param.version !=''  ">
+            and d.version like  concat('%',#{param.version},'%')
+        </if>
         order by  c.activated_time desc ,c.id desc
     </select>
     <select id="getByOutSnCodes" resultType="com.fdkankan.manage.entity.Camera">