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 | 85 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 85 insertions(+), 0 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
new file mode 100644
index 0000000..7d5db67
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/activity/action/ActivitySignWriteoffAction.java
@@ -0,0 +1,85 @@
+package com.matrix.system.activity.action;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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;
+import com.matrix.system.activity.service.ActivitySignWriteoffService;
+import com.matrix.system.activity.vo.SignWriteoffListVo;
+import com.matrix.system.hive.action.util.QueryUtil;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+/**
+ * @description 核销记录
+ * @author yourName
+ * @date 2021-04-08 14:25
+ */
+@RestController
+@RequestMapping(value = "admin/activitySignWriteoff")
+public class ActivitySignWriteoffAction {
+
+ @Autowired
+ private ActivitySignWriteoffService activitySignWriteoffService;
+
+ /**
+ * 核销记录
+ */
+ @ApiOperation(value = "核销记录")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "OK", response = SignWriteoffListVo.class)
+ })
+ @PostMapping(value = "/findSignWriteoffList")
+ public @ResponseBody
+ AjaxResult findSignWriteoffList(@RequestBody SignWriteoffListDto signWriteoffListDto) {
+ //设置用户公司ID
+ QueryUtil.setQueryLimitCom(signWriteoffListDto);
+ //排序
+ if(StringUtils.isBlank(signWriteoffListDto.getSort())){
+ signWriteoffListDto.setSort("create_time");
+ signWriteoffListDto.setOrder("desc");
+ }
+ Page<SignWriteoffListVo> page = new Page(signWriteoffListDto.getPageNum(), signWriteoffListDto.getPageSize());
+ IPage<SignWriteoffListVo> rows = activitySignWriteoffService.findSignWriteoffList(page,signWriteoffListDto);
+ AjaxResult result = AjaxResult.buildSuccessInstance(rows.getRecords(),rows.getTotal());
+ return result;
+ }
+
+ /**
+ *中奖信息
+ */
+ @ApiOperation(value = "中奖信息")
+ @PostMapping(value = "/findSignWriteoff")
+ public @ResponseBody
+ AjaxResult findSignWriteoff(@RequestBody SignWriteoffDto signWriteoffDto) {
+ return activitySignWriteoffService.findSignWriteoff(signWriteoffDto);
+ }
+
+ /**
+ *核销验证
+ */
+ @ApiOperation(value = "核销验证")
+ @PostMapping(value = "/writeoffCodeSubmit")
+ public @ResponseBody
+ AjaxResult writeoffCodeSubmit(@RequestBody WriteoffCodeSubmitDto writeoffCodeSubmitDto) {
+ 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