快递名称展示,寄售单详情节点

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

@@ -175,6 +175,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
         return Result.failed();
     }
 
+    @Transactional
     @Override
     public Result imgValuate(ConsignSaleRequestDto dto) {
         try {
@@ -184,7 +185,6 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
             consignSale.setSaleId(dto.getSaleId());
             consignSaleDao.update(consignSale);
 
-
             //插入操作记录,图文估价
             ConsignSaleRecord consignSaleRecord = new ConsignSaleRecord();
             consignSaleRecord.setSaleId(dto.getSaleId());
@@ -208,6 +208,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
             return Result.success();
         } catch (Exception e) {
             logger.error("图文估价error:{}", e);
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
         }
         return Result.failed();
     }
@@ -261,6 +262,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
         return Result.failed();
     }
 
+    @Transactional
     @Override
     public Result identify(ConsignSaleRequestDto dto) {
         try {
@@ -271,7 +273,6 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
             consignSale.setSaleId(dto.getSaleId());
             consignSaleDao.update(consignSale);
 
-
             //插入操作记录,平台鉴定并估价
             ConsignSaleRecord consignSaleRecord = new ConsignSaleRecord();
             consignSaleRecord.setSaleId(dto.getSaleId());
@@ -281,15 +282,6 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
             consignSaleRecord.setType(ConsignSaleEnum.OperateTypeEnum.IDENTIFY.getCode());
             consignSaleRecordDao.insert(consignSaleRecord);
 
-            //平台寄售中
-            ConsignSaleRecord saleRecord = new ConsignSaleRecord();
-            saleRecord.setSaleId(dto.getSaleId());
-            saleRecord.setCreateTime(new Date());
-            saleRecord.setType(ConsignSaleEnum.OperateTypeEnum.SALEING.getCode());
-            consignSaleRecordDao.insert(saleRecord);
-
-            //发送公众号消息
-            sendTempletMsg(dto.getSaleId(), consignSaleRecord.getContent().replaceAll(" ", ""));
             //插入操作记录, 建议寄售价待用户确认
             ConsignSaleRecord waitConsignSaleRecord = new ConsignSaleRecord();
             waitConsignSaleRecord.setSaleId(dto.getSaleId());
@@ -298,9 +290,14 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
             waitConsignSaleRecord.setRemark(dto.getRemark());
             waitConsignSaleRecord.setType(ConsignSaleEnum.OperateTypeEnum.WAIT_USER_CONFIRM_IDENTIFY.getCode());
             consignSaleRecordDao.insert(waitConsignSaleRecord);
+
+            //发送公众号消息
+            sendTempletMsg(dto.getSaleId(), consignSaleRecord.getContent().replaceAll(" ", ""));
+
             return Result.success();
         } catch (Exception e) {
             logger.error("实物鉴定 error:{}", e);
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
         }
         return Result.failed();
     }

ch-dao/src/main/java/com/wwdz/ch/db/impl/ConsignSaleRecordDaoImpl.java

@@ -36,7 +36,8 @@ public class ConsignSaleRecordDaoImpl implements ConsignSaleRecordDao {
         cancelConsignSaleRecord.setCreateTime(new Date());
         cancelConsignSaleRecord.setContent(content);
         cancelConsignSaleRecord.setType(type);
-        return consignSaleRecordMapper.insert(cancelConsignSaleRecord);
+        cancelConsignSaleRecord.setRemark(remark);
+        return consignSaleRecordMapper.insertSelective(cancelConsignSaleRecord);
     }
 
     @Override

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

@@ -259,21 +259,21 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
                     appletStateNodeVoList.get(1).setDesc(ConsignSaleEnum.AppletNodeDescEnum.VALUATE.getDes());
                 } else if (consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.SYS_CANCEL.getCode()) {
                     appletStateNodeVoList.get(7).setPassed(true);
-                    appletStateNodeVoList.get(7).setDesc(consignSaleRecord.getContent() + ";" + consignSaleRecord.getRemark() ==null ? "" : consignSaleRecord.getRemark());
+                    appletStateNodeVoList.get(7).setDesc(consignSaleRecord.getContent() + ";" + (consignSaleRecord.getRemark() ==null ? "" : consignSaleRecord.getRemark()));
                     break;
                 } else if (consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.CUSTOM_CANCEL.getCode()) {
                     appletStateNodeVoList.get(7).setPassed(true);
-                    appletStateNodeVoList.get(7).setDesc(consignSaleRecord.getContent() + ";" + consignSaleRecord.getRemark() ==null ? "" : consignSaleRecord.getRemark());
+                    appletStateNodeVoList.get(7).setDesc(consignSaleRecord.getContent() + ";" + (consignSaleRecord.getRemark() ==null ? "" : consignSaleRecord.getRemark()));
                     break;
                 }
                 //图文估价
                 else if (consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.VALUATE.getCode()) {
-                    appletStateNodeVoList.get(1).setDesc(consignSaleRecord.getContent() + ";" + consignSaleRecord.getRemark() ==null ? "" : consignSaleRecord.getRemark());
+                    appletStateNodeVoList.get(1).setDesc(consignSaleRecord.getContent() + ";" + (consignSaleRecord.getRemark() ==null ? "" : consignSaleRecord.getRemark()));
                 }
                 //送货至平台
                 else if (consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.USER_SEND.getCode()) {
                     appletStateNodeVoList.get(2).setPassed(true);
-                    appletStateNodeVoList.get(2).setDesc(consignSaleRecord.getContent() + ";" + consignSaleRecord.getRemark() ==null ? "" : consignSaleRecord.getRemark());
+                    appletStateNodeVoList.get(2).setDesc(consignSaleRecord.getContent() + ";" + (consignSaleRecord.getRemark() ==null ? "" : consignSaleRecord.getRemark()));
                     consignSaleAppletVo.setSendTime(consignSaleRecord.getCreateTime());
                 }
                 // 平台事务鉴定并定价，平台签收货品, 尚未鉴定
@@ -284,7 +284,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
                 // 平台事务鉴定并定价,鉴定后
                 else if (consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.WAIT_USER_CONFIRM_IDENTIFY.getCode()) {
                     appletStateNodeVoList.get(3).setPassed(true);
-                    appletStateNodeVoList.get(3).setDesc(consignSaleRecord.getContent() + ";" + consignSaleRecord.getRemark() ==null ? "" : consignSaleRecord.getRemark());
+                    appletStateNodeVoList.get(3).setDesc(consignSaleRecord.getContent() + ";" + (consignSaleRecord.getRemark() ==null ? "" : consignSaleRecord.getRemark()));
                 }
                 else if (consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.TIME_OUT_CANCEL.getCode()) {
                     appletStateNodeVoList.get(7).setPassed(true);
@@ -528,6 +528,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
         return Result.failed();
     }
 
+    @Transactional
     @Override
     public Result confirmForIdentify(ConsignSaleRequestDto dto) {
         try {
@@ -558,6 +559,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
             return Result.success();
         } catch (Exception e) {
             logger.info("图文鉴定后用户确认 error : {}", e);
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
         }
         return Result.failed();
     }