From 802d2a5ecb59b5f7c557ed8287c23ec7f9b724d6 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 19 十月 2023 14:48:01 +0800
Subject: [PATCH] 设置兑换地址
---
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiConfigApi.java | 50 +++++
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiShoppingOrder.java | 19 +
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/VolunteerCommunityConfigMapper.xml | 131 +++++++++++++
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiConfigService.java | 22 ++
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiShoppingOrderServiceImpl.java | 18 +
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiConfig.java | 58 +++++
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiShoppingOrderService.java | 10
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiConfigVO.java | 58 +++++
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiShoppingOrderMapper.xml | 14 +
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java | 41 ++++
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiShoppingApi.java | 9
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java | 18 +
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiShoppingOrderVO.java | 21 ++
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiConfigDao.java | 43 ++++
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiConfigServiceImpl.java | 55 +++++
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiShoppingOrderDao.java | 6
16 files changed, 553 insertions(+), 20 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiConfigVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiConfigVO.java
new file mode 100644
index 0000000..2c9a4ff
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiConfigVO.java
@@ -0,0 +1,58 @@
+package com.panzhihua.common.model.vos.jinhui;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("金汇社区商家配置")
+public class JinhuiConfigVO implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+
+ @ApiModelProperty(value = "兑换地址")
+ private String address;
+
+ @ApiModelProperty(value = "纬度")
+ private String lat;
+
+ @ApiModelProperty(value = "经度")
+ private String lng;
+
+ @ApiModelProperty(value = "兑换状态（1每天 2周一到周五 3周末）")
+ private String businessType;
+
+ @ApiModelProperty(value = "兑换开始时间")
+ private String businessStartTime;
+
+ @ApiModelProperty(value = "兑换结束时间")
+ private String businessEndTime;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiShoppingOrderVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiShoppingOrderVO.java
index 47fff42..164fd68 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiShoppingOrderVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiShoppingOrderVO.java
@@ -64,4 +64,25 @@
@ApiModelProperty(value = "电话")
private String phone;
+
+ @ApiModelProperty(value = "兑换地址")
+ private String address;
+
+ @ApiModelProperty(value = "纬度")
+ private String lat;
+
+ @ApiModelProperty(value = "经度")
+ private String lng;
+
+ @ApiModelProperty(value = "兑换状态（1每天 2周一到周五 3周末）")
+ private String businessType;
+
+ @ApiModelProperty(value = "兑换开始时间")
+ private String businessStartTime;
+
+ @ApiModelProperty(value = "兑换结束时间")
+ private String businessEndTime;
+
+
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
index c750d34..e94cce8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
@@ -657,8 +657,26 @@
public R orderExpurgateData(@RequestParam("id") String id);
+ /***************************************************************************************************************
+ *
+ *
+ * 社区配置兑换地址 时间
+ *
+ * *******************************************************************************************************
+ * @return
+ */
+
+ @GetMapping("/jinhuiConfig/configGetDetails")
+ public R configGetDetails(@RequestParam("communityId") String communityId);
+ @PostMapping("/jinhuiConfig/configAddData")
+ public R configAddData(@RequestBody JinhuiConfigVO item);
+ @PostMapping("/jinhuiConfig/configEditData")
+ public R configEditData(@RequestBody JinhuiConfigVO item);
+
+ @DeleteMapping("/jinhuiConfig/configExpurgateData")
+ public R configExpurgateData(@RequestParam("communityId") String communityId);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java
index 3f3c067..b4c5382 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java
@@ -697,5 +697,46 @@
+ /***************************************************************************************************************
+ *
+ *
+ * 社区配置兑换地址 时间
+ *
+ * *******************************************************************************************************
+ * @param item
+ * @return
+ */
+ @ApiOperation(value = "社区配置兑换地址详情", response = JinhuiConfigVO.class)
+ @GetMapping("/configGetDetails")
+ public R configGetDetails()
+ {
+ return jinhuiCommunityService.configGetDetails(getCommunityId()+"");
+ }
+
+
+ @ApiOperation(value = "社区配置兑换地址添加")
+ @PostMapping("/configAddData")
+ public R configAddData(@RequestBody JinhuiConfigVO item)
+ {
+ item.setCommunityId(getCommunityId()+"");
+ return jinhuiCommunityService.configAddData(item);
+ }
+
+ @ApiOperation(value = "社区配置兑换地址编辑")
+ @PostMapping("/configEditData")
+ public R configEditData(@RequestBody JinhuiConfigVO item)
+ {
+ item.setCommunityId(getCommunityId()+"");
+ return jinhuiCommunityService.configEditData(item);
+ }
+
+ @ApiOperation(value = "社区配置兑换地址删除")
+ @DeleteMapping("/configExpurgateData")
+ public R configExpurgateData()
+ {
+ return jinhuiCommunityService.configExpurgateData(getCommunityId()+"");
+ }
+
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiConfigApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiConfigApi.java
new file mode 100644
index 0000000..22148dd
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiConfigApi.java
@@ -0,0 +1,50 @@
+package com.panzhihua.service_jinhui_community.api;
+
+
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.jinhui.JinhuiConfigVO;
+import com.panzhihua.service_jinhui_community.service.JinhuiConfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@RestController
+@RequestMapping("/jinhuiConfig")
+public class JinhuiConfigApi
+{
+
+ @Resource
+ private JinhuiConfigService configService;
+
+ @GetMapping("/configGetDetails")
+ public R configGetDetails(@RequestParam("communityId") String communityId)
+ {
+ return R.ok(configService.getDetails(communityId));
+ }
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/configAddData")
+ public R configAddData(@RequestBody JinhuiConfigVO item)
+ {
+ return configService.addData(item);
+ }
+
+ @PostMapping("/configEditData")
+ public R configEditData(@RequestBody JinhuiConfigVO item)
+ {
+ return configService.editData(item);
+ }
+
+ @DeleteMapping("/configExpurgateData")
+ public R configExpurgateData(@RequestParam("communityId") String communityId)
+ {
+ return configService.expurgateData(communityId);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiShoppingApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiShoppingApi.java
index 3a3d7ef..402cfa4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiShoppingApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiShoppingApi.java
@@ -97,7 +97,8 @@
@RequestParam(value = "name", required = false)String name,
@RequestParam(value = "cancelType", required = false)String cancelType)
{
- return orderService.getList(pageNum,pageSize,userId,goodsId,orderNumber,goodName,name,cancelType);
+ return orderService.getList(pageNum,pageSize,userId,goodsId,orderNumber,
+ goodName,name,cancelType,getCommunityId()+"");
}
/**
@@ -108,7 +109,7 @@
@GetMapping("/orderGetDetails")
public R orderGetDetails(@RequestParam("id") String id)
{
- return R.ok(orderService.getDetails(id));
+ return R.ok(orderService.getDetails(id,getCommunityId()+""));
}
/**
@@ -143,7 +144,7 @@
@GetMapping("/orderCancelOrder")
public R orderCancelOrder(@RequestParam("orderId") String orderId)
{
- return orderService.cancelOrder(orderId);
+ return orderService.cancelOrder(orderId,getCommunityId()+"");
}
@@ -155,7 +156,7 @@
@DeleteMapping("/orderExpurgateData")
public R orderExpurgateData(@RequestParam("id") String id)
{
- return orderService.expurgateData(id);
+ return orderService.expurgateData(id,getCommunityId()+"");
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiConfigDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiConfigDao.java
new file mode 100644
index 0000000..65a4e3c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiConfigDao.java
@@ -0,0 +1,43 @@
+package com.panzhihua.service_jinhui_community.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.panzhihua.common.model.vos.jinhui.JinhuiConfigVO;
+import com.panzhihua.service_jinhui_community.entity.JinhuiConfig;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface JinhuiConfigDao extends BaseMapper<JinhuiConfig>
+{
+
+ /**
+ * 详情
+ * @param communityId
+ * @return
+ */
+ JinhuiConfig getDetails(@Param("communityId") String communityId);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ int addData(@Param("item") JinhuiConfigVO item);
+
+
+ /**
+ * 编辑
+ * @param item
+ * @return
+ */
+ int editData(@Param("item") JinhuiConfigVO item);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ int expurgateData(@Param("communityId") String communityId);
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiShoppingOrderDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiShoppingOrderDao.java
index b3e19de..e5468d0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiShoppingOrderDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiShoppingOrderDao.java
@@ -24,14 +24,16 @@
@Param("orderNumber") String orderNumber,
@Param("goodName") String goodName,
@Param("name") String name,
- @Param("cancelType") String cancelType);
+ @Param("cancelType") String cancelType,
+ @Param("community_id") String communityId);
/**
* 详情
* @param id
* @return
*/
- JinhuiShoppingOrder getDetails(@Param("id") String id);
+ JinhuiShoppingOrder getDetails(@Param("id") String id,
+ @Param("community_id") String communityId);
/**
* 新增
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiConfig.java b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiConfig.java
new file mode 100644
index 0000000..a124c4e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiConfig.java
@@ -0,0 +1,58 @@
+package com.panzhihua.service_jinhui_community.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("金汇社区商家配置")
+public class JinhuiConfig implements Serializable {
+ private static final long serialVersionUID = -70884515430727555L;
+
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+
+ @ApiModelProperty(value = "社区id")
+ private String communityId;
+
+ @ApiModelProperty(value = "兑换地址")
+ private String address;
+
+ @ApiModelProperty(value = "纬度")
+ private String lat;
+
+ @ApiModelProperty(value = "经度")
+ private String lng;
+
+ @ApiModelProperty(value = "兑换状态（1每天 2周一到周五 3周末）")
+ private String businessType;
+
+ @ApiModelProperty(value = "兑换开始时间")
+ private String businessStartTime;
+
+ @ApiModelProperty(value = "兑换结束时间")
+ private String businessEndTime;
+
+ @ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date creationTime;
+
+ @ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+
+
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiShoppingOrder.java b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiShoppingOrder.java
index 52df613..f06374f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiShoppingOrder.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiShoppingOrder.java
@@ -65,4 +65,23 @@
@ApiModelProperty(value = "电话")
private String phone;
+
+
+ @ApiModelProperty(value = "兑换地址")
+ private String address;
+
+ @ApiModelProperty(value = "纬度")
+ private String lat;
+
+ @ApiModelProperty(value = "经度")
+ private String lng;
+
+ @ApiModelProperty(value = "兑换状态（1每天 2周一到周五 3周末）")
+ private String businessType;
+
+ @ApiModelProperty(value = "兑换开始时间")
+ private String businessStartTime;
+
+ @ApiModelProperty(value = "兑换结束时间")
+ private String businessEndTime;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiConfigService.java b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiConfigService.java
new file mode 100644
index 0000000..0b42aae
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiConfigService.java
@@ -0,0 +1,22 @@
+package com.panzhihua.service_jinhui_community.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.jinhui.JinhuiConfigVO;
+import com.panzhihua.service_jinhui_community.entity.JinhuiConfig;
+
+public interface JinhuiConfigService extends IService<JinhuiConfig>
+{
+
+ JinhuiConfig getDetails(String id);
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ R addData(JinhuiConfigVO item);
+
+ R editData(JinhuiConfigVO item);
+
+ R expurgateData(String id);
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiShoppingOrderService.java b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiShoppingOrderService.java
index 3a219f1..0ce0d98 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiShoppingOrderService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiShoppingOrderService.java
@@ -13,9 +13,9 @@
* @return
*/
R getList(int pageNum,int pageSize,String userId,String goodsId,String orderNumber,
- String goodName,String name,String cancelType);
+ String goodName,String name,String cancelType,String communityId);
- JinhuiShoppingOrder getDetails(String id);
+ JinhuiShoppingOrder getDetails(String id,String communityId);
/**
* 新增
* @param
@@ -25,9 +25,7 @@
R editData(JinhuiShoppingOrderVO item);
- R cancelOrder(String orderId);
+ R cancelOrder(String orderId,String communityId);
-
-
- R expurgateData(String id);
+ R expurgateData(String id,String communityId);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiConfigServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiConfigServiceImpl.java
new file mode 100644
index 0000000..d276488
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiConfigServiceImpl.java
@@ -0,0 +1,55 @@
+package com.panzhihua.service_jinhui_community.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.jinhui.JinhuiConfigVO;
+import com.panzhihua.service_jinhui_community.dao.JinhuiConfigDao;
+import com.panzhihua.service_jinhui_community.entity.JinhuiConfig;
+import com.panzhihua.service_jinhui_community.service.JinhuiConfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+
+@Slf4j
+@Service
+public class JinhuiConfigServiceImpl extends ServiceImpl<JinhuiConfigDao,
+ JinhuiConfig> implements JinhuiConfigService
+{
+
+ @Override
+ public JinhuiConfig getDetails(String id) {
+ return baseMapper.getDetails(id);
+ }
+
+
+ @Override
+ public R addData(JinhuiConfigVO item)
+ {
+ int num= baseMapper.addData(item);
+ if(num>0)
+ {
+ return R.ok();
+ }
+ return R.fail("添加失败");
+ }
+
+ @Override
+ public R editData(JinhuiConfigVO item) {
+ int num= baseMapper.editData(item);
+ if(num>0)
+ {
+ return R.ok();
+ }
+ return R.fail("添加失败");
+ }
+
+ @Override
+ public R expurgateData(String id) {
+ int num= baseMapper.expurgateData(id);
+ if(num>0)
+ {
+ return R.ok();
+ }
+ return R.fail("添加失败");
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiShoppingOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiShoppingOrderServiceImpl.java
index ab06812..8f9611a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiShoppingOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiShoppingOrderServiceImpl.java
@@ -6,6 +6,7 @@
import com.panzhihua.common.model.vos.jinhui.JinhuiCoinGeneralTableVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiGoldCoinRecordVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiShoppingOrderVO;
+import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.service_jinhui_community.dao.JinhuiShoppingOrderDao;
import com.panzhihua.service_jinhui_community.entity.JinhuiCoinGeneralTable;
import com.panzhihua.service_jinhui_community.entity.JinhuiShopping;
@@ -38,21 +39,22 @@
@Override
public R getList(int pageNum,int pageSize,String userId,String goodsId,String orderNumber,
- String goodName,String name,String cancelType)
+ String goodName,String name,String cancelType,String communityId)
{
Page page = new Page<JinhuiShopping>(pageNum,pageSize);
- return R.ok(baseMapper.getList(page,userId,goodsId,orderNumber,goodName,name,cancelType));
+ return R.ok(baseMapper.getList(page,userId,goodsId,orderNumber,goodName,name,cancelType,communityId));
}
@Override
- public JinhuiShoppingOrder getDetails(String id) {
- return baseMapper.getDetails(id);
+ public JinhuiShoppingOrder getDetails(String id,String communityId) {
+ return baseMapper.getDetails(id,communityId);
}
@Override
public R addData(JinhuiShoppingOrderVO item)
{
+ item.setOrderNumber(Snowflake.getId()+"");
JinhuiCoinGeneralTable generalTable=tableService.getDetails(item.getUserId());
JinhuiShopping goods=shoppingService.getDetails(item.getGoodsId());
@@ -110,9 +112,9 @@
}
@Override
- public R cancelOrder(String orderId)
+ public R cancelOrder(String orderId,String communityId)
{
- JinhuiShoppingOrder order=baseMapper.getDetails(orderId);
+ JinhuiShoppingOrder order=baseMapper.getDetails(orderId,communityId);
if(!StringUtils.equals("0",order.getCancelType()))
{
@@ -156,9 +158,9 @@
}
@Override
- public R expurgateData(String id)
+ public R expurgateData(String id,String communityId)
{
- JinhuiShoppingOrder order=baseMapper.getDetails(id);
+ JinhuiShoppingOrder order=baseMapper.getDetails(id,communityId);
if(StringUtils.equals("0",order.getCancelType()))
{
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiShoppingOrderMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiShoppingOrderMapper.xml
index 4dea65b..ab13ee0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiShoppingOrderMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiShoppingOrderMapper.xml
@@ -26,6 +26,12 @@
jso.user_id,
su.name,
su.phone,
+ vcc.address,
+ vcc.lat,
+ vcc.lng,
+ vcc.business_type,
+ vcc.business_start_time,
+ vcc.business_end_time,
jso.creation_time,
jso.cancel_type,
jso.update_time,
@@ -34,6 +40,7 @@
from jinhui_shopping_order as jso
LEFT JOIN sys_user su ON jso.user_id = su.user_id
LEFT JOIN jinhui_shopping js ON js.id = jso.goods_id
+ LEFT JOIN volunteer_community_config as vcc ON vcc.community_id=#{communityId}
<where>
1=1
<if test="userId !=null and userId !='' ">
@@ -70,6 +77,12 @@
jso.user_id,
su.name,
su.phone,
+ vcc.address,
+ vcc.lat,
+ vcc.lng,
+ vcc.business_type,
+ vcc.business_start_time,
+ vcc.business_end_time,
jso.creation_time,
jso.cancel_type,
jso.update_time,
@@ -78,6 +91,7 @@
from jinhui_shopping_order as jso
LEFT JOIN sys_user su ON jso.user_id = su.user_id
LEFT JOIN jinhui_shopping js ON js.id = jso.goods_id
+ LEFT JOIN volunteer_community_config as vcc ON vcc.community_id=#{communityId}
where
jso.id=#{id}
</select>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/VolunteerCommunityConfigMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/VolunteerCommunityConfigMapper.xml
new file mode 100644
index 0000000..259ca38
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/VolunteerCommunityConfigMapper.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.panzhihua.service_jinhui_community.dao.JinhuiConfigDao">
+
+ <resultMap type="com.panzhihua.service_jinhui_community.entity.JinhuiConfig" id="itemMap">
+ <result property="id" column="id" />
+ <result property="communityId" column="community_id" />
+ <result property="address" column="address" />
+ <result property="lat" column="lat" />
+ <result property="lng" column="lng" />
+ <result property="businessType" column="business_type" />
+ <result property="businessStartTime" column="business_start_time" />
+ <result property="businessEndTime" column="business_end_time" />
+
+ <result property="creationTime" column="creation_time" />
+ <result property="updateTime" column="update_time" />
+ </resultMap>
+
+
+ <select id="getDetails" resultMap="itemMap">
+ select
+ id,
+ community_id,
+ address,
+ lat,
+ lng,
+ creation_time,
+ update_time,
+ business_type,
+ business_start_time,
+ business_end_time
+ from volunteer_community_config
+ where community_id=#{communityId}
+ </select>
+
+ <insert id="addData">
+ insert into volunteer_community_config
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="item.id != null and item.id != '' ">
+ id,
+ </if>
+ <if test="item.communityId != null and item.communityId != '' ">
+ community_id,
+ </if>
+ <if test="item.address != null and item.address != '' ">
+ address,
+ </if>
+ <if test="item.lat != null and item.lat != '' ">
+ lat,
+ </if>
+ <if test="item.lng != null and item.lng != '' ">
+ lng,
+ </if>
+ <if test="item.businessType != null and item.businessType != '' ">
+ business_type,
+ </if>
+ <if test="item.businessStartTime != null and item.businessStartTime != '' ">
+ business_start_time,
+ </if>
+ <if test="item.businessEndTime != null and item.businessEndTime != '' ">
+ business_end_time,
+ </if>
+ creation_time
+ </trim>
+ values
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="item.id != null and item.id != '' ">
+ #{item.id},
+ </if>
+ <if test="item.communityId != null and item.communityId != '' ">
+ #{item.communityId},
+ </if>
+ <if test="item.address != null and item.address != '' ">
+ #{item.address},
+ </if>
+ <if test="item.lat != null and item.lat != '' ">
+ #{item.lat},
+ </if>
+ <if test="item.lng != null and item.lng != '' ">
+ #{item.lng},
+ </if>
+ <if test="item.businessType != null and item.businessType != '' ">
+ #{item.businessType},
+ </if>
+ <if test="item.businessStartTime != null and item.businessStartTime != '' ">
+ #{item.businessStartTime},
+ </if>
+ <if test="item.businessEndTime != null and item.businessEndTime != '' ">
+ #{item.businessEndTime},
+ </if>
+ sysdate()
+ </trim>
+ </insert>
+
+ <update id="editData">
+ update volunteer_community_config
+ <set>
+ <if test="item.id != null and item.id != '' ">
+ id=#{item.id},
+ </if>
+ <if test="item.communityId != null and item.communityId != '' ">
+ community_id=#{item.communityId},
+ </if>
+ <if test="item.address != null and item.address != '' ">
+ address=#{item.address},
+ </if>
+ <if test="item.lat != null and item.lat != '' ">
+ lat=#{item.lat},
+ </if>
+ <if test="item.lng != null and item.lng != '' ">
+ lng=#{item.lng},
+ </if>
+ <if test="item.businessType != null and item.businessType != '' ">
+ business_type=#{item.businessType},
+ </if>
+ <if test="item.businessStartTime != null and item.businessStartTime != '' ">
+ business_start_time=#{item.businessStartTime},
+ </if>
+ <if test="item.businessEndTime != null and item.businessEndTime != '' ">
+ business_end_time=#{item.businessEndTime},
+ </if>
+ update_time=sysdate()
+ </set>
+ where community_id = #{item.communityId}
+ </update>
+
+ <delete id="expurgateData" parameterType="String">
+ delete from volunteer_community_config where community_id=#{communityId}
+ </delete>
+
+</mapper>
--
Gitblit v1.7.1