后台添加认购模块

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/SubscriptionApply.java

@@ -0,0 +1,152 @@
+package com.hcloud.microserver.system.facade.carbon.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.hcloud.microserver.commoncore.annotation.Excel;
+import com.hcloud.microserver.commoncore.web.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 碳汇认购申请对象 t_subscription_apply
+ *
+ * @author liql
+ * @date 2020-11-25
+ */
+@ApiModel(value = "碳汇认购申请实体")
+public class SubscriptionApply extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 序列 */
+    private String guid;
+
+    /** 申请客户id */
+    @Excel(name = "申请客户id")
+    @ApiModelProperty(value = "申请客户id")
+    private Long applyCustomerId;
+
+    /** 申请客户名称 */
+    @Excel(name = "申请客户名称")
+    @ApiModelProperty(value = "申请客户名称")
+    private String applyCustomName;
+
+    /** 认购数量 */
+    @Excel(name = "认购数量")
+    @ApiModelProperty(value = "认购数量")
+    private Long amount;
+
+    /** 申请状态（0认购中，1认购成功） */
+    @Excel(name = "申请状态", readConverterExp = "0=认购中，1认购成功")
+    @ApiModelProperty(value = "申请状态（0=认购中，1认购成功）")
+    private Integer applyStatus;
+
+    /** 记录状态(0无效，1有效) */
+    @Excel(name = "记录状态(0无效，1有效)")
+    @ApiModelProperty(value = "记录状态(0无效，1有效)")
+    private Integer recordStatus;
+
+    /** 申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty(value = "申请时间")
+    private Date applyDate;
+
+    /** 修改时间  */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "修改时间 ", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty(value = "修改时间 ")
+    private Date modifiedTime;
+
+    public void setGuid(String guid)
+    {
+        this.guid = guid;
+    }
+
+    public String getGuid()
+    {
+        return guid;
+    }
+    public void setApplyCustomerId(Long applyCustomerId)
+    {
+        this.applyCustomerId = applyCustomerId;
+    }
+
+    public Long getApplyCustomerId()
+    {
+        return applyCustomerId;
+    }
+    public void setApplyCustomName(String applyCustomName)
+    {
+        this.applyCustomName = applyCustomName;
+    }
+
+    public String getApplyCustomName()
+    {
+        return applyCustomName;
+    }
+    public void setAmount(Long amount)
+    {
+        this.amount = amount;
+    }
+
+    public Long getAmount()
+    {
+        return amount;
+    }
+    public void setApplyStatus(Integer applyStatus)
+    {
+        this.applyStatus = applyStatus;
+    }
+
+    public Integer getApplyStatus()
+    {
+        return applyStatus;
+    }
+    public void setRecordStatus(Integer recordStatus)
+    {
+        this.recordStatus = recordStatus;
+    }
+
+    public Integer getRecordStatus()
+    {
+        return recordStatus;
+    }
+    public void setApplyDate(Date applyDate)
+    {
+        this.applyDate = applyDate;
+    }
+
+    public Date getApplyDate()
+    {
+        return applyDate;
+    }
+    public void setModifiedTime(Date modifiedTime)
+    {
+        this.modifiedTime = modifiedTime;
+    }
+
+    public Date getModifiedTime()
+    {
+        return modifiedTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("guid", getGuid())
+            .append("applyCustomerId", getApplyCustomerId())
+            .append("applyCustomName", getApplyCustomName())
+            .append("amount", getAmount())
+            .append("remark", getRemark())
+            .append("applyStatus", getApplyStatus())
+            .append("recordStatus", getRecordStatus())
+            .append("applyDate", getApplyDate())
+            .append("createTime", getCreateTime())
+            .append("modifiedTime", getModifiedTime())
+            .toString();
+    }
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/controller/SubscriptionApplyController.java

@@ -0,0 +1,80 @@
+package com.hcloud.microserver.system.bank.controller;
+
+
+import com.hcloud.microserver.commoncore.annotation.AuthCarbonValidate;
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.web.domain.AjaxResult;
+import com.hcloud.microserver.commoncore.web.page.TableDataInfo;
+import com.hcloud.microserver.system.bank.service.ISubscriptionApplyService;
+import com.hcloud.microserver.system.facade.carbon.entity.SubscriptionApply;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 碳汇认购申请Controller
+ *
+ * @author liql
+ * @date 2020-11-24
+ */
+@RestController
+@RequestMapping("/back/apply")
+@Api(tags = "碳汇认购申请后台服务",description = "碳汇认购申请后台服务")
+public class SubscriptionApplyController extends BaseController
+{
+    @Autowired
+    private ISubscriptionApplyService subscriptionApplyService;
+
+    /**
+     * 查询碳汇认购申请列表
+     */
+    @ApiResponse(code =0,message = "查询成功")
+    @GetMapping("/list")
+    @AuthCarbonValidate
+    @ApiOperation("查询认购申请列表")
+    public TableDataInfo list(SubscriptionApply subscriptionApply)
+    {
+        startPage();
+        List<SubscriptionApply> list = subscriptionApplyService.selectSubscriptionApplyList(subscriptionApply);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取碳汇认购申请详细信息
+     */
+    @GetMapping(value = "/{guid}")
+    @AuthCarbonValidate
+    @ApiOperation("获取认购申请详情")
+    public AjaxResult getInfo(@PathVariable("guid") String guid)
+    {
+        return AjaxResult.success(subscriptionApplyService.selectSubscriptionApplyById(guid));
+    }
+
+    /**
+     * 修改碳汇认购申请
+     */
+
+    @PutMapping
+    @AuthCarbonValidate
+    @ApiOperation("更新申请状态为认购成功")
+    public AjaxResult edit(String guid)
+    {
+        return toAjax(subscriptionApplyService.updateSubscriptionApply(guid));
+    }
+
+    /**
+     * 删除碳汇认购申请
+     */
+
+	@DeleteMapping("/{guids}")
+    @AuthCarbonValidate
+    @ApiOperation("逻辑删除认购申请")
+    public AjaxResult remove(@PathVariable String[] guids)
+    {
+        return toAjax(subscriptionApplyService.deleteSubscriptionApplyByIds(guids));
+    }
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/dao/SubscriptionApplyMapper.java

@@ -0,0 +1,55 @@
+package com.hcloud.microserver.system.bank.dao;
+
+import com.hcloud.microserver.system.facade.carbon.entity.SubscriptionApply;
+
+import java.util.List;
+
+
+/**
+ * 碳汇认购申请Mapper接口
+ * 
+ * @author liql
+ * @date 2020-11-24
+ */
+public interface SubscriptionApplyMapper 
+{
+    /**
+     * 查询碳汇认购申请
+     * 
+     * @param guid 碳汇认购申请ID
+     * @return 碳汇认购申请
+     */
+    public SubscriptionApply selectSubscriptionApplyById(String guid);
+
+    /**
+     * 查询碳汇认购申请列表
+     * 
+     * @param subscriptionApply 碳汇认购申请
+     * @return 碳汇认购申请集合
+     */
+    public List<SubscriptionApply> selectSubscriptionApplyList(SubscriptionApply subscriptionApply);
+
+    /**
+     * 修改碳汇认购申请
+     * 
+     * @param guid 碳汇认购申请
+     * @return 结果
+     */
+    public int updateSubscriptionApply(String guid);
+
+    /**
+     * 删除碳汇认购申请
+     * 
+     * @param guid 碳汇认购申请ID
+     * @return 结果
+     */
+    public int deleteSubscriptionApplyById(String guid);
+
+    /**
+     * 批量删除碳汇认购申请
+     * 
+     * @param guids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSubscriptionApplyByIds(String[] guids);
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/ISubscriptionApplyService.java

@@ -0,0 +1,56 @@
+package com.hcloud.microserver.system.bank.service;
+
+import com.hcloud.microserver.system.facade.carbon.entity.SubscriptionApply;
+
+import java.util.List;
+
+
+/**
+ * 碳汇认购申请Service接口
+ * 
+ * @author liql
+ * @date 2020-11-24
+ */
+public interface ISubscriptionApplyService 
+{
+    /**
+     * 查询碳汇认购申请
+     * 
+     * @param guid 碳汇认购申请ID
+     * @return 碳汇认购申请
+     */
+    public SubscriptionApply selectSubscriptionApplyById(String guid);
+
+    /**
+     * 查询碳汇认购申请列表
+     * 
+     * @param subscriptionApply 碳汇认购申请
+     * @return 碳汇认购申请集合
+     */
+    public List<SubscriptionApply> selectSubscriptionApplyList(SubscriptionApply subscriptionApply);
+
+
+    /**
+     * 修改碳汇认购申请-更新为认购完成
+     * 
+     * @param guid 碳汇认购申请
+     * @return 结果
+     */
+    public int updateSubscriptionApply(String guid);
+
+    /**
+     * 批量删除碳汇认购申请
+     * 
+     * @param guids 需要删除的碳汇认购申请ID
+     * @return 结果
+     */
+    public int deleteSubscriptionApplyByIds(String[] guids);
+
+    /**
+     * 删除碳汇认购申请信息
+     * 
+     * @param guid 碳汇认购申请ID
+     * @return 结果
+     */
+    public int deleteSubscriptionApplyById(String guid);
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/impl/SubscriptionApplyServiceImpl.java

@@ -0,0 +1,85 @@
+package com.hcloud.microserver.system.bank.service.impl;
+
+import com.hcloud.microserver.commoncore.util.UUIDUtils;
+import com.hcloud.microserver.commoncore.util.reflect.DateUtils;
+import com.hcloud.microserver.security.util.SecurityUtils;
+import com.hcloud.microserver.system.bank.dao.SubscriptionApplyMapper;
+import com.hcloud.microserver.system.bank.service.ISubscriptionApplyService;
+import com.hcloud.microserver.system.facade.carbon.entity.SubscriptionApply;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 碳汇认购申请Service业务层处理
+ *
+ * @author liql
+ * @date 2020-11-24
+ */
+@Service
+public class SubscriptionApplyServiceImpl implements ISubscriptionApplyService
+{
+    @Autowired
+    private SubscriptionApplyMapper subscriptionApplyMapper;
+
+    /**
+     * 查询碳汇认购申请
+     *
+     * @param guid 碳汇认购申请ID
+     * @return 碳汇认购申请
+     */
+    @Override
+    public SubscriptionApply selectSubscriptionApplyById(String guid)
+    {
+        return subscriptionApplyMapper.selectSubscriptionApplyById(guid);
+    }
+
+    /**
+     * 查询碳汇认购申请列表
+     *
+     * @param subscriptionApply 碳汇认购申请
+     * @return 碳汇认购申请
+     */
+    @Override
+    public List<SubscriptionApply> selectSubscriptionApplyList(SubscriptionApply subscriptionApply)
+    {
+        return subscriptionApplyMapper.selectSubscriptionApplyList(subscriptionApply);
+    }
+
+    /**
+     * 修改碳汇认购申请
+     *
+     * @param guid 碳汇认购申请
+     * @return 结果
+     */
+    @Override
+    public int updateSubscriptionApply(String guid)
+    {
+        return subscriptionApplyMapper.updateSubscriptionApply(guid);
+    }
+
+    /**
+     * 批量删除碳汇认购申请
+     *
+     * @param guids 需要删除的碳汇认购申请ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSubscriptionApplyByIds(String[] guids)
+    {
+        return subscriptionApplyMapper.deleteSubscriptionApplyByIds(guids);
+    }
+
+    /**
+     * 删除碳汇认购申请信息
+     *
+     * @param guid 碳汇认购申请ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSubscriptionApplyById(String guid)
+    {
+        return subscriptionApplyMapper.deleteSubscriptionApplyById(guid);
+    }
+}

carbon-back/carbon-back-service/src/main/resources/carbon/SubscriptionApplyMapper.xml

@@ -0,0 +1,60 @@
+<?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.hcloud.microserver.h5.dao.SubscriptionApplyMapper">
+    
+    <resultMap type="SubscriptionApply" id="SubscriptionApplyResult">
+        <result property="guid"               column="guid"    />
+        <result property="applyCustomerId"    column="apply_customer_id"    />
+        <result property="applyCustomName"    column="apply_custom_name"    />
+        <result property="amount"             column="amount"    />
+        <result property="remark"             column="remark"    />
+        <result property="applyStatus"        column="apply_status"    />
+        <result property="recordStatus"       column="record_status"    />
+        <result property="applyDate"          column="apply_date"    />
+        <result property="createTime"         column="create_time"    />
+        <result property="modifiedTime"       column="modified_time"    />
+    </resultMap>
+
+    <sql id="selectSubscriptionApplyVo">
+        select guid, apply_customer_id, apply_custom_name, amount, remark, apply_status, record_status, apply_date, create_time, modified_time from t_subscription_apply
+    </sql>
+
+    <select id="selectSubscriptionApplyList" parameterType="SubscriptionApply" resultMap="SubscriptionApplyResult">
+        <include refid="selectSubscriptionApplyVo"/>
+        <where>
+            <if test="applyCustomName != null  and applyCustomName != ''"> and apply_custom_name like concat('%', #{applyCustomName}, '%')</if>
+            <if test="applyStatus != null "> and apply_status = #{applyStatus}</if>
+            <if test="applyDate != null "> and apply_date = #{applyDate}</if>
+        </where>
+    </select>
+    
+    <select id="selectSubscriptionApplyById" parameterType="String" resultMap="SubscriptionApplyResult">
+        <include refid="selectSubscriptionApplyVo"/>
+        where guid = #{guid}
+    </select>
+
+    <!--更新申请状态即认购完成-->
+    <update id="updateSubscriptionApply" parameterType="SubscriptionApply">
+        update t_subscription_apply
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="applyStatus != null ">apply_status = #{applyStatus},</if>
+            <if test="modifiedTime != null ">modified_time = #{modifiedTime},</if>
+        </trim>
+        where guid = #{guid}
+    </update>
+
+    <!-- 逻辑删除 -->
+    <delete id="deleteSubscriptionApplyById" parameterType="String">
+        update t_subscription_apply set record_status = 0 where guid = #{guid}
+    </delete>
+    <!-- 批量逻辑删除 -->
+    <delete id="deleteSubscriptionApplyByIds" parameterType="String">
+        update t_subscription_apply set record_status = 0 where guid in
+        <foreach item="guid" collection="array" open="(" separator="," close=")">
+            #{guid}
+        </foreach>
+    </delete>
+    
+</mapper>

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/controller/web/SubscriptionApplyController.java

@@ -8,6 +8,8 @@ import com.hcloud.microserver.commoncore.web.page.TableDataInfo;
 import com.hcloud.microserver.h5.entity.SubscriptionApply;
 import com.hcloud.microserver.h5.forms.SubscriptionApplyForm;
 import com.hcloud.microserver.h5.service.ISubscriptionApplyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -21,7 +23,8 @@ import java.util.List;
  * @date 2020-11-24
  */
 @RestController
-@RequestMapping("/h5/apply")
+@RequestMapping("/wap/apply")
+@Api(tags = "碳汇认购申请H5服务",description = "碳汇认购申请H5服务")
 public class SubscriptionApplyController extends BaseController
 {
     @Autowired
@@ -33,10 +36,11 @@ public class SubscriptionApplyController extends BaseController
     @ApiResponse(code =0,message = "查询成功")
     @GetMapping("/list")
     @AuthCarbonValidate
-    public TableDataInfo list(SubscriptionApply subscriptionApply)
+    @ApiOperation("查询认购申请列表")
+    public TableDataInfo list()
     {
         startPage();
-        List<SubscriptionApply> list = subscriptionApplyService.selectSubscriptionApplyList(subscriptionApply);
+        List<SubscriptionApply> list = subscriptionApplyService.selectSubscriptionApplyList();
         return getDataTable(list);
     }
 
@@ -45,6 +49,7 @@ public class SubscriptionApplyController extends BaseController
      */
     @GetMapping(value = "/{guid}")
     @AuthCarbonValidate
+    @ApiOperation("获取认购申请详情")
     public AjaxResult getInfo(@PathVariable("guid") String guid)
     {
         return AjaxResult.success(subscriptionApplyService.selectSubscriptionApplyById(guid));
@@ -54,7 +59,8 @@ public class SubscriptionApplyController extends BaseController
      * 新增碳汇认购申请
      */
     @PostMapping
-    //@AuthCarbonValidate
+    @AuthCarbonValidate
+    @ApiOperation("保存碳汇认购申请")
     public AjaxResult add(@RequestBody SubscriptionApplyForm applyForm)
     {
         return toAjax(subscriptionApplyService.insertSubscriptionApply(applyForm));
@@ -66,6 +72,7 @@ public class SubscriptionApplyController extends BaseController
 
     @PutMapping
     @AuthCarbonValidate
+    @ApiOperation(value = "更新申请状态为认购成功",hidden = true)
     public AjaxResult edit(String guid)
     {
         return toAjax(subscriptionApplyService.updateSubscriptionApply(guid));
@@ -77,6 +84,7 @@ public class SubscriptionApplyController extends BaseController
 
 	@DeleteMapping("/{guids}")
     @AuthCarbonValidate
+    @ApiOperation(value = "逻辑删除认购申请",hidden = true)
     public AjaxResult remove(@PathVariable String[] guids)
     {
         return toAjax(subscriptionApplyService.deleteSubscriptionApplyByIds(guids));

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/dao/SubscriptionApplyMapper.java

@@ -1,6 +1,7 @@
 package com.hcloud.microserver.h5.dao;
 
 import com.hcloud.microserver.h5.entity.SubscriptionApply;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -23,11 +24,11 @@ public interface SubscriptionApplyMapper
 
     /**
      * 查询碳汇认购申请列表
-     * 
-     * @param subscriptionApply 碳汇认购申请
+     *
+     * @param applyCustomerId 当前用户id
      * @return 碳汇认购申请集合
      */
-    public List<SubscriptionApply> selectSubscriptionApplyList(SubscriptionApply subscriptionApply);
+    public List<SubscriptionApply> selectSubscriptionApplyList(@Param("applyCustomerId") Long applyCustomerId);
 
     /**
      * 新增碳汇认购申请

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/service/ISubscriptionApplyService.java

@@ -25,11 +25,10 @@ public interface ISubscriptionApplyService
 
     /**
      * 查询碳汇认购申请列表
-     * 
-     * @param subscriptionApply 碳汇认购申请
+     *
      * @return 碳汇认购申请集合
      */
-    public List<SubscriptionApply> selectSubscriptionApplyList(SubscriptionApply subscriptionApply);
+    public List<SubscriptionApply> selectSubscriptionApplyList();
 
     /**
      * 新增碳汇认购申请

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/service/impl/SubscriptionApplyServiceImpl.java

@@ -39,13 +39,13 @@ public class SubscriptionApplyServiceImpl implements ISubscriptionApplyService
     /**
      * 查询碳汇认购申请列表
      *
-     * @param subscriptionApply 碳汇认购申请
      * @return 碳汇认购申请
      */
     @Override
-    public List<SubscriptionApply> selectSubscriptionApplyList(SubscriptionApply subscriptionApply)
-    {
-        return subscriptionApplyMapper.selectSubscriptionApplyList(subscriptionApply);
+    public List<SubscriptionApply> selectSubscriptionApplyList()
+    {   //当前用户id
+        Long applyCustomerId = SecurityUtils.getUserId()==null?1:SecurityUtils.getUserId();
+        return subscriptionApplyMapper.selectSubscriptionApplyList(applyCustomerId);
     }
 
     /**
@@ -62,9 +62,13 @@ public class SubscriptionApplyServiceImpl implements ISubscriptionApplyService
 
         apply.setAmount(applyForm.getAmount());
         apply.setRemark(applyForm.getRemark());
-        apply.setApplyCustomerId(SecurityUtils.getUserId());
-        apply.setApplyCustomName(SecurityUtils.getUsername());
+        Long applyCustomerId = SecurityUtils.getUserId()==null?1:SecurityUtils.getUserId();
+        apply.setApplyCustomerId(applyCustomerId);
+        String applyCustomName = SecurityUtils.getUsername()==null?"测试认购企业":SecurityUtils.getUsername();
+        apply.setApplyCustomName(applyCustomName);
         apply.setRecordStatus(1);
+        apply.setApplyStatus(0);
+        apply.setApplyDate(DateUtils.getNowDate());
 
         apply.setModifiedTime(DateUtils.getNowDate());
         apply.setCreateTime(DateUtils.getNowDate());

carbon-h5/carbon-h5-service/src/main/resources/com/hcloud/microserver/h5/dao/SubscriptionApplyMapper.xml

@@ -21,12 +21,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select guid, apply_customer_id, apply_custom_name, amount, remark, apply_status, record_status, apply_date, create_time, modified_time from t_subscription_apply
     </sql>
 
-    <select id="selectSubscriptionApplyList" parameterType="SubscriptionApply" resultMap="SubscriptionApplyResult">
+    <select id="selectSubscriptionApplyList" parameterType="LONG" resultMap="SubscriptionApplyResult">
         <include refid="selectSubscriptionApplyVo"/>
         <where>
-            <if test="applyCustomName != null  and applyCustomName != ''"> and apply_custom_name like concat('%', #{applyCustomName}, '%')</if>
-            <if test="applyStatus != null "> and apply_status = #{applyStatus}</if>
-            <if test="applyDate != null "> and apply_date = #{applyDate}</if>
+            <if test="applyCustomerId != null "> and apply_customerId = #{applyCustomerId}</if>
         </where>
     </select>
     

nacos/.gitignore

@@ -1 +1,3 @@
 /logs/
+/data/
+/bin/