发货流程问题修复

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PreparationMoneyServiceImpl.java

@@ -598,6 +598,8 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
                 hygfPreparationMoneyAuditingService.createWithModel(hygfPreparationMoneyAuditingDto);
                 //提交时 赋值发货时间及订单状态
                 model.setDeliveryTime(new Date());
+                model.setDeliveryState(DeliveryStateeEnum.已发货.getName());
+                model.setArrivalState(ArrivalStateeEnum.待收货.getName());
                 model.setOrderStatus(DeliveryStateeEnum.待确认.getName());
             } else {
                 up.set(PeasantHousehold::getConstructionState, DeliveryStateeEnum.暂存发货.getCode());
@@ -907,7 +909,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         preparationMoneyMapper.updateById(model);
 
         //执行工作流并保存记录
-        this.wofkflowExcute(instanceId, kv.getOrDefault("approvalStatus", "").toString(),kv.getOrDefault("comment","").toString());
+        this.wofkflowExcute(instanceId, kv.getOrDefault("approvalStatus", "").toString(),kv.getOrDefault("approvalStatus","").toString());
     }
 
 
@@ -1005,7 +1007,8 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         }else {
             preparationMoney.setOrderStatus(DeliveryStateeEnum.待确认.getName());
         }
-        this.wofkflowExcute(kv.get("instanceId").toString(), kv.get("approvalStatus").toString(),kv.getOrDefault("comment","").toString());
+        preparationMoneyMapper.updateById(preparationMoney);
+        this.wofkflowExcute(kv.get("instanceId").toString(), kv.get("approvalStatus").toString(),kv.getOrDefault("approveInfo","").toString());
     }
 
     public PreparationMoney  submitOrder(PreparationMoney model, String instanceId, String isSubmit){