From 0a40e403f712958830f4be47bc5e13773d429150 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 20 九月 2023 17:36:55 +0800
Subject: [PATCH] 新增兑换记录流程 收货地址流程
---
springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionExchangeRecordApi.java | 52 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 43 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionExchangeRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionExchangeRecordApi.java
index 0383b71..195e883 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionExchangeRecordApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/huacheng_union_applets/src/main/java/com/chuangongzhijia/huacheng_union_applets/api/UnionExchangeRecordApi.java
@@ -1,9 +1,9 @@
package com.chuangongzhijia.huacheng_union_applets.api;
-import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.equipment.UnionExchangeRecordDto;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.service.community.CommunityUnionService;
+import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -15,22 +15,21 @@
@Slf4j
@RestController
@RequestMapping("/UnionExchangeRecord")
-public class UnionExchangeRecordApi extends BaseController
+public class UnionExchangeRecordApi
{
@Resource
private CommunityUnionService unionStoreService;
- @ApiOperation(value = "兑换记录列表")
+ @ApiOperation(value = "兑换记录列表", response = UnionExchangeRecordDto.class)
@GetMapping("/getList")
public R unionExchangeRecordGetList(@RequestParam("pageNum") int pageNum,
@RequestParam("pageSize") int pageSize,
- @RequestParam(value = "communityId",required = false) String communityId,
- @RequestParam(value = "integralTyppe",required = false) String userId)
+ @RequestParam(value = "communityId",required = false) String communityId)
{
- return unionStoreService.unionExchangeRecordGetList(pageNum,pageSize,communityId,userId);
+ return unionStoreService.unionExchangeRecordGetList(pageNum,pageSize,communityId);
}
- @ApiOperation(value = "兑换记录单个详情")
+ @ApiOperation(value = "兑换记录单个详情",response = UnionExchangeRecordDto.class)
@GetMapping("/getData")
public R unionExchangeRecordGetData(@RequestParam("id") String id)
{
@@ -42,7 +41,6 @@
@PostMapping("/insert")
public R unionExchangeRecordInsert(@RequestBody UnionExchangeRecordDto item)
{
- item.setUserId(getUserId()+"");
return unionStoreService.unionExchangeRecordInsert(item);
}
@@ -50,10 +48,46 @@
@PostMapping("/update")
public R unionExchangeRecordUpdate(@RequestBody UnionExchangeRecordDto item)
{
- item.setUserId(getUserId()+"");
return unionStoreService.unionExchangeRecordUpdate(item);
}
+
+ @ApiOperation(value = "添加物流公司")
+ @PostMapping("/addLogistics")
+ public R unionExchangeRecordAddLogistics(@RequestBody UnionExchangeRecordDto item)
+ {
+ if(StringUtils.isEmpty(item.getLogisticsCompany()))
+ {
+ return R.fail("请输入物流公司");
+ }
+
+ if (StringUtils.isEmpty(item.getLogisticsNum()))
+ {
+ return R.fail("请输入物流单号");
+ }
+
+ if (StringUtils.isEmpty(item.getId()))
+ {
+ return R.fail("订单id不能为空");
+ }
+ item.setOrderType("2");
+ return unionStoreService.unionExchangeRecordUpdate(item);
+ }
+
+
+ @ApiOperation(value = "添加物流公司")
+ @PostMapping("/confirmOrder")
+ public R unionExchangeRecordConfirmOrder(@RequestBody UnionExchangeRecordDto item)
+ {
+ if (StringUtils.isEmpty(item.getId()))
+ {
+ return R.fail("订单id不能为空");
+ }
+ item.setOrderType("3");
+ return unionStoreService.unionExchangeRecordUpdate(item);
+ }
+
+
/**
* 删除接口
* @param id
--
Gitblit v1.7.1