订单状态枚举、发票查询bug修改

src/main/java/com/ydtech/constants/enums/dict/ser/AnnualAuditOrderEnum.java

@@ -0,0 +1,37 @@
+package com.ydtech.constants.enums.dict.ser;
+
+import com.ydtech.aop.request.DictEnum;
+import com.ydtech.constants.enums.dict.IBaseEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+@DictEnum(key = "annualAuditOrderStatus", desc = "年检代办订单状态")
+public enum AnnualAuditOrderEnum implements IBaseEnum {
+
+    UNPAID("101","待支付",0,1),
+
+    AWAIT_ANNUAL("102","待年检",0,1),
+
+    FINISHED("103","订单完成",0,1);
+
+    // 编号
+    private final String code;
+    //说明
+    private final String desc;
+    // 排序
+    private final Integer sort;
+    // 状态  0 启用  1 不启用
+    private final Integer status;
+
+
+    public static AnnualAuditOrderEnum getAnnualAuditOrderEnum(String code) {
+        for (AnnualAuditOrderEnum annualAuditOrderEnum : AnnualAuditOrderEnum.values()) {
+            if (annualAuditOrderEnum.getCode().equals(code)) {
+                return annualAuditOrderEnum;
+            }
+        }
+        return null;
+    }
+}

src/main/java/com/ydtech/modules/inv/service/impl/InvAccountIncoiceServiceImpl.java

@@ -460,12 +460,6 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
          * 合计
          */
         InvAccountIncoiceResult invAccountIncoiceResult = selectAccountIncoice(invAccountIncoice);
-        invAccountIncoiceResult.setInvoiceNumSum(invAccountIncoiceResult.getInvoiceNumSum().setScale(2, RoundingMode.HALF_UP));
-        invAccountIncoiceResult.setInvoiceMoneySum(invAccountIncoiceResult.getInvoiceMoneySum().setScale(2, RoundingMode.HALF_UP));
-        invAccountIncoiceResult.setTaxSum(invAccountIncoiceResult.getTaxSum().setScale(2, RoundingMode.HALF_UP));
-        invAccountIncoiceResult.setNoHasTaxSum(invAccountIncoiceResult.getNoHasTaxSum().setScale(2, RoundingMode.HALF_UP));
-        invAccountIncoiceResult.setNotPayoutMoneySum(invAccountIncoiceResult.getNotPayoutMoneySum().setScale(2, RoundingMode.HALF_UP));
-        invAccountIncoiceResult.setPayoutMoneySum(invAccountIncoiceResult.getPayoutMoneySum().setScale(2, RoundingMode.HALF_UP));
         if (invAccountIncoiceResult == null) {
             InvAccountIncoiceResult invAccountIncoiceResult1 = new InvAccountIncoiceResult();
             invAccountIncoiceResult1.setRecords(invAccountIncoicePage.getRecords());
@@ -473,6 +467,13 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
             invAccountIncoiceResult1.setTotal(invAccountIncoicePage.getTotal());
             invAccountIncoiceResult1.setSize(invAccountIncoice.getPageSize());
             return invAccountIncoiceResult1;
+        } else {
+            invAccountIncoiceResult.setInvoiceNumSum(invAccountIncoiceResult.getInvoiceNumSum().setScale(2, RoundingMode.HALF_UP));
+            invAccountIncoiceResult.setInvoiceMoneySum(invAccountIncoiceResult.getInvoiceMoneySum().setScale(2, RoundingMode.HALF_UP));
+            invAccountIncoiceResult.setTaxSum(invAccountIncoiceResult.getTaxSum().setScale(2, RoundingMode.HALF_UP));
+            invAccountIncoiceResult.setNoHasTaxSum(invAccountIncoiceResult.getNoHasTaxSum().setScale(2, RoundingMode.HALF_UP));
+            invAccountIncoiceResult.setNotPayoutMoneySum(invAccountIncoiceResult.getNotPayoutMoneySum().setScale(2, RoundingMode.HALF_UP));
+            invAccountIncoiceResult.setPayoutMoneySum(invAccountIncoiceResult.getPayoutMoneySum().setScale(2, RoundingMode.HALF_UP));
         }
         invAccountIncoiceResult.setRecords(invAccountIncoicePage.getRecords());
         invAccountIncoiceResult.setCurrent(invAccountIncoice.getPageNo());

src/main/java/com/ydtech/modules/ser/service/impl/SerAnnualAuditOrderServiceImpl.java

@@ -3,10 +3,13 @@ package com.ydtech.modules.ser.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ydtech.constants.enums.dict.ser.AnnualAuditOrderEnum;
+import com.ydtech.constants.enums.dict.ser.OderStateEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.modules.ser.dao.SerAnnualAuditOrderMapper;
 import com.ydtech.modules.ser.model.SerAnnualAuditOrder;
+import com.ydtech.modules.ser.model.po.RescueOrder;
 import com.ydtech.modules.ser.model.vo.SerAnnualAuditOrderQueryVo;
 import com.ydtech.modules.ser.service.SerAnnualAuditOrderService;
 import com.ydtech.utils.idgen.IdGenerate;
@@ -41,7 +44,7 @@ public class SerAnnualAuditOrderServiceImpl implements SerAnnualAuditOrderServic
         serAnnualAuditOrder.setCreateTime(date);
         serAnnualAuditOrder.setTestPriceNotIncluded(150.00);
         serAnnualAuditOrder.setServicePrice(150.00);
-        serAnnualAuditOrder.setOrderStatus("待支付");
+        serAnnualAuditOrder.setOrderStatus(AnnualAuditOrderEnum.UNPAID.getCode());
         serAnnualAuditOrderMapper.insert(serAnnualAuditOrder);
         return HttpResult.ok("订单生成成功", serAnnualAuditOrder);
     }
@@ -69,6 +72,11 @@ public class SerAnnualAuditOrderServiceImpl implements SerAnnualAuditOrderServic
         if (serAnnualAuditOrderQueryVo.getDetailAddress() != null && !"".equals(serAnnualAuditOrderQueryVo.getDetailAddress())) {
             queryWrapper.like(SerAnnualAuditOrder::getDetailAddress, serAnnualAuditOrderQueryVo.getDetailAddress());
         }
+        //订单状态
+        if (serAnnualAuditOrderQueryVo.getOrderStatus() != null && !"".equals(serAnnualAuditOrderQueryVo.getOrderStatus())) {
+            AnnualAuditOrderEnum annualAuditOrderEnum = AnnualAuditOrderEnum.getAnnualAuditOrderEnum(serAnnualAuditOrderQueryVo.getOrderStatus());
+            queryWrapper.eq(SerAnnualAuditOrder::getOrderStatus, annualAuditOrderEnum != null ? annualAuditOrderEnum.getDesc() : null);
+        }
         Page pageData = serAnnualAuditOrderMapper.selectPage(page, queryWrapper);
 
         return pageData;