Merge remote-tracking branch 'origin/dev' into dev

carbon-back/carbon-back-mbg/src/main/resources/generatorConfig.xml

@@ -37,8 +37,8 @@
         <javaClientGenerator type="XMLMAPPER" targetPackage="com.hcloud.microserver.system.mbg.mapper"
                              targetProject="carbon-back\carbon-back-mbg\src\main\java"/>
         <!--生成全部表tableName设为%-->
-        <table tableName="t_transfer_detail">
-            <generatedKey column="id" sqlStatement="MySql" identity="true"/>
-        </table>
+        <table tableName="t_subscription_apply"/>
+<!--            <generatedKey column="id" sqlStatement="MySql" identity="true"/>-->
+<!--        </table>-->
     </context>
 </generatorConfiguration>

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

@@ -46,12 +46,14 @@ public class ProductTypeController extends CarbonBaseController {
     }
 
     @ApiOperation("修改产品类型")
+    @PostMapping("/update")
     public ResponseBase update(@RequestBody ProductTypeForm productTypeForm) {
         int success = this.productTypeService.modify(productTypeForm);
         return thisReturn(success);
     }
 
     @ApiOperation("分页获取产品类型")
+    @PostMapping("/searchByPage")
     public ResponseBase searchByPage(@RequestBody ProductTypeForm productTypeForm) {
         PageInfo pageInfo = this.productTypeService.queryListByPage(productTypeForm);
        return responseSuccess(pageInfo);

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

@@ -1,8 +1,10 @@
 package com.hcloud.microserver.system.bank.dao;
 
 import com.hcloud.microserver.commoncore.base.BaseMapper;
+import com.hcloud.microserver.system.facade.carbon.entity.ProductTypePrice;
 import com.hcloud.microserver.system.facade.carbon.entity.ProductTypePriceWithBLOBs;
 import com.hcloud.microserver.system.facade.carbon.forms.ProductTypePriceForm;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -23,4 +25,12 @@ public interface ProductTypePriceMapper extends BaseMapper<ProductTypePriceWithB
      * @return
      */
     int updateGoodsInfoPrice(ProductTypePriceWithBLOBs productTypePriceWithBLOBs);
+
+    /**
+     * 查询最新的产品类别定价
+     * lym
+     * @param ProductTypeGuid
+     * @return
+     */
+    ProductTypePriceWithBLOBs selectNewProductTypePrice(@Param(("ProductTypeGuid")) String ProductTypeGuid);
 }

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

@@ -54,6 +54,8 @@ public class ProductInfoServiceImpl implements ProductInfoService {
 
     @Resource
     private FarmerInfoMapper farmerInfoMapper;
+    @Resource
+    private ProductTypePriceMapper productTypePriceMapper;
 
     private static final GeneratorIdUtils ID_UTILS_INSTANCE = new GeneratorIdUtils();
 
@@ -408,7 +410,18 @@ public class ProductInfoServiceImpl implements ProductInfoService {
                 goodsInfo.setIsSale(1);
                 goodsInfo.setCreateTime(new Date());
                 goodsInfo.setModifiedTime(new Date());
+                goodsInfo.setCreateUser(CurrUserUtil.getUserId());
+                goodsInfo.setModifiedUser(CurrUserUtil.getUserId());
+
+                //查询产品类别最新定价为商品售价 lym
+                String fkProductType = productInfo.getFkProductType();
+                ProductTypePriceWithBLOBs typePriceWithBLOBs = productTypePriceMapper.selectNewProductTypePrice(fkProductType);
+                if (typePriceWithBLOBs != null && typePriceWithBLOBs.getFkProductType().contains(fkProductType)){
+                    goodsInfo.setPrice(typePriceWithBLOBs.getPrice());
+                }
+
                 result = this.goodsInfoMapper.insert(goodsInfo);
+
                 if (result < 1) throw new RuntimeException("产品发布 -- 添加商品记录失败");
 
                 GoodsDetail goodsDetail = new GoodsDetail();
@@ -437,6 +450,7 @@ public class ProductInfoServiceImpl implements ProductInfoService {
                 goodsSaleInfo.setSaleType(goodsInfoForm.getSaleType());
                 goodsSaleInfo.setSaleTargets(goodsInfoForm.getSaleTargets());
                 goodsSaleInfo.setModifiedTime(new Date());
+                goodsSaleInfo.setSalePrice(goodsInfo.getPrice());
                 result = this.goodsSaleInfoMapper.insertSelective(goodsSaleInfo);
                 if (result < 1) throw new RuntimeException("产品发布 -- 添加商品销售信息失败");
 

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

@@ -1,6 +1,6 @@
 <?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="GoodsCredentialInfoMapper">
+<mapper namespace="com.hcloud.microserver.system.bank.dao.GoodsCredentialInfoMapper">
   <resultMap id="BaseResultMap" type="GoodsCredentialInfo">
     <id column="guid" jdbcType="CHAR" property="guid" />
     <result column="fk_customer_id" jdbcType="CHAR" property="fkCustomerId" />

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

@@ -1,6 +1,6 @@
 <?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="GoodsDetailMapper">
+<mapper namespace="com.hcloud.microserver.system.bank.dao.GoodsDetailMapper">
     <resultMap id="BaseResultMap" type="GoodsDetail">
         <id column="guid" jdbcType="CHAR" property="guid"/>
         <result column="fk_goods_guid" jdbcType="CHAR" property="fkGoodsGuid"/>

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

@@ -1,6 +1,6 @@
 <?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="GoodsInfoMapper">
+<mapper namespace="com.hcloud.microserver.system.bank.dao.GoodsInfoMapper">
     <resultMap id="BaseResultMap" type="GoodsInfo">
         <id column="guid" jdbcType="CHAR" property="guid"/>
         <result column="goods_type" jdbcType="VARCHAR" property="goodsType"/>

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

@@ -1,6 +1,6 @@
 <?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="GoodsSaleInfoMapper">
+<mapper namespace="com.hcloud.microserver.system.bank.dao.GoodsSaleInfoMapper">
   <resultMap id="BaseResultMap" type="GoodsSaleInfo">
     <id column="guid" jdbcType="CHAR" property="guid" />
     <result column="fk_goods_guid" jdbcType="CHAR" property="fkGoodsGuid" />

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

@@ -211,14 +211,17 @@
   <select id="selectList" parameterType="com.hcloud.microserver.system.facade.carbon.forms.ProductTypePriceForm" resultMap="ResultMapWithBLOBs">
     SELECT <include refid="Base_Column_List"/>,<include refid="Blob_Column_List"/> FROM t_product_type_price
       WHERE state = 1
-    <if test="typeName != null">
+    <if test="typeName != null and typeName !=''">
       AND type_name LIKE CONCAT("%",#{typeName,jdbcType=LONGVARCHAR},"%)"
     </if>
+    <if test="fkProductType != null and fkProductType !=''">
+      AND FIND_IN_SET(#{fkProductType},fk_product_type)
+    </if>
     <if test="checkState != null">
       AND check_state = #{checkState,jdbcType=INTEGER}
     </if>
-    <if test="checkTime != null">
-      AND check_time = #{checkTime,jdbcType=TIMESTAMP}
+    <if test="checkTime != null and checkTime !=''">
+      AND DATE_FORMAT(check_time,"%Y-%m-%d") = #{checkTime}
     </if>
       ORDER BY create_time DESC
   </select>
@@ -236,4 +239,14 @@
         ) tmp
        )
   </update>
+
+  <!-- 查询最新的产品类别定价 lym -->
+  <select id="selectNewProductTypePrice" parameterType="String" resultMap="ResultMapWithBLOBs">
+      SELECT <include refid="Base_Column_List"/>,<include refid="Blob_Column_List"/>
+      FROM t_product_type_price WHERE state = 1
+        AND check_state = 1
+        AND FIND_IN_SET(#{ProductTypeGuid},fk_product_type)
+      ORDER BY check_time DESC
+      LIMIT 1
+  </select>
 </mapper>

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

@@ -0,0 +1,84 @@
+package com.hcloud.microserver.h5.controller.web;
+
+
+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.h5.entity.SubscriptionApply;
+import com.hcloud.microserver.h5.forms.SubscriptionApplyForm;
+import com.hcloud.microserver.h5.service.ISubscriptionApplyService;
+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("/h5/apply")
+public class SubscriptionApplyController extends BaseController
+{
+    @Autowired
+    private ISubscriptionApplyService subscriptionApplyService;
+
+    /**
+     * 查询碳汇认购申请列表
+     */
+    @ApiResponse(code =0,message = "查询成功")
+    @GetMapping("/list")
+    @AuthCarbonValidate
+    public TableDataInfo list(SubscriptionApply subscriptionApply)
+    {
+        startPage();
+        List<SubscriptionApply> list = subscriptionApplyService.selectSubscriptionApplyList(subscriptionApply);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取碳汇认购申请详细信息
+     */
+    @GetMapping(value = "/{guid}")
+    @AuthCarbonValidate
+    public AjaxResult getInfo(@PathVariable("guid") String guid)
+    {
+        return AjaxResult.success(subscriptionApplyService.selectSubscriptionApplyById(guid));
+    }
+
+    /**
+     * 新增碳汇认购申请
+     */
+    @PostMapping
+    //@AuthCarbonValidate
+    public AjaxResult add(@RequestBody SubscriptionApplyForm applyForm)
+    {
+        return toAjax(subscriptionApplyService.insertSubscriptionApply(applyForm));
+    }
+
+    /**
+     * 修改碳汇认购申请
+     */
+
+    @PutMapping
+    @AuthCarbonValidate
+    public AjaxResult edit(String guid)
+    {
+        return toAjax(subscriptionApplyService.updateSubscriptionApply(guid));
+    }
+
+    /**
+     * 删除碳汇认购申请
+     */
+
+	@DeleteMapping("/{guids}")
+    @AuthCarbonValidate
+    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

@@ -0,0 +1,63 @@
+package com.hcloud.microserver.h5.dao;
+
+import com.hcloud.microserver.h5.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 subscriptionApply 碳汇认购申请
+     * @return 结果
+     */
+    public int insertSubscriptionApply(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-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/entity/SubscriptionApply.java

@@ -0,0 +1,151 @@
+package com.hcloud.microserver.h5.entity;
+
+import java.util.Date;
+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;
+
+/**
+ * 碳汇认购申请对象 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-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/forms/SubscriptionApplyForm.java

@@ -0,0 +1,19 @@
+package com.hcloud.microserver.h5.forms;
+
+/**
+ *  线下认购
+ * @Author liql
+ * @Date 2020-11-25
+ */
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+@Data
+public class SubscriptionApplyForm implements Serializable {
+    @ApiModelProperty(value = "认购数量")
+    private Long amount;
+    @ApiModelProperty(value = "备注")
+    private String remark;
+}

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

@@ -0,0 +1,65 @@
+package com.hcloud.microserver.h5.service;
+
+
+import com.hcloud.microserver.h5.entity.SubscriptionApply;
+import com.hcloud.microserver.h5.forms.SubscriptionApplyForm;
+
+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 applyForm 碳汇认购申请
+     * @return 结果
+     */
+    public int insertSubscriptionApply(SubscriptionApplyForm applyForm);
+
+    /**
+     * 修改碳汇认购申请-更新为认购完成
+     * 
+     * @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-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/service/impl/SubscriptionApplyServiceImpl.java

@@ -0,0 +1,109 @@
+package com.hcloud.microserver.h5.service.impl;
+
+import com.hcloud.microserver.commoncore.util.UUIDUtils;
+import com.hcloud.microserver.commoncore.util.reflect.DateUtils;
+import com.hcloud.microserver.h5.dao.SubscriptionApplyMapper;
+import com.hcloud.microserver.h5.entity.SubscriptionApply;
+import com.hcloud.microserver.h5.forms.SubscriptionApplyForm;
+import com.hcloud.microserver.h5.service.ISubscriptionApplyService;
+import com.hcloud.microserver.security.util.SecurityUtils;
+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 applyForm 碳汇认购申请
+     * @return 结果
+     */
+    @Override
+    public int insertSubscriptionApply(SubscriptionApplyForm applyForm)
+    {
+        SubscriptionApply apply = new SubscriptionApply();
+        apply.setGuid(UUIDUtils.randomUUID());
+
+        apply.setAmount(applyForm.getAmount());
+        apply.setRemark(applyForm.getRemark());
+        apply.setApplyCustomerId(SecurityUtils.getUserId());
+        apply.setApplyCustomName(SecurityUtils.getUsername());
+        apply.setRecordStatus(1);
+
+        apply.setModifiedTime(DateUtils.getNowDate());
+        apply.setCreateTime(DateUtils.getNowDate());
+        return subscriptionApplyMapper.insertSubscriptionApply(apply);
+    }
+
+    /**
+     * 修改碳汇认购申请
+     *
+     * @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-h5/carbon-h5-service/src/main/resources/com/hcloud/microserver/h5/dao/SubscriptionApplyMapper.xml

@@ -0,0 +1,88 @@
+<?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>
+        
+    <insert id="insertSubscriptionApply" parameterType="SubscriptionApply">
+        insert into t_subscription_apply
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="guid != null  and guid != ''">guid,</if>
+            <if test="applyCustomerId != null  and applyCustomerId != ''">apply_customer_id,</if>
+            <if test="applyCustomName != null  and applyCustomName != ''">apply_custom_name,</if>
+            <if test="amount != null ">amount,</if>
+            <if test="remark != null  and remark != ''">remark,</if>
+            <if test="applyStatus != null ">apply_status,</if>
+            <if test="recordStatus != null ">record_status,</if>
+            <if test="applyDate != null  and applyDate != ''">apply_date,</if>
+            <if test="createTime != null ">create_time,</if>
+            <if test="modifiedTime != null ">modified_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="guid != null  and guid != ''">#{guid},</if>
+            <if test="applyCustomerId != null  and applyCustomerId != ''">#{applyCustomerId},</if>
+            <if test="applyCustomName != null  and applyCustomName != ''">#{applyCustomName},</if>
+            <if test="amount != null ">#{amount},</if>
+            <if test="remark != null  and remark != ''">#{remark},</if>
+            <if test="applyStatus != null ">#{applyStatus},</if>
+            <if test="recordStatus != null ">#{recordStatus},</if>
+            <if test="applyDate != null  and applyDate != ''">#{applyDate},</if>
+            <if test="createTime != null ">#{createTime},</if>
+            <if test="modifiedTime != null ">#{modifiedTime},</if>
+         </trim>
+    </insert>
+
+    <!--更新申请状态即认购完成-->
+    <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>

common-core/src/main/java/com/hcloud/microserver/commoncore/base/BaseController.java

@@ -1,8 +1,16 @@
 package com.hcloud.microserver.commoncore.base;
 
+import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.commoncore.constant.HttpStatus;
 import com.hcloud.microserver.commoncore.enums.ResultEnum;
+import com.hcloud.microserver.commoncore.sql.SqlUtil;
 import com.hcloud.microserver.commoncore.util.BeanCopyUtil;
+import com.hcloud.microserver.commoncore.util.string.StringUtils;
+import com.hcloud.microserver.commoncore.web.domain.AjaxResult;
+import com.hcloud.microserver.commoncore.web.page.PageDomain;
+import com.hcloud.microserver.commoncore.web.page.TableDataInfo;
+import com.hcloud.microserver.commoncore.web.page.TableSupport;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -10,6 +18,8 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -310,4 +320,55 @@ public class BaseController {
                 .getRequestAttributes();
         return requestAttributes.getRequest();
     }
+
+    /**
+     * 设置请求分页数据
+     */
+    protected void startPage()
+    {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum() == null ? 1: pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize() == null ? 10 : pageDomain.getPageSize();
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize))
+        {
+            String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
+            PageHelper.startPage(pageNum, pageSize, orderBy);
+        }
+    }
+
+    /**
+     * 响应请求分页数据
+     */
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    protected TableDataInfo getDataTable(List<?> list)
+    {
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(HttpStatus.SUCCESS);
+        rspData.setRows(list);
+        rspData.setTotal(new PageInfo(list).getTotal());
+        return rspData;
+    }
+
+
+    protected TableDataInfo getDataTableByMap(List<Map<String, Object>> list)
+    {
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(HttpStatus.SUCCESS);
+        rspData.setRows(list);
+        rspData.setTotal(new PageInfo(list).getTotal());
+        return rspData;
+    }
+
+    /**
+     * 响应返回结果
+     *
+     * @param rows 影响行数
+     * @return 操作结果
+     */
+    protected AjaxResult toAjax(int rows)
+    {
+        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
+    }
+
+
 }

sql/表结构变化语句/更新sql.sql

@@ -3,4 +3,35 @@
 ALTER TABLE `t_goods_info` MODIFY COLUMN  `is_sale` int(11) DEFAULT NULL COMMENT '0 下线 1 上线',
 
 #修改订单表 state 字段备注
-ALTER TABLE `t_goods_order_info` MODIFY COLUMN `state` int(11) DEFAULT NULL COMMENT '记录状态 0无效 1有效';
+ALTER TABLE `t_goods_order_info` MODIFY COLUMN `state` int(11) DEFAULT NULL COMMENT '记录状态 0无效 1有效';
+
+#新增企业类型表 lym
+CREATE TABLE `t_customer_company_type` (
+  `guid` char(32) CHARACTER SET utf8mb4 NOT NULL,
+  `parent_id` char(32) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '父类id',
+  `type_name` varchar(50) DEFAULT NULL COMMENT '类型名称',
+  `type_val` varchar(10) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '类型值',
+  `state` int(11) DEFAULT NULL COMMENT '记录状态',
+  `modified_time` datetime DEFAULT NULL COMMENT '修改时间',
+  `methodology` varchar(50) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '方法学名称',
+  `type_desc` varchar(200) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '类别说明',
+  PRIMARY KEY (`guid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='企业类型表';
+
+#新增产品类别定价表 lym
+CREATE TABLE `t_product_type_price` (
+  `guid` char(32) CHARACTER SET utf8mb4 NOT NULL,
+  `price` decimal(10,2) NOT NULL COMMENT '价格',
+  `fk_product_type` text NOT NULL COMMENT '类别id(t_product_type  -> guid)',
+  `type_name` text NOT NULL COMMENT '类别',
+  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+  `check_state` int(11) DEFAULT '0' COMMENT '审核状态 0：待审核  1：审核通过  2：审核未通过',
+  `check_time` datetime DEFAULT NULL COMMENT '审核通过时间',
+  `check_remark` varchar(255) DEFAULT NULL COMMENT '审核备注',
+  `state` int(11) DEFAULT NULL COMMENT '记录状态  0：删除  1：未删除',
+  `create_user` char(32) CHARACTER SET utf8mb4 NOT NULL COMMENT '创建人',
+  `create_time` datetime NOT NULL COMMENT '创建时间',
+  `modified_user` char(32) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '修改人',
+  `modified_time` datetime DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`guid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='产品类别定价表';