寄售单估价详情新增同意操作按钮展示的状态agreed字段

ch-core/src/main/java/com/wwdz/ch/core/entity/ConsignSaleRecordVo.java

@@ -52,4 +52,12 @@ public class ConsignSaleRecordVo implements Entity {
      */
     private String systemStateName;
 
+    /**
+     * 是否同意寄售
+     * 0:不同意
+     * 1：同意
+     * 2：尚未确认
+     */
+    private Integer agreed;
+
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ConsignSaleServiceImpl.java

@@ -336,6 +336,13 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
             consignSaleRecordVo.setCustomState(consignSale.getCustomState());
             consignSaleRecordVo.setSystemState(consignSale.getSystemState());
             consignSaleRecordVo.setSystemStateName(ConsignSaleEnum.SaleForSysStateEnum.getNameByCode(consignSale.getSystemState()));
+            if (consignSale.getSystemState() == ConsignSaleEnum.SaleForSysStateEnum.CANCEL.getCode()) {
+                consignSaleRecordVo.setAgreed(0);
+            } else if (consignSale.getSystemState() > ConsignSaleEnum.SaleForSysStateEnum.WAIT_CONSIGN.getCode()) {
+                consignSaleRecordVo.setAgreed(1);
+            } else {
+                consignSaleRecordVo.setAgreed(2);
+            }
             consignSaleRecordVo.setIsTimeOut(false);
             consignSaleRecordVo.setTip("初步估价结果仅供参考，想要获得真实的报价需要将货品送至平台，由平台专家对实物进行专业鉴定才可以得出结果。");
             consignSaleRecordList = consignSaleRecordList.stream().filter(consignSaleRecord -> consignSaleRecord.getType().intValue() == ConsignSaleEnum.OperateTypeEnum.VALUATE.getCode()).collect(Collectors.toList());
@@ -393,6 +400,13 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
             consignSaleRecordVo.setCustomState(consignSale.getCustomState());
             consignSaleRecordVo.setSystemState(consignSale.getSystemState());
             consignSaleRecordVo.setSystemStateName(ConsignSaleEnum.SaleForSysStateEnum.getNameByCode(consignSale.getSystemState()));
+            if (consignSale.getSystemState() == ConsignSaleEnum.SaleForSysStateEnum.CANCEL.getCode()) {
+                consignSaleRecordVo.setAgreed(0);
+            } else if (consignSale.getSystemState() > ConsignSaleEnum.SaleForSysStateEnum.CONSIGN_SALEING.getCode()) {
+                consignSaleRecordVo.setAgreed(1);
+            } else {
+                consignSaleRecordVo.setAgreed(2);
+            }
             consignSaleRecordVo.setIsTimeOut(false);
             List<ConsignSaleRecord> consignSaleRecordList = consignSaleRecordDao.find(saleId);
             consignSaleRecordList = consignSaleRecordList.stream().filter(consignSaleRecord -> consignSaleRecord.getType().intValue() == ConsignSaleEnum.OperateTypeEnum.IDENTIFY.getCode()).collect(Collectors.toList());