用户发货承运商记录更新寄售单2

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

@@ -199,7 +199,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
             waitConsignSaleRecord.setSaleId(dto.getSaleId());
             waitConsignSaleRecord.setCreateTime(new Date());
             waitConsignSaleRecord.setContent("等待用户确认估价，超时默认用户不满意估价，取消寄售");
-            waitConsignSaleRecord.setRemark(dto.getRemark());
+        //    waitConsignSaleRecord.setRemark(dto.getRemark());
             waitConsignSaleRecord.setType(ConsignSaleEnum.OperateTypeEnum.WAIT_USER_CONFIRM_VALUATE.getCode());
             consignSaleRecordDao.insert(waitConsignSaleRecord);
 
@@ -287,7 +287,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
             waitConsignSaleRecord.setSaleId(dto.getSaleId());
             waitConsignSaleRecord.setCreateTime(new Date());
             waitConsignSaleRecord.setContent("等待用户确认价格，超时默认用户不满意价格，取消寄售");
-            waitConsignSaleRecord.setRemark(dto.getRemark());
+        //    waitConsignSaleRecord.setRemark(dto.getRemark());
             waitConsignSaleRecord.setType(ConsignSaleEnum.OperateTypeEnum.WAIT_USER_CONFIRM_IDENTIFY.getCode());
             consignSaleRecordDao.insert(waitConsignSaleRecord);
 

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

@@ -282,7 +282,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
                     appletStateNodeVoList.get(3).setDesc(ConsignSaleEnum.AppletNodeDescEnum.IDENTIFY.getDes());
                 }
                 // 平台事务鉴定并定价,鉴定后
-                else if (consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.WAIT_USER_CONFIRM_IDENTIFY.getCode()) {
+                else if (consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.IDENTIFY.getCode()) {
                     appletStateNodeVoList.get(3).setPassed(true);
                     appletStateNodeVoList.get(3).setDesc(consignSaleRecord.getContent() + ";" + (consignSaleRecord.getRemark() ==null ? "" : consignSaleRecord.getRemark()));
                 }