anderx 4 anni fa
parent
commit
c9a6340300

+ 7 - 0
src/main/java/com/kede/common/bo/OutOrder.java

@@ -5,6 +5,7 @@ import java.math.BigDecimal;
 public class OutOrder{
 public class OutOrder{
 	private String orderNo;
 	private String orderNo;
 	private String uid;
 	private String uid;
+	private String userNo;
 	private String userName;
 	private String userName;
 	private String mobile;
 	private String mobile;
 	private BigDecimal projectAmount;
 	private BigDecimal projectAmount;
@@ -81,6 +82,12 @@ public class OutOrder{
 	public void setProjectTypeName(String projectTypeName) {
 	public void setProjectTypeName(String projectTypeName) {
 		this.projectTypeName = projectTypeName;
 		this.projectTypeName = projectTypeName;
 	}
 	}
+	public String getUserNo() {
+		return userNo;
+	}
+	public void setUserNo(String userNo) {
+		this.userNo = userNo;
+	}
 
 
 	
 	
 	
 	

+ 0 - 12
src/main/java/com/kede/common/controller/PublicApiController.java

@@ -3,31 +3,21 @@ package com.kede.common.controller;
 
 
 
 
 
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.Map;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 
 
-import org.apache.commons.collections4.map.HashedMap;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
-import com.alibaba.fastjson.JSON;
 import com.kede.activity.bo.InputActivity;
 import com.kede.activity.bo.InputActivity;
 import com.kede.activity.service.ActivityService;
 import com.kede.activity.service.ActivityService;
 import com.kede.banners.service.BannersService;
 import com.kede.banners.service.BannersService;
-import com.kede.common.bo.CallBackBo;
 import com.kede.common.bo.Result;
 import com.kede.common.bo.Result;
-import com.kede.common.constant.AFTConstants;
 import com.kede.common.constant.ErrorConstants;
 import com.kede.common.constant.ErrorConstants;
-import com.kede.common.error.BusinessException;
 import com.kede.common.model.VisitingCustomers;
 import com.kede.common.model.VisitingCustomers;
-import com.kede.common.utils.DateUtils;
 import com.kede.common.utils.LoggerUtils;
 import com.kede.common.utils.LoggerUtils;
 import com.kede.common.utils.StringUtils;
 import com.kede.common.utils.StringUtils;
 import com.kede.customerCase.bo.InputCustomerCase;
 import com.kede.customerCase.bo.InputCustomerCase;
@@ -41,8 +31,6 @@ import com.kede.project.service.ProjectTypeService;
 import com.kede.recruitment.bo.InputRecruitment;
 import com.kede.recruitment.bo.InputRecruitment;
 import com.kede.recruitment.service.RecruitmentService;
 import com.kede.recruitment.service.RecruitmentService;
 import com.kede.visitingCustomers.service.VisitingCustomersService;
 import com.kede.visitingCustomers.service.VisitingCustomersService;
-import com.kede.wxsdk.WXPayConstants;
-import com.kede.wxsdk.WXPayUtil;
 import com.kede.wxsdk.service.WxService;
 import com.kede.wxsdk.service.WxService;
 
 
 
 

+ 1 - 1
src/main/java/com/kede/common/dao/OrderMapper.java

@@ -44,5 +44,5 @@ public interface OrderMapper {
 
 
 	int chekeBuy(@Param("uid")String uid, @Param("pid")Integer pid, @Param("type")Integer type);
 	int chekeBuy(@Param("uid")String uid, @Param("pid")Integer pid, @Param("type")Integer type);
 
 
-	void updateByOrderNo(@Param("orderNo")String orderNo, @Param("wxNo")String wxNo);
+
 }
 }

+ 7 - 7
src/main/java/com/kede/common/dao/ProjectMapper.java

@@ -7,43 +7,43 @@ public interface ProjectMapper {
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table project
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table project
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	int deleteByPrimaryKey(Integer id);
 	int deleteByPrimaryKey(Integer id);
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table project
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table project
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	int insert(Project record);
 	int insert(Project record);
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table project
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table project
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	int insertSelective(Project record);
 	int insertSelective(Project record);
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table project
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table project
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	Project selectByPrimaryKey(Integer id);
 	Project selectByPrimaryKey(Integer id);
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table project
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table project
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	int updateByPrimaryKeySelective(Project record);
 	int updateByPrimaryKeySelective(Project record);
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table project
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table project
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	int updateByPrimaryKeyWithBLOBs(Project record);
 	int updateByPrimaryKeyWithBLOBs(Project record);
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table project
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table project
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	int updateByPrimaryKey(Project record);
 	int updateByPrimaryKey(Project record);
 
 

+ 12 - 10
src/main/java/com/kede/common/mapper/OrderMapper.xml

@@ -35,7 +35,7 @@
     -->
     -->
     select 
     select 
     <include refid="Base_Column_List" />
     <include refid="Base_Column_List" />
-    from order
+    from `order`
     where order_no = #{orderNo,jdbcType=VARCHAR}
     where order_no = #{orderNo,jdbcType=VARCHAR}
   </select>
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -140,7 +140,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Apr 13 14:51:40 CST 2021.
       This element was generated on Tue Apr 13 14:51:40 CST 2021.
     -->
     -->
-    update order
+    update `order`
     <set>
     <set>
       <if test="projectId != null">
       <if test="projectId != null">
         project_id = #{projectId,jdbcType=INTEGER},
         project_id = #{projectId,jdbcType=INTEGER},
@@ -178,7 +178,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Apr 13 14:51:40 CST 2021.
       This element was generated on Tue Apr 13 14:51:40 CST 2021.
     -->
     -->
-    update order
+    update `order`
     set project_id = #{projectId,jdbcType=INTEGER},
     set project_id = #{projectId,jdbcType=INTEGER},
       `uid` = #{uid,jdbcType=VARCHAR},
       `uid` = #{uid,jdbcType=VARCHAR},
       project_name = #{projectName,jdbcType=VARCHAR},
       project_name = #{projectName,jdbcType=VARCHAR},
@@ -193,7 +193,7 @@
   <select id="selectOrderList" resultType="com.kede.common.bo.OutOrder">
   <select id="selectOrderList" resultType="com.kede.common.bo.OutOrder">
 	select a.order_no orderNo,a.uid,b.nickname userName ,b.mobile,a.project_amount projectAmount,a.status,a.pay_status payStatus,
 	select a.order_no orderNo,a.uid,b.nickname userName ,b.mobile,a.project_amount projectAmount,a.status,a.pay_status payStatus,
 	date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimes,a.project_name projectName,d.name projectTypeName,
 	date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimes,a.project_name projectName,d.name projectTypeName,
-	a.project_id projectId 
+	a.project_id projectId ,b.user_no  userNo
 	from `order` a left join user b on a.uid=b.id left join project c on a.project_id =c.id 
 	from `order` a left join user b on a.uid=b.id left join project c on a.project_id =c.id 
 	left join project_type d on c.`type` =d.id 
 	left join project_type d on c.`type` =d.id 
 	where 1=1
 	where 1=1
@@ -220,8 +220,11 @@
 	<if test="name != null">
 	<if test="name != null">
 	and b.nickname like concat('%',#{name},'%')
 	and b.nickname like concat('%',#{name},'%')
 	</if>
 	</if>
-	<if test="status != null">
-	and a.status= #{status}
+	<if test="payStatus != null">
+	and a.pay_status= #{payStatus}
+	</if>
+	<if test="uid != null">
+	and a.uid= #{uid}
 	</if>
 	</if>
 	<if test="startTime !=null and endTime != null">
 	<if test="startTime !=null and endTime != null">
 	and a.create_time between #{startTime} and #{endTime}
 	and a.create_time between #{startTime} and #{endTime}
@@ -233,8 +236,7 @@
 	where uid= #{uid} and project_id = #{pid} and pay_status= #{type}
 	where uid= #{uid} and project_id = #{pid} and pay_status= #{type}
   </select>
   </select>
   
   
-  <update id="updateByOrderNo">
-  update `order`  set wx_order_no = #{orderNo} ,pay_status =1
-	where order_no = #{wxNo}
-  </update>
+
+
+  
 </mapper>
 </mapper>

+ 32 - 20
src/main/java/com/kede/common/mapper/ProjectMapper.xml

@@ -5,7 +5,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 14 15:30:17 CST 2021.
+      This element was generated on Thu Apr 15 10:11:06 CST 2021.
     -->
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="name" jdbcType="VARCHAR" property="name" />
@@ -20,12 +20,13 @@
     <result column="type" jdbcType="INTEGER" property="type" />
     <result column="type" jdbcType="INTEGER" property="type" />
     <result column="commodity_url" jdbcType="VARCHAR" property="commodityUrl" />
     <result column="commodity_url" jdbcType="VARCHAR" property="commodityUrl" />
     <result column="commodity_type" jdbcType="INTEGER" property="commodityType" />
     <result column="commodity_type" jdbcType="INTEGER" property="commodityType" />
+    <result column="summary" jdbcType="VARCHAR" property="summary" />
   </resultMap>
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.kede.common.model.Project">
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.kede.common.model.Project">
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 14 15:30:17 CST 2021.
+      This element was generated on Thu Apr 15 10:11:06 CST 2021.
     -->
     -->
     <result column="content" jdbcType="LONGVARCHAR" property="content" />
     <result column="content" jdbcType="LONGVARCHAR" property="content" />
     <result column="commodity_content" jdbcType="LONGVARCHAR" property="commodityContent" />
     <result column="commodity_content" jdbcType="LONGVARCHAR" property="commodityContent" />
@@ -34,16 +35,16 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 14 15:30:17 CST 2021.
+      This element was generated on Thu Apr 15 10:11:06 CST 2021.
     -->
     -->
     id, `name`, amount, thumbnail_url, `status`, sort, release_status, create_time, release_time, 
     id, `name`, amount, thumbnail_url, `status`, sort, release_status, create_time, release_time, 
-    `host`, `type`, commodity_url, commodity_type
+    `host`, `type`, commodity_url, commodity_type, summary
   </sql>
   </sql>
   <sql id="Blob_Column_List">
   <sql id="Blob_Column_List">
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 14 15:30:17 CST 2021.
+      This element was generated on Thu Apr 15 10:11:06 CST 2021.
     -->
     -->
     content, commodity_content
     content, commodity_content
   </sql>
   </sql>
@@ -51,7 +52,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 14 15:30:17 CST 2021.
+      This element was generated on Thu Apr 15 10:11:06 CST 2021.
     -->
     -->
     select 
     select 
     <include refid="Base_Column_List" />
     <include refid="Base_Column_List" />
@@ -64,7 +65,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 14 15:30:17 CST 2021.
+      This element was generated on Thu Apr 15 10:11:06 CST 2021.
     -->
     -->
     delete from project
     delete from project
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
@@ -73,26 +74,26 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 14 15:30:17 CST 2021.
+      This element was generated on Thu Apr 15 10:11:06 CST 2021.
     -->
     -->
     insert into project (id, `name`, amount, 
     insert into project (id, `name`, amount, 
       thumbnail_url, `status`, sort, 
       thumbnail_url, `status`, sort, 
       release_status, create_time, release_time, 
       release_status, create_time, release_time, 
       `host`, `type`, commodity_url, 
       `host`, `type`, commodity_url, 
-      commodity_type, content, commodity_content
-      )
+      commodity_type, summary, content, 
+      commodity_content)
     values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{amount,jdbcType=DECIMAL}, 
     values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{amount,jdbcType=DECIMAL}, 
       #{thumbnailUrl,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{sort,jdbcType=INTEGER}, 
       #{thumbnailUrl,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{sort,jdbcType=INTEGER}, 
       #{releaseStatus,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{releaseTime,jdbcType=TIMESTAMP}, 
       #{releaseStatus,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{releaseTime,jdbcType=TIMESTAMP}, 
       #{host,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{commodityUrl,jdbcType=VARCHAR}, 
       #{host,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{commodityUrl,jdbcType=VARCHAR}, 
-      #{commodityType,jdbcType=INTEGER}, #{content,jdbcType=LONGVARCHAR}, #{commodityContent,jdbcType=LONGVARCHAR}
-      )
+      #{commodityType,jdbcType=INTEGER}, #{summary,jdbcType=VARCHAR}, #{content,jdbcType=LONGVARCHAR}, 
+      #{commodityContent,jdbcType=LONGVARCHAR})
   </insert>
   </insert>
   <insert id="insertSelective" parameterType="com.kede.common.model.Project">
   <insert id="insertSelective" parameterType="com.kede.common.model.Project">
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 14 15:30:17 CST 2021.
+      This element was generated on Thu Apr 15 10:11:06 CST 2021.
     -->
     -->
     insert into project
     insert into project
     <trim prefix="(" suffix=")" suffixOverrides=",">
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -135,6 +136,9 @@
       <if test="commodityType != null">
       <if test="commodityType != null">
         commodity_type,
         commodity_type,
       </if>
       </if>
+      <if test="summary != null">
+        summary,
+      </if>
       <if test="content != null">
       <if test="content != null">
         content,
         content,
       </if>
       </if>
@@ -182,6 +186,9 @@
       <if test="commodityType != null">
       <if test="commodityType != null">
         #{commodityType,jdbcType=INTEGER},
         #{commodityType,jdbcType=INTEGER},
       </if>
       </if>
+      <if test="summary != null">
+        #{summary,jdbcType=VARCHAR},
+      </if>
       <if test="content != null">
       <if test="content != null">
         #{content,jdbcType=LONGVARCHAR},
         #{content,jdbcType=LONGVARCHAR},
       </if>
       </if>
@@ -194,7 +201,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 14 15:30:17 CST 2021.
+      This element was generated on Thu Apr 15 10:11:06 CST 2021.
     -->
     -->
     update project
     update project
     <set>
     <set>
@@ -234,6 +241,9 @@
       <if test="commodityType != null">
       <if test="commodityType != null">
         commodity_type = #{commodityType,jdbcType=INTEGER},
         commodity_type = #{commodityType,jdbcType=INTEGER},
       </if>
       </if>
+      <if test="summary != null">
+        summary = #{summary,jdbcType=VARCHAR},
+      </if>
       <if test="content != null">
       <if test="content != null">
         content = #{content,jdbcType=LONGVARCHAR},
         content = #{content,jdbcType=LONGVARCHAR},
       </if>
       </if>
@@ -247,7 +257,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 14 15:30:17 CST 2021.
+      This element was generated on Thu Apr 15 10:11:06 CST 2021.
     -->
     -->
     update project
     update project
     set `name` = #{name,jdbcType=VARCHAR},
     set `name` = #{name,jdbcType=VARCHAR},
@@ -262,6 +272,7 @@
       `type` = #{type,jdbcType=INTEGER},
       `type` = #{type,jdbcType=INTEGER},
       commodity_url = #{commodityUrl,jdbcType=VARCHAR},
       commodity_url = #{commodityUrl,jdbcType=VARCHAR},
       commodity_type = #{commodityType,jdbcType=INTEGER},
       commodity_type = #{commodityType,jdbcType=INTEGER},
+      summary = #{summary,jdbcType=VARCHAR},
       content = #{content,jdbcType=LONGVARCHAR},
       content = #{content,jdbcType=LONGVARCHAR},
       commodity_content = #{commodityContent,jdbcType=LONGVARCHAR}
       commodity_content = #{commodityContent,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
@@ -270,7 +281,7 @@
     <!--
     <!--
       WARNING - @mbg.generated
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 14 15:30:17 CST 2021.
+      This element was generated on Thu Apr 15 10:11:06 CST 2021.
     -->
     -->
     update project
     update project
     set `name` = #{name,jdbcType=VARCHAR},
     set `name` = #{name,jdbcType=VARCHAR},
@@ -284,14 +295,15 @@
       `host` = #{host,jdbcType=INTEGER},
       `host` = #{host,jdbcType=INTEGER},
       `type` = #{type,jdbcType=INTEGER},
       `type` = #{type,jdbcType=INTEGER},
       commodity_url = #{commodityUrl,jdbcType=VARCHAR},
       commodity_url = #{commodityUrl,jdbcType=VARCHAR},
-      commodity_type = #{commodityType,jdbcType=INTEGER}
+      commodity_type = #{commodityType,jdbcType=INTEGER},
+      summary = #{summary,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   </update>
   <select id="selectProjectList" resultType="com.kede.common.model.projectBo">
   <select id="selectProjectList" resultType="com.kede.common.model.projectBo">
-    select a.id,a.name,a.amount,a.thumbnail_url thumbnailUrl,a.status,a.sort,a.content,a.release_status releaseStatus,
+  select a.id,a.name,a.amount,a.thumbnail_url thumbnailUrl,a.status,a.sort,a.content,a.release_status releaseStatus,
 	  a.host,a.commodity_url commodityUrl ,b.name typeName,a.`type` , a.commodity_type commodityType, 
 	  a.host,a.commodity_url commodityUrl ,b.name typeName,a.`type` , a.commodity_type commodityType, 
 	  a.commodity_content commodityContent, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimes,
 	  a.commodity_content commodityContent, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimes,
-	   date_format(a.release_time,'%Y-%m-%d %H:%i:%S')releaseTimes 
+	   date_format(a.release_time,'%Y-%m-%d %H:%i:%S')releaseTimes ,a.summary 
 	from project a  left join project_type b on a.`type` =b.id where 1=1
 	from project a  left join project_type b on a.`type` =b.id where 1=1
 	<if test="name != null">
 	<if test="name != null">
 	and a.name like concat('%',#{name},'%')
 	and a.name like concat('%',#{name},'%')
@@ -329,7 +341,7 @@
     <select id="getProject" parameterType="java.lang.Integer" resultType="com.kede.common.model.projectBo">
     <select id="getProject" parameterType="java.lang.Integer" resultType="com.kede.common.model.projectBo">
     select a.id,a.name,a.amount,a.thumbnail_url thumbnailUrl,a.status,a.sort,a.content,a.release_status releaseStatus,
     select a.id,a.name,a.amount,a.thumbnail_url thumbnailUrl,a.status,a.sort,a.content,a.release_status releaseStatus,
 	  a.host,a.commodity_url commodityUrl ,b.name typeName,a.`type` ,a.commodity_content commodityContent,a.commodity_type commodityType,
 	  a.host,a.commodity_url commodityUrl ,b.name typeName,a.`type` ,a.commodity_content commodityContent,a.commodity_type commodityType,
-	date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimes, date_format(a.release_time,'%Y-%m-%d %H:%i:%S')releaseTimes 
+	date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimes, date_format(a.release_time,'%Y-%m-%d %H:%i:%S')releaseTimes,a.summary  
 	from project a  left join project_type b on a.`type` =b.id where 1=1
 	from project a  left join project_type b on a.`type` =b.id where 1=1
     and a.id = #{id,jdbcType=INTEGER}
     and a.id = #{id,jdbcType=INTEGER}
   </select>
   </select>

+ 71 - 47
src/main/java/com/kede/common/model/Project.java

@@ -8,89 +8,94 @@ public class Project implements Serializable {
 
 
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.id
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.id
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	private Integer id;
 	private Integer id;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.name
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.name
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	private String name;
 	private String name;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.amount
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.amount
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	private BigDecimal amount;
 	private BigDecimal amount;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.thumbnail_url
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.thumbnail_url
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	private String thumbnailUrl;
 	private String thumbnailUrl;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.status
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.status
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	private Integer status;
 	private Integer status;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.sort
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.sort
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	private Integer sort;
 	private Integer sort;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.release_status
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.release_status
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	private Integer releaseStatus;
 	private Integer releaseStatus;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.create_time
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.create_time
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	private Date createTime;
 	private Date createTime;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.release_time
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.release_time
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	private Date releaseTime;
 	private Date releaseTime;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.host
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.host
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	private Integer host;
 	private Integer host;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.type
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.type
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	private Integer type;
 	private Integer type;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.commodity_url
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.commodity_url
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	private String commodityUrl;
 	private String commodityUrl;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.commodity_type
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.commodity_type
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	private Integer commodityType;
 	private Integer commodityType;
 	/**
 	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.summary
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
+	 */
+	private String summary;
+	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.content
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.content
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	private String content;
 	private String content;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.commodity_content
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column project.commodity_content
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	private String commodityContent;
 	private String commodityContent;
 	/**
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table project
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table project
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	private static final long serialVersionUID = 1L;
 	private static final long serialVersionUID = 1L;
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.id
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.id
 	 * @return  the value of project.id
 	 * @return  the value of project.id
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public Integer getId() {
 	public Integer getId() {
 		return id;
 		return id;
@@ -99,7 +104,7 @@ public class Project implements Serializable {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.id
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.id
 	 * @param id  the value for project.id
 	 * @param id  the value for project.id
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public void setId(Integer id) {
 	public void setId(Integer id) {
 		this.id = id;
 		this.id = id;
@@ -108,7 +113,7 @@ public class Project implements Serializable {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.name
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.name
 	 * @return  the value of project.name
 	 * @return  the value of project.name
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public String getName() {
 	public String getName() {
 		return name;
 		return name;
@@ -117,7 +122,7 @@ public class Project implements Serializable {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.name
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.name
 	 * @param name  the value for project.name
 	 * @param name  the value for project.name
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public void setName(String name) {
 	public void setName(String name) {
 		this.name = name == null ? null : name.trim();
 		this.name = name == null ? null : name.trim();
@@ -126,7 +131,7 @@ public class Project implements Serializable {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.amount
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.amount
 	 * @return  the value of project.amount
 	 * @return  the value of project.amount
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public BigDecimal getAmount() {
 	public BigDecimal getAmount() {
 		return amount;
 		return amount;
@@ -135,7 +140,7 @@ public class Project implements Serializable {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.amount
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.amount
 	 * @param amount  the value for project.amount
 	 * @param amount  the value for project.amount
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public void setAmount(BigDecimal amount) {
 	public void setAmount(BigDecimal amount) {
 		this.amount = amount;
 		this.amount = amount;
@@ -144,7 +149,7 @@ public class Project implements Serializable {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.thumbnail_url
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.thumbnail_url
 	 * @return  the value of project.thumbnail_url
 	 * @return  the value of project.thumbnail_url
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public String getThumbnailUrl() {
 	public String getThumbnailUrl() {
 		return thumbnailUrl;
 		return thumbnailUrl;
@@ -153,7 +158,7 @@ public class Project implements Serializable {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.thumbnail_url
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.thumbnail_url
 	 * @param thumbnailUrl  the value for project.thumbnail_url
 	 * @param thumbnailUrl  the value for project.thumbnail_url
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public void setThumbnailUrl(String thumbnailUrl) {
 	public void setThumbnailUrl(String thumbnailUrl) {
 		this.thumbnailUrl = thumbnailUrl == null ? null : thumbnailUrl.trim();
 		this.thumbnailUrl = thumbnailUrl == null ? null : thumbnailUrl.trim();
@@ -162,7 +167,7 @@ public class Project implements Serializable {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.status
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.status
 	 * @return  the value of project.status
 	 * @return  the value of project.status
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public Integer getStatus() {
 	public Integer getStatus() {
 		return status;
 		return status;
@@ -171,7 +176,7 @@ public class Project implements Serializable {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.status
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.status
 	 * @param status  the value for project.status
 	 * @param status  the value for project.status
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public void setStatus(Integer status) {
 	public void setStatus(Integer status) {
 		this.status = status;
 		this.status = status;
@@ -180,7 +185,7 @@ public class Project implements Serializable {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.sort
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.sort
 	 * @return  the value of project.sort
 	 * @return  the value of project.sort
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public Integer getSort() {
 	public Integer getSort() {
 		return sort;
 		return sort;
@@ -189,7 +194,7 @@ public class Project implements Serializable {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.sort
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.sort
 	 * @param sort  the value for project.sort
 	 * @param sort  the value for project.sort
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public void setSort(Integer sort) {
 	public void setSort(Integer sort) {
 		this.sort = sort;
 		this.sort = sort;
@@ -198,7 +203,7 @@ public class Project implements Serializable {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.release_status
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.release_status
 	 * @return  the value of project.release_status
 	 * @return  the value of project.release_status
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public Integer getReleaseStatus() {
 	public Integer getReleaseStatus() {
 		return releaseStatus;
 		return releaseStatus;
@@ -207,7 +212,7 @@ public class Project implements Serializable {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.release_status
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.release_status
 	 * @param releaseStatus  the value for project.release_status
 	 * @param releaseStatus  the value for project.release_status
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public void setReleaseStatus(Integer releaseStatus) {
 	public void setReleaseStatus(Integer releaseStatus) {
 		this.releaseStatus = releaseStatus;
 		this.releaseStatus = releaseStatus;
@@ -216,7 +221,7 @@ public class Project implements Serializable {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.create_time
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.create_time
 	 * @return  the value of project.create_time
 	 * @return  the value of project.create_time
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public Date getCreateTime() {
 	public Date getCreateTime() {
 		return createTime;
 		return createTime;
@@ -225,7 +230,7 @@ public class Project implements Serializable {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.create_time
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.create_time
 	 * @param createTime  the value for project.create_time
 	 * @param createTime  the value for project.create_time
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public void setCreateTime(Date createTime) {
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 		this.createTime = createTime;
@@ -234,7 +239,7 @@ public class Project implements Serializable {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.release_time
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.release_time
 	 * @return  the value of project.release_time
 	 * @return  the value of project.release_time
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public Date getReleaseTime() {
 	public Date getReleaseTime() {
 		return releaseTime;
 		return releaseTime;
@@ -243,7 +248,7 @@ public class Project implements Serializable {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.release_time
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.release_time
 	 * @param releaseTime  the value for project.release_time
 	 * @param releaseTime  the value for project.release_time
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public void setReleaseTime(Date releaseTime) {
 	public void setReleaseTime(Date releaseTime) {
 		this.releaseTime = releaseTime;
 		this.releaseTime = releaseTime;
@@ -252,7 +257,7 @@ public class Project implements Serializable {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.host
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.host
 	 * @return  the value of project.host
 	 * @return  the value of project.host
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public Integer getHost() {
 	public Integer getHost() {
 		return host;
 		return host;
@@ -261,7 +266,7 @@ public class Project implements Serializable {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.host
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.host
 	 * @param host  the value for project.host
 	 * @param host  the value for project.host
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public void setHost(Integer host) {
 	public void setHost(Integer host) {
 		this.host = host;
 		this.host = host;
@@ -270,7 +275,7 @@ public class Project implements Serializable {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.type
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.type
 	 * @return  the value of project.type
 	 * @return  the value of project.type
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public Integer getType() {
 	public Integer getType() {
 		return type;
 		return type;
@@ -279,7 +284,7 @@ public class Project implements Serializable {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.type
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.type
 	 * @param type  the value for project.type
 	 * @param type  the value for project.type
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public void setType(Integer type) {
 	public void setType(Integer type) {
 		this.type = type;
 		this.type = type;
@@ -288,7 +293,7 @@ public class Project implements Serializable {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.commodity_url
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.commodity_url
 	 * @return  the value of project.commodity_url
 	 * @return  the value of project.commodity_url
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public String getCommodityUrl() {
 	public String getCommodityUrl() {
 		return commodityUrl;
 		return commodityUrl;
@@ -297,7 +302,7 @@ public class Project implements Serializable {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.commodity_url
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.commodity_url
 	 * @param commodityUrl  the value for project.commodity_url
 	 * @param commodityUrl  the value for project.commodity_url
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public void setCommodityUrl(String commodityUrl) {
 	public void setCommodityUrl(String commodityUrl) {
 		this.commodityUrl = commodityUrl == null ? null : commodityUrl.trim();
 		this.commodityUrl = commodityUrl == null ? null : commodityUrl.trim();
@@ -306,7 +311,7 @@ public class Project implements Serializable {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.commodity_type
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.commodity_type
 	 * @return  the value of project.commodity_type
 	 * @return  the value of project.commodity_type
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public Integer getCommodityType() {
 	public Integer getCommodityType() {
 		return commodityType;
 		return commodityType;
@@ -315,16 +320,34 @@ public class Project implements Serializable {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.commodity_type
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.commodity_type
 	 * @param commodityType  the value for project.commodity_type
 	 * @param commodityType  the value for project.commodity_type
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public void setCommodityType(Integer commodityType) {
 	public void setCommodityType(Integer commodityType) {
 		this.commodityType = commodityType;
 		this.commodityType = commodityType;
 	}
 	}
 
 
 	/**
 	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.summary
+	 * @return  the value of project.summary
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
+	 */
+	public String getSummary() {
+		return summary;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.summary
+	 * @param summary  the value for project.summary
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
+	 */
+	public void setSummary(String summary) {
+		this.summary = summary == null ? null : summary.trim();
+	}
+
+	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.content
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.content
 	 * @return  the value of project.content
 	 * @return  the value of project.content
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public String getContent() {
 	public String getContent() {
 		return content;
 		return content;
@@ -333,7 +356,7 @@ public class Project implements Serializable {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.content
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.content
 	 * @param content  the value for project.content
 	 * @param content  the value for project.content
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public void setContent(String content) {
 	public void setContent(String content) {
 		this.content = content == null ? null : content.trim();
 		this.content = content == null ? null : content.trim();
@@ -342,7 +365,7 @@ public class Project implements Serializable {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.commodity_content
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column project.commodity_content
 	 * @return  the value of project.commodity_content
 	 * @return  the value of project.commodity_content
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public String getCommodityContent() {
 	public String getCommodityContent() {
 		return commodityContent;
 		return commodityContent;
@@ -351,7 +374,7 @@ public class Project implements Serializable {
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.commodity_content
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column project.commodity_content
 	 * @param commodityContent  the value for project.commodity_content
 	 * @param commodityContent  the value for project.commodity_content
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	public void setCommodityContent(String commodityContent) {
 	public void setCommodityContent(String commodityContent) {
 		this.commodityContent = commodityContent == null ? null : commodityContent.trim();
 		this.commodityContent = commodityContent == null ? null : commodityContent.trim();
@@ -359,7 +382,7 @@ public class Project implements Serializable {
 
 
 	/**
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table project
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table project
-	 * @mbg.generated  Wed Apr 14 15:30:17 CST 2021
+	 * @mbg.generated  Thu Apr 15 10:11:06 CST 2021
 	 */
 	 */
 	@Override
 	@Override
 	public String toString() {
 	public String toString() {
@@ -380,6 +403,7 @@ public class Project implements Serializable {
 		sb.append(", type=").append(type);
 		sb.append(", type=").append(type);
 		sb.append(", commodityUrl=").append(commodityUrl);
 		sb.append(", commodityUrl=").append(commodityUrl);
 		sb.append(", commodityType=").append(commodityType);
 		sb.append(", commodityType=").append(commodityType);
+		sb.append(", summary=").append(summary);
 		sb.append(", content=").append(content);
 		sb.append(", content=").append(content);
 		sb.append(", commodityContent=").append(commodityContent);
 		sb.append(", commodityContent=").append(commodityContent);
 		sb.append(", serialVersionUID=").append(serialVersionUID);
 		sb.append(", serialVersionUID=").append(serialVersionUID);

+ 2 - 0
src/main/java/com/kede/order/service/impl/OrderService.java

@@ -8,6 +8,8 @@ public interface OrderService {
 
 
 	int insert(Order o);
 	int insert(Order o);
 
 
+	Order selectByOrderNo(String orderNo);
+
 
 
 
 
 }
 }

+ 7 - 2
src/main/java/com/kede/order/service/impl/OrderServiceImpl.java

@@ -22,10 +22,10 @@ public class OrderServiceImpl extends BaseMybatisDao<OrderMapper> implements Ord
 			Integer pageSize) {
 			Integer pageSize) {
 		Map<String, Object> params=new HashMap<String, Object>();
 		Map<String, Object> params=new HashMap<String, Object>();
 		if(StringUtils.isNotBlank(name))params.put("name", name);
 		if(StringUtils.isNotBlank(name))params.put("name", name);
-		if(payStatus!=null)params.put("status", payStatus);
+		if(payStatus!=null)params.put("payStatus", payStatus);
 		if(type!=null&& type==1)params.put("uid", TokenManager.getUserId());
 		if(type!=null&& type==1)params.put("uid", TokenManager.getUserId());
 		if(StringUtils.isNotBlank(startTime))params.put("startTime", startTime);
 		if(StringUtils.isNotBlank(startTime))params.put("startTime", startTime);
-		if(StringUtils.isNotBlank(endTime))params.put("endTime", endTime);
+		if(StringUtils.isNotBlank(endTime))params.put("endTime", endTime+" 23:59:59");
 		return findPage("selectOrderList", "selectOrderCount", params, pageNo, pageSize);
 		return findPage("selectOrderList", "selectOrderCount", params, pageNo, pageSize);
 	}
 	}
 
 
@@ -34,5 +34,10 @@ public class OrderServiceImpl extends BaseMybatisDao<OrderMapper> implements Ord
 		return orderMapper.insertSelective(o);
 		return orderMapper.insertSelective(o);
 	}
 	}
 
 
+	@Override
+	public Order selectByOrderNo(String orderNo) {
+		return orderMapper.selectByPrimaryKey(orderNo);
+	}
+
 	
 	
 }
 }

+ 3 - 3
src/main/java/com/kede/project/service/impl/ProjectServiceImpl.java

@@ -49,9 +49,9 @@ public class ProjectServiceImpl extends BaseMybatisDao<ProjectMapper> implements
 	@Override
 	@Override
 	public Object list(String name, String startTime, String endTime,Integer releaseStatus,Integer host,Integer pageNo,Integer pageSize) {
 	public Object list(String name, String startTime, String endTime,Integer releaseStatus,Integer host,Integer pageNo,Integer pageSize) {
 		Map<String, Object> params=new HashMap<String, Object>();
 		Map<String, Object> params=new HashMap<String, Object>();
-		if(StringUtils.isBlank(name))params.put("name", name);
-		if(StringUtils.isBlank(startTime))params.put("startTime", startTime);
-		if(StringUtils.isBlank(endTime))params.put("endTime", endTime);
+		if(StringUtils.isNotBlank(name))params.put("name", name);
+		if(StringUtils.isNotBlank(startTime))params.put("startTime", startTime);
+		if(StringUtils.isNotBlank(endTime))params.put("endTime", endTime+" 23:59:59");
 		if(releaseStatus!=null)params.put("releaseStatus", releaseStatus);
 		if(releaseStatus!=null)params.put("releaseStatus", releaseStatus);
 		if(host!=null)params.put("host", host);
 		if(host!=null)params.put("host", host);
 		return findPage("selectProjectList", "selectProjectCount", params, pageNo, pageSize);
 		return findPage("selectProjectList", "selectProjectCount", params, pageNo, pageSize);

+ 20 - 4
src/main/java/com/kede/user/controller/UserApiController.java

@@ -9,9 +9,12 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
 import com.kede.common.bo.Result;
 import com.kede.common.bo.Result;
+import com.kede.common.constant.AFTConstants;
 import com.kede.common.constant.ErrorConstants;
 import com.kede.common.constant.ErrorConstants;
 import com.kede.common.controller.BaseController;
 import com.kede.common.controller.BaseController;
+import com.kede.common.model.Order;
 import com.kede.common.model.Project;
 import com.kede.common.model.Project;
+import com.kede.common.utils.StringUtils;
 import com.kede.order.service.impl.OrderService;
 import com.kede.order.service.impl.OrderService;
 import com.kede.project.service.ProjectService;
 import com.kede.project.service.ProjectService;
 import com.kede.user.service.UserService;
 import com.kede.user.service.UserService;
@@ -53,18 +56,31 @@ public class UserApiController extends BaseController{
 	}
 	}
 	
 	
 	@RequestMapping(value = "/wxClose", method = RequestMethod.GET)
 	@RequestMapping(value = "/wxClose", method = RequestMethod.GET)
-	public Result wxClose(String orderNo) {
+	public Result pushWxClose(String orderNo) {
 		Result res=new Result();
 		Result res=new Result();
-		res.data(wxService.closeOrder(orderNo));
+		if (StringUtils.isBlank(orderNo)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"订单编号","订单编号"));
+			return res;
+		}
+		Order o=orderService.selectByOrderNo(orderNo);
+		if (o==null) {
+			res.getError().add(buildError("订单不存在","订单不存在"));
+			return res;
+		}
+		if(o.getPayStatus()!=0) {
+			res.getError().add(buildError("订单只在未支付状态可以撤销","订单只在未支付状态可以撤销"));
+			return res;
+		}
+		res.data(wxService.pushWxClose(o));
 		return res;
 		return res;
 	}
 	}
 	
 	
 	
 	
 	
 	
 	@RequestMapping(value = "/wxQuery", method = RequestMethod.GET)
 	@RequestMapping(value = "/wxQuery", method = RequestMethod.GET)
-	public Result wxQuery(String orderNo) {
+	public Result pushOrderQuery(String orderNo) {
 		Result res=new Result();
 		Result res=new Result();
-		res.data(wxService.orderQuery(orderNo));
+		res.data(wxService.pushOrderQuery(orderNo));
 		return res;
 		return res;
 	}
 	}
 	
 	

+ 37 - 14
src/main/java/com/kede/wxsdk/service/WxService.java

@@ -2,11 +2,9 @@ package com.kede.wxsdk.service;
 
 
 import java.io.BufferedReader;
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.net.InetAddress;
 import java.net.InetAddress;
-import java.security.GeneralSecurityException;
 import java.util.Date;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map;
@@ -22,16 +20,12 @@ import org.springframework.stereotype.Service;
 import org.w3c.dom.Node;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.w3c.dom.NodeList;
 
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.kede.common.bo.CallBackBo;
 import com.kede.common.dao.OrderMapper;
 import com.kede.common.dao.OrderMapper;
 import com.kede.common.error.BusinessException;
 import com.kede.common.error.BusinessException;
 import com.kede.common.model.Order;
 import com.kede.common.model.Order;
 import com.kede.common.model.Project;
 import com.kede.common.model.Project;
 import com.kede.common.utils.LoggerUtils;
 import com.kede.common.utils.LoggerUtils;
 import com.kede.common.utils.StringUtils;
 import com.kede.common.utils.StringUtils;
-import com.kede.common.utils.WxAPIV3AesUtil;
 import com.kede.core.mybatis.JDBCIdGenerator;
 import com.kede.core.mybatis.JDBCIdGenerator;
 import com.kede.core.shiro.token.TokenManager;
 import com.kede.core.shiro.token.TokenManager;
 import com.kede.order.service.impl.OrderService;
 import com.kede.order.service.impl.OrderService;
@@ -139,7 +133,7 @@ public class WxService {
 	 * @param orderNo
 	 * @param orderNo
 	 * @return
 	 * @return
 	 */
 	 */
-	public Map<String, String> orderQuery(String orderNo){
+	public Map<String, String> pushOrderQuery(String orderNo){
 		// 发起微信支付
 		// 发起微信支付
 				WXPay wxpay = null;
 				WXPay wxpay = null;
 				Map<String, String> map=new HashMap<>();
 				Map<String, String> map=new HashMap<>();
@@ -147,11 +141,24 @@ public class WxService {
 					IWxPayConfig iWxPayConfig=new IWxPayConfig(appId,mchId,apiKiy,certPath);
 					IWxPayConfig iWxPayConfig=new IWxPayConfig(appId,mchId,apiKiy,certPath);
 				    wxpay = new WXPay(iWxPayConfig,null, true, false); // *** 注入自己实现的微信配置类, 创建WXPay核心类, WXPay 包括统一下单接口
 				    wxpay = new WXPay(iWxPayConfig,null, true, false); // *** 注入自己实现的微信配置类, 创建WXPay核心类, WXPay 包括统一下单接口
 					Map<String, String> data = new HashMap<String, String>();
 					Map<String, String> data = new HashMap<String, String>();
-//					data.put("transaction_id", orderNo);
 					data.put("out_trade_no", orderNo);
 					data.put("out_trade_no", orderNo);
 					data.put("mchid", mchId); 
 					data.put("mchid", mchId); 
 					map = wxpay.orderQuery(data); 
 					map = wxpay.orderQuery(data); 
 					LoggerUtils.debug(getClass(),"微信查询成功, 返回值 response={%s}", map);
 					LoggerUtils.debug(getClass(),"微信查询成功, 返回值 response={%s}", map);
+					String total_fee=map.get("total_fee");
+					String transaction_id=map.get("transaction_id");
+					String out_trade_no=map.get("out_trade_no");
+					if (map.get("trade_state").equals("SUCCESS")) {
+						Order os=orderMapper.selectByPrimaryKey(out_trade_no);
+						if (os.getPayStatus()!=1) {
+							Order o=new Order();
+							o.setOrderNo(out_trade_no);
+							o.setPayStatus(1);
+							o.setPayAmount(new BigDecimal(total_fee).divide(new BigDecimal(100)));
+							o.setWxOrderNo(transaction_id);
+							orderMapper.updateByPrimaryKeySelective(o);
+						}
+					}
 				}catch (Exception e) {
 				}catch (Exception e) {
 					e.printStackTrace();
 					e.printStackTrace();
 					throw new BusinessException("查询异常");
 					throw new BusinessException("查询异常");
@@ -161,10 +168,10 @@ public class WxService {
 	
 	
 	/**
 	/**
 	 *	 微信撤销订单
 	 *	 微信撤销订单
-	 * @param orderNo
+	 * @param o.
 	 * @return
 	 * @return
 	 */
 	 */
-	public Map<String, String> closeOrder(String orderNo){
+	public Map<String, String> pushWxClose(Order o){
 		// 发起微信支付
 		// 发起微信支付
 				WXPay wxpay = null;
 				WXPay wxpay = null;
 				Map<String, String> map=new HashMap<>();
 				Map<String, String> map=new HashMap<>();
@@ -172,10 +179,16 @@ public class WxService {
 					IWxPayConfig iWxPayConfig=new IWxPayConfig(appId,mchId,apiKiy,certPath);
 					IWxPayConfig iWxPayConfig=new IWxPayConfig(appId,mchId,apiKiy,certPath);
 				    wxpay = new WXPay(iWxPayConfig,null, true, false); // *** 注入自己实现的微信配置类, 创建WXPay核心类, WXPay 包括统一下单接口
 				    wxpay = new WXPay(iWxPayConfig,null, true, false); // *** 注入自己实现的微信配置类, 创建WXPay核心类, WXPay 包括统一下单接口
 					Map<String, String> data = new HashMap<String, String>();
 					Map<String, String> data = new HashMap<String, String>();
-					data.put("out_trade_no", orderNo);
-					data.put("sp_mchid", mchId); 
+					data.put("out_trade_no", o.getOrderNo());
+					data.put("mchid", mchId); 
 					map = wxpay.closeOrder(data);
 					map = wxpay.closeOrder(data);
 					LoggerUtils.debug(getClass(),"微信撤销成功, 返回值 response={%s}", map);
 					LoggerUtils.debug(getClass(),"微信撤销成功, 返回值 response={%s}", map);
+					if (o.getPayStatus()!=1) {
+						Order on=new Order();
+						on.setOrderNo(o.getOrderNo());
+						on.setPayStatus(3);
+						orderMapper.updateByPrimaryKeySelective(on);
+					}
 				}catch (Exception e) {
 				}catch (Exception e) {
 					throw new BusinessException("撤销异常");
 					throw new BusinessException("撤销异常");
 				}
 				}
@@ -221,8 +234,18 @@ public class WxService {
 		}
 		}
 		String out_trade_no=map.get("out_trade_no");
 		String out_trade_no=map.get("out_trade_no");
 		String transaction_id=map.get("transaction_id");
 		String transaction_id=map.get("transaction_id");
-		LoggerUtils.debug(getClass(),"nofity error , {}" , sb.toString());
-		orderMapper.updateByOrderNo(out_trade_no,transaction_id);
+		String result_code=map.get("result_code");
+		String total_fee=map.get("total_fee");
+		if (result_code.equals("SUCCESS")) {
+			Order os=orderMapper.selectByPrimaryKey(out_trade_no);
+			if (os.getPayStatus()!=1) {
+				Order o=new Order();
+				o.setOrderNo(out_trade_no);
+				o.setPayAmount(new BigDecimal(total_fee));
+				o.setWxOrderNo(transaction_id);
+				orderMapper.updateByPrimaryKeySelective(o);
+			}
+		}
 		LoggerUtils.debug(getClass(),"\n\n\n\n\n>>>>>>>>>>>>>>>>>>>>>>>>微信回调结束>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n\n\n\n\n");
 		LoggerUtils.debug(getClass(),"\n\n\n\n\n>>>>>>>>>>>>>>>>>>>>>>>>微信回调结束>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n\n\n\n\n");
 		} catch ( Exception e) {
 		} catch ( Exception e) {
 			e.printStackTrace();
 			e.printStackTrace();

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -93,6 +93,6 @@ wx.appSecret=0d23307f1342e90781c0208b16954060
 wx.mchId=1608092419
 wx.mchId=1608092419
 wx.apiKiy=2Pd6okHJYfLg7avkeHwVNsVqxphgcYcn
 wx.apiKiy=2Pd6okHJYfLg7avkeHwVNsVqxphgcYcn
 wx.apiv3=wJwYEP494Cdek0P83tk08IxbvlhsqBdl
 wx.apiv3=wJwYEP494Cdek0P83tk08IxbvlhsqBdl
-wx.notifyUrl=https://www.kedexinxi.com/open/payCallback
+wx.notifyUrl=https://www.kedexinxi.com/open/payCallBack
 wx.certPath=F:/project/ztest/src/main/resources/apiclient_cert.p12
 wx.certPath=F:/project/ztest/src/main/resources/apiclient_cert.p12
 
 

+ 1 - 1
src/main/resources/props/config_prod.properties

@@ -98,5 +98,5 @@ wx.appSecret=0d23307f1342e90781c0208b16954060
 wx.mchId=1608092419
 wx.mchId=1608092419
 wx.apiKiy=2Pd6okHJYfLg7avkeHwVNsVqxphgcYcn
 wx.apiKiy=2Pd6okHJYfLg7avkeHwVNsVqxphgcYcn
 wx.apiv3=wJwYEP494Cdek0P83tk08IxbvlhsqBdl
 wx.apiv3=wJwYEP494Cdek0P83tk08IxbvlhsqBdl
-wx.notifyUrl=https://www.kedexinxi.com/open/payCallback
+wx.notifyUrl=https://www.kedexinxi.com/open/payCallBack
 wx.certPath=/data/apiclient_cert.p12
 wx.certPath=/data/apiclient_cert.p12

+ 0 - 9
src/main/resources/props/error.properties

@@ -58,17 +58,8 @@ RECORD_REJECT=\u5F53\u524D\u7533\u8BF7\u672A\u901A\u8FC7\uFF0C\u65E0\u6CD5\u4FEE
 
 
 CONTRACT_PATENT_CREATED=\u5F53\u524D\u5408\u540C\u4E13\u5229\u7533\u8BF7\u5DF2\u521B\u5EFA,\u65E0\u6CD5\u91CD\u590D\u521B\u5EFA\uFF01
 CONTRACT_PATENT_CREATED=\u5F53\u524D\u5408\u540C\u4E13\u5229\u7533\u8BF7\u5DF2\u521B\u5EFA,\u65E0\u6CD5\u91CD\u590D\u521B\u5EFA\uFF01
 
 
-CONTRACT_COPYRIGHT_CREATED=\u5F53\u524D\u5408\u540C\u8F6F\u8457\u7533\u8BF7\u5DF2\u521B\u5EFA,\u65E0\u6CD5\u91CD\u590D\u521B\u5EFA\uFF01
 
 
-CONTRACT_TECHPROJECT_CREATED=\u5F53\u524D\u5408\u540C\u79D1\u6280\u9879\u76EE\u7533\u8BF7\u5DF2\u521B\u5EFA,\u65E0\u6CD5\u91CD\u590D\u521B\u5EFA\uFF01
 
 
-CONTRACT_COGNIZANCE_CREATED=\u5F53\u524D\u5408\u540C\u9AD8\u4F01\u8BA4\u5B9A\u7533\u8BF7\u5DF2\u521B\u5EFA,\u65E0\u6CD5\u91CD\u590D\u521B\u5EFA\uFF01
-
-EVALUATE_ID=\u8BC4\u4F30\u62A5\u544A\u627E\u4E0D\u5230\uFF01
-EVALUATE_STEP=\u9519\u8BEF\u7684\u8BC4\u4F30\u6B65\u9AA4\uFF01
-EVALUATE_PARAM=\u8BC4\u4F30\u53C2\u6570\u9519\u8BEF\uFF01
-
-CONTRACT_YEAR_SECTION=\u5F53\u524D\u7533\u8BF7\u5E74\u4EFD\u5DF2\u4E0E\u5176\u4ED6\u5408\u540C\u7533\u8BF7\u5E74\u4EFD\u91CD\u53E0\uFF0C\u65E0\u6CD5\u63D0\u4EA4\u65B0\u7533\u8BF7\uFF01
 
 
 VCODE_EMPTY_ERROR=\u56FE\u50CF\u9A8C\u8BC1\u7801\u4E0D\u80FD\u4E3A\u7A7A\uFF01
 VCODE_EMPTY_ERROR=\u56FE\u50CF\u9A8C\u8BC1\u7801\u4E0D\u80FD\u4E3A\u7A7A\uFF01