From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0
---
zq-erp/src/main/java/com/matrix/system/activity/action/ActivitySignWriteoffAction.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/activity/action/ActivitySignWriteoffAction.java b/zq-erp/src/main/java/com/matrix/system/activity/action/ActivitySignWriteoffAction.java
index b125fe2..7d5db67 100644
--- a/zq-erp/src/main/java/com/matrix/system/activity/action/ActivitySignWriteoffAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/activity/action/ActivitySignWriteoffAction.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.StringUtils;
+import com.matrix.system.activity.dto.LogisticsSubmitDto;
import com.matrix.system.activity.dto.SignWriteoffDto;
import com.matrix.system.activity.dto.SignWriteoffListDto;
import com.matrix.system.activity.dto.WriteoffCodeSubmitDto;
@@ -51,9 +52,9 @@
}
/**
- *进入核销
+ *中奖信息
*/
- @ApiOperation(value = "进入核销")
+ @ApiOperation(value = "中奖信息")
@PostMapping(value = "/findSignWriteoff")
public @ResponseBody
AjaxResult findSignWriteoff(@RequestBody SignWriteoffDto signWriteoffDto) {
@@ -70,5 +71,15 @@
return activitySignWriteoffService.writeoffCodeSubmit(writeoffCodeSubmitDto);
}
+ /**
+ *物流发货
+ */
+ @ApiOperation(value = "物流发货")
+ @PostMapping(value = "/logisticsSubmit")
+ public @ResponseBody
+ AjaxResult logisticsSubmit(@RequestBody LogisticsSubmitDto logisticsSubmitDto) {
+ return activitySignWriteoffService.logisticsSubmit(logisticsSubmitDto);
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.1