liliang4869 лет назад: 7
Родитель
Сommit
79ee0afdee
42 измененных файлов с 6089 добавлено и 1438 удалено
  1. 6 5
      GeneratorConfig.xml
  2. 17 0
      src/main/java/com/goafanti/business/bo/JtBusinessProjectResult.java
  3. 2 2
      src/main/java/com/goafanti/business/controller/JtBusinessController.java
  4. 3 2
      src/main/java/com/goafanti/business/service/JtBusinessService.java
  5. 5 4
      src/main/java/com/goafanti/business/service/impl/JtBusinessServiceImpl.java
  6. 3 0
      src/main/java/com/goafanti/common/controller/PublicController.java
  7. 3 0
      src/main/java/com/goafanti/common/controller/WebpageController.java
  8. 92 112
      src/main/java/com/goafanti/common/dao/JtBusinessCategoryMapper.java
  9. 3 0
      src/main/java/com/goafanti/common/dao/JtBusinessProjectMapper.java
  10. 96 0
      src/main/java/com/goafanti/common/dao/JtOrderDetailMapper.java
  11. 96 0
      src/main/java/com/goafanti/common/dao/JtOrderMapper.java
  12. 59 58
      src/main/java/com/goafanti/common/enums/AttachmentType.java
  13. 53 32
      src/main/java/com/goafanti/common/mapper/JtBusinessCategoryMapper.xml
  14. 23 0
      src/main/java/com/goafanti/common/mapper/JtBusinessProjectMapper.xml
  15. 381 0
      src/main/java/com/goafanti/common/mapper/JtOrderDetailMapper.xml
  16. 515 0
      src/main/java/com/goafanti/common/mapper/JtOrderMapper.xml
  17. 2 2
      src/main/java/com/goafanti/common/mapper/NewsMapper.xml
  18. 1 1
      src/main/java/com/goafanti/common/mapper/NewsMapperExt.xml
  19. 7 3
      src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml
  20. 236 301
      src/main/java/com/goafanti/common/model/JtBusinessCategory.java
  21. 921 902
      src/main/java/com/goafanti/common/model/JtBusinessCategoryExample.java
  22. 468 0
      src/main/java/com/goafanti/common/model/JtOrder.java
  23. 369 0
      src/main/java/com/goafanti/common/model/JtOrderDetail.java
  24. 1014 0
      src/main/java/com/goafanti/common/model/JtOrderDetailExample.java
  25. 1194 0
      src/main/java/com/goafanti/common/model/JtOrderExample.java
  26. 10 0
      src/main/java/com/goafanti/common/model/OrganizationIdentity.java
  27. 1 1
      src/main/java/com/goafanti/common/utils/FileUtils.java
  28. 2 1
      src/main/java/com/goafanti/news/controller/AdminNewsApiController.java
  29. 71 0
      src/main/java/com/goafanti/order/bo/JtOrderInput.java
  30. 94 0
      src/main/java/com/goafanti/order/bo/JtOrderResultDetail.java
  31. 33 0
      src/main/java/com/goafanti/order/controller/AdminJtOrderController.java
  32. 64 0
      src/main/java/com/goafanti/order/controller/UserJtOrderController.java
  33. 15 0
      src/main/java/com/goafanti/order/service/JtOrderService.java
  34. 191 0
      src/main/java/com/goafanti/order/service/impl/JtOrderServiceImpl.java
  35. 9 0
      src/main/java/com/goafanti/user/bo/InputOrganizationIdentity.java
  36. 14 0
      src/main/java/com/goafanti/user/controller/UserApiController.java
  37. 1 1
      src/main/webapp/WEB-INF/views/portal/service/serviceDetails.html
  38. 2 0
      src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html
  39. 4 4
      src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementDetail.html
  40. 2 0
      src/main/webapp/WEB-INF/views/portal/technologyTrading/demand.html
  41. 4 4
      src/main/webapp/WEB-INF/views/portal/technologyTrading/demandDetail.html
  42. 3 3
      src/main/webapp/WEB-INF/views/user/subscriberDetail.html

+ 6 - 5
GeneratorConfig.xml

@@ -2,14 +2,15 @@
 <!DOCTYPE generatorConfiguration PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN" "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
 <generatorConfiguration>
   <!-- <classPathEntry location="C:/Users/Administrator/.dbeaver-drivers/maven/maven-central/mysql/mysql-connector-java-5.1.44.jar" /> -->
-  <classPathEntry location="E:/mysql-connector-java-5.1.40.jar" />
+  <classPathEntry location="E:/mysql-connector-java-5.1.46.jar" />
   <context id="context1">	
  	<property name="javaFileEncoding" value="UTF-8"/>
     <jdbcConnection connectionURL="jdbc:mysql://192.168.1.213:3306/aft" 
     	driverClass="com.mysql.jdbc.Driver" password="123456" userId="dev" />
-   <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="jitao-server" />
-   <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="jitao-server" />
-   <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="jitao-server" type="XMLMAPPER" />
-   <table schema="aft" tableName="jt_business_project"/>
+   <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="jitao_server" />
+   <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="jitao_server" />
+   <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="jitao_server" type="XMLMAPPER" />
+   <table schema="aft" tableName="jt_commodity_comment"/>
+    <table schema="aft" tableName="jt_commodity_comment"/>
   </context>
 </generatorConfiguration>

+ 17 - 0
src/main/java/com/goafanti/business/bo/JtBusinessProjectResult.java

@@ -0,0 +1,17 @@
+package com.goafanti.business.bo;
+
+import com.goafanti.common.model.JtBusinessProject;
+
+public class JtBusinessProjectResult extends JtBusinessProject {
+	private Integer module;
+
+	public Integer getModule() {
+		return module;
+	}
+
+	public void setModule(Integer module) {
+		this.module = module;
+	}
+	
+
+}

+ 2 - 2
src/main/java/com/goafanti/business/controller/JtBusinessController.java

@@ -25,9 +25,9 @@ public class JtBusinessController extends CertifyApiController {
 	}
 	
 	@RequestMapping(value="/jtProject/list", method=RequestMethod.GET)
-	public Result getProjectList(String topId,String secondId,String name,Integer pageSize,Integer pageNo,Integer privateProject,Integer auditStatus) {
+	public Result getProjectList(String topId,String secondId,String name,Integer pageSize,Integer pageNo,Integer privateProject,Integer auditStatus,Integer module) {
 		Result result=new Result();
-		result.setData(jtBusinessService.getProjects(topId,secondId,name,pageSize,pageNo,privateProject,auditStatus));
+		result.setData(jtBusinessService.getProjects(topId,secondId,name,pageSize,pageNo,privateProject,auditStatus,module));
 		return result;
 	}
 	

+ 3 - 2
src/main/java/com/goafanti/business/service/JtBusinessService.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.goafanti.business.bo.JtBusinessCategoryBo;
 import com.goafanti.business.bo.JtBusinessCategoryTree;
+import com.goafanti.business.bo.JtBusinessProjectResult;
 import com.goafanti.common.model.JtBusinessCategory;
 import com.goafanti.common.model.JtBusinessProject;
 import com.goafanti.core.mybatis.page.Pagination;
@@ -12,10 +13,10 @@ public interface JtBusinessService {
 	JtBusinessCategory getBusinessCategoryByLayerAndName(Integer layer,String name);
 	List<JtBusinessCategory> getBusinessCategoryBySuperId(String id,Integer size);
 	List<JtBusinessProject>getBusinessProjectByCategoryId(String id,Integer size,Integer isHot);
-	JtBusinessProject getBusinessProjectDetail(String id);
+	JtBusinessProjectResult getBusinessProjectDetail(String id);
 	JtBusinessCategoryTree getCategoryTree(String id);
 	List<JtBusinessCategoryBo>getCategoryBoList();
-	Pagination<JtBusinessProject>getProjects(String topId,String secondId,String name,Integer pageSize,Integer pageNo,Integer privateProject,Integer auditStatus); 
+	Pagination<JtBusinessProject>getProjects(String topId,String secondId,String name,Integer pageSize,Integer pageNo,Integer privateProject,Integer auditStatus,Integer module); 
 	int insertCategory(JtBusinessCategory jtBusinessCategory);
 	int deleteCategoryById(String id);
 	JtBusinessCategory getCategoryById(String id);

+ 5 - 4
src/main/java/com/goafanti/business/service/impl/JtBusinessServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 
 import com.goafanti.business.bo.JtBusinessCategoryBo;
 import com.goafanti.business.bo.JtBusinessCategoryTree;
+import com.goafanti.business.bo.JtBusinessProjectResult;
 import com.goafanti.business.service.JtBusinessService;
 import com.goafanti.common.dao.JtBusinessCategoryMapper;
 import com.goafanti.common.dao.JtBusinessProjectMapper;
@@ -49,9 +50,9 @@ public class JtBusinessServiceImpl  extends BaseMybatisDao<JtBusinessProjectMapp
 	}
 
 	@Override
-	public JtBusinessProject getBusinessProjectDetail(String id) {
+	public JtBusinessProjectResult getBusinessProjectDetail(String id) {
 		// TODO Auto-generated method stub
-		return jtBusinessProjectMapper.selectByPrimaryKey(id);
+		return jtBusinessProjectMapper.selectByPrimaryKeyWithModule(id);
 	}
 
 	@Override
@@ -67,7 +68,7 @@ public class JtBusinessServiceImpl  extends BaseMybatisDao<JtBusinessProjectMapp
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<JtBusinessProject> getProjects(String topId, String secondId, String name, Integer pageSize,
-			Integer pageNo,Integer privateProject,Integer auditStatus) {
+			Integer pageNo,Integer privateProject,Integer auditStatus,Integer module) {
 		// TODO Auto-generated method stub
 		if (pageNo == null || pageNo < 0) {
 			pageNo = 1;
@@ -85,7 +86,7 @@ if(auditStatus!=null ) {
 		}
 		if(privateProject!=null && privateProject ==0)
 		params.put("ownerId", TokenManager.getUserId());
-		
+		if(module!=null)params.put("module", module);
 		return (Pagination<JtBusinessProject>)findPage("findJtBusinessProjectByPage","findJtBusinessCountByPage",params,pageNo,pageSize);
 	}
 	

+ 3 - 0
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -5,6 +5,8 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.UUID;
 
 import javax.annotation.Resource;
@@ -640,4 +642,5 @@ public class PublicController extends BaseController {
 	
 	
 	
+	
 }

+ 3 - 0
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -360,6 +360,9 @@ public class WebpageController extends BaseController {
 	if(jtBusinessProject!=null) {
 	JtBusinessCategoryTree tree=jtBusinessService.getCategoryTree(jtBusinessProject.getCategoryId());
 	modelview.addObject("tree",tree);}
+	JtBusinessCategory jtBusinessCategory=jtBusinessService.getCategoryById(jtBusinessProject.getCategoryId());
+	if(jtBusinessCategory!=null && jtBusinessCategory.getModule()!=null)modelview.addObject("module",jtBusinessCategory.getModule());
+	else modelview.addObject("module",0);
 	return modelview;
 	}
 	

+ 92 - 112
src/main/java/com/goafanti/common/dao/JtBusinessCategoryMapper.java

@@ -1,113 +1,93 @@
-package com.goafanti.common.dao;
-
-import com.goafanti.business.bo.JtBusinessCategoryBo;
-import com.goafanti.business.bo.JtBusinessCategoryTree;
-import com.goafanti.common.model.JtBusinessCategory;
-import com.goafanti.common.model.JtBusinessCategoryExample;
-import com.goafanti.common.model.JtBusinessProject;
-
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface JtBusinessCategoryMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jt_business_category
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    long countByExample(JtBusinessCategoryExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jt_business_category
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    int deleteByExample(JtBusinessCategoryExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jt_business_category
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    int deleteByPrimaryKey(String id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jt_business_category
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    int insert(JtBusinessCategory record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jt_business_category
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    int insertSelective(JtBusinessCategory record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jt_business_category
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    List<JtBusinessCategory> selectByExample(JtBusinessCategoryExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jt_business_category
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    JtBusinessCategory selectByPrimaryKey(String id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jt_business_category
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    int updateByExampleSelective(@Param("record") JtBusinessCategory record, @Param("example") JtBusinessCategoryExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jt_business_category
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    int updateByExample(@Param("record") JtBusinessCategory record, @Param("example") JtBusinessCategoryExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jt_business_category
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    int updateByPrimaryKeySelective(JtBusinessCategory record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jt_business_category
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    int updateByPrimaryKey(JtBusinessCategory record);
-    
-    JtBusinessCategory getBusinessCategoryByLayerAndName(Integer layer, String name);
-    
-    List<JtBusinessCategory> getBusinessCategoryBySuperId(@Param("superId")String superId,@Param("size")Integer size);
-    
-    JtBusinessCategoryTree getCategoryTree(String id);
-    
-    List<JtBusinessCategoryBo>getCategoryBoList();
-    
-    int insertCategory(JtBusinessCategory jtBusinessCategory);
-    
-    int autoIncreaseSort(Integer layer,Integer sort);
-    
+package com.goafanti.common.dao;
+
+import com.goafanti.business.bo.JtBusinessCategoryBo;
+import com.goafanti.business.bo.JtBusinessCategoryTree;
+import com.goafanti.common.model.JtBusinessCategory;
+import com.goafanti.common.model.JtBusinessCategoryExample;
+import com.goafanti.common.model.JtBusinessProject;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface JtBusinessCategoryMapper {
+    /**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_business_category
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	long countByExample(JtBusinessCategoryExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_business_category
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	int deleteByExample(JtBusinessCategoryExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_business_category
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	int deleteByPrimaryKey(String id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_business_category
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	int insert(JtBusinessCategory record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_business_category
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	int insertSelective(JtBusinessCategory record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_business_category
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	List<JtBusinessCategory> selectByExample(JtBusinessCategoryExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_business_category
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	JtBusinessCategory selectByPrimaryKey(String id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_business_category
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	int updateByExampleSelective(@Param("record") JtBusinessCategory record,
+			@Param("example") JtBusinessCategoryExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_business_category
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	int updateByExample(@Param("record") JtBusinessCategory record,
+			@Param("example") JtBusinessCategoryExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_business_category
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	int updateByPrimaryKeySelective(JtBusinessCategory record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table jt_business_category
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	int updateByPrimaryKey(JtBusinessCategory record);
+
+	JtBusinessCategory getBusinessCategoryByLayerAndName(Integer layer, String name);
+    
+    List<JtBusinessCategory> getBusinessCategoryBySuperId(@Param("superId")String superId,@Param("size")Integer size);
+    
+    JtBusinessCategoryTree getCategoryTree(String id);
+    
+    List<JtBusinessCategoryBo>getCategoryBoList();
+    
+    int insertCategory(JtBusinessCategory jtBusinessCategory);
+    
+    int autoIncreaseSort(Integer layer,Integer sort);
+    
 }

+ 3 - 0
src/main/java/com/goafanti/common/dao/JtBusinessProjectMapper.java

@@ -1,5 +1,6 @@
 package com.goafanti.common.dao;
 
+import com.goafanti.business.bo.JtBusinessProjectResult;
 import com.goafanti.common.model.JtBusinessProject;
 import com.goafanti.common.model.JtBusinessProjectExample;
 import com.goafanti.core.mybatis.page.Pagination;
@@ -81,6 +82,8 @@ public interface JtBusinessProjectMapper {
   
   int deleteByIdAndUid(String id,String uid);
   
+	JtBusinessProjectResult selectByPrimaryKeyWithModule(String id);
+  
 
      
   

+ 96 - 0
src/main/java/com/goafanti/common/dao/JtOrderDetailMapper.java

@@ -0,0 +1,96 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.JtOrderDetail;
+import com.goafanti.common.model.JtOrderDetailExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface JtOrderDetailMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table jt_order_detail
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    long countByExample(JtOrderDetailExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table jt_order_detail
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    int deleteByExample(JtOrderDetailExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table jt_order_detail
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table jt_order_detail
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    int insert(JtOrderDetail record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table jt_order_detail
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    int insertSelective(JtOrderDetail record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table jt_order_detail
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    List<JtOrderDetail> selectByExample(JtOrderDetailExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table jt_order_detail
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    JtOrderDetail selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table jt_order_detail
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") JtOrderDetail record, @Param("example") JtOrderDetailExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table jt_order_detail
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    int updateByExample(@Param("record") JtOrderDetail record, @Param("example") JtOrderDetailExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table jt_order_detail
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    int updateByPrimaryKeySelective(JtOrderDetail record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table jt_order_detail
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    int updateByPrimaryKey(JtOrderDetail record);
+}

+ 96 - 0
src/main/java/com/goafanti/common/dao/JtOrderMapper.java

@@ -0,0 +1,96 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.JtOrder;
+import com.goafanti.common.model.JtOrderExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface JtOrderMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table jt_order
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    long countByExample(JtOrderExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table jt_order
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    int deleteByExample(JtOrderExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table jt_order
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    int deleteByPrimaryKey(String orderNo);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table jt_order
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    int insert(JtOrder record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table jt_order
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    int insertSelective(JtOrder record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table jt_order
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    List<JtOrder> selectByExample(JtOrderExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table jt_order
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    JtOrder selectByPrimaryKey(String orderNo);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table jt_order
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") JtOrder record, @Param("example") JtOrderExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table jt_order
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    int updateByExample(@Param("record") JtOrder record, @Param("example") JtOrderExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table jt_order
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    int updateByPrimaryKeySelective(JtOrder record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table jt_order
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    int updateByPrimaryKey(JtOrder record);
+}

+ 59 - 58
src/main/java/com/goafanti/common/enums/AttachmentType.java

@@ -1,58 +1,59 @@
-package com.goafanti.common.enums;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public enum AttachmentType {
-	DEMAND_PICTURE("demand_picture", "科技需求图片资料"),
-	DEFAULT("attachment", "附件"),
-	DEMAND_COVER_PICTURE("demand_cover_picture","科技需求封面图"),
-	ACHIEVEMENT_PICTURE("achievement_picture", "科技成果技术图片"),
-	ACHIEVEMENT_COVER_PICTURE("achievement_cover_picture","科技成果封面图"),
-	DEMAND_TEMPLATE("demand_template", "科技需求批量导入模板"),
-	ACHIEVEMENT_TEMPLATE("achievement_template", "科技成果批量导入模板"),
-	BANNERS_PIC("banners", "广告图片"),
-	NEWS_TITLE_PICTURE("news_title_picture", "新闻题图图片"),
-	NEWS_CONTENT_PICTURE("news_content_picture", "新闻内容图片"),
-	JT_BUSINESS_PICTURE("jt_business_picture","技淘品类图片"),
-	JT_PROJECT_PICTURE("jt_project_picture","技淘服务项目图片"),
-	USER_PICTURE("user_picture","用户图片");
-	private AttachmentType(String code, String desc) {
-		this.code = code;
-		this.desc = desc;
-	}
-
-	private static Map<String, AttachmentType> status = new HashMap<String, AttachmentType>();
-
-	static {
-		for (AttachmentType value : AttachmentType.values()) {
-			status.put(value.getCode(), value);
-		}
-	}
-
-	public static AttachmentType getField(String code) {
-		if (containsType(code)) {
-			return status.get(code);
-		}
-		return DEFAULT;
-	}
-
-	public static String getFieldDesc(String code) {
-		return getField(code).getDesc();
-	}
-
-	public static boolean containsType(String code) {
-		return status.containsKey(code);
-	}
-
-	private String	code;
-	private String	desc;
-
-	public String getCode() {
-		return code;
-	}
-
-	public String getDesc() {
-		return desc;
-	}
-}
+package com.goafanti.common.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum AttachmentType {
+	DEMAND_PICTURE("demand_picture", "科技需求图片资料"),
+	DEFAULT("attachment", "附件"),
+	DEMAND_COVER_PICTURE("demand_cover_picture","科技需求封面图"),
+	ACHIEVEMENT_PICTURE("achievement_picture", "科技成果技术图片"),
+	ACHIEVEMENT_COVER_PICTURE("achievement_cover_picture","科技成果封面图"),
+	DEMAND_TEMPLATE("demand_template", "科技需求批量导入模板"),
+	ACHIEVEMENT_TEMPLATE("achievement_template", "科技成果批量导入模板"),
+	BANNERS_PIC("banners", "广告图片"),
+	NEWS_TITLE_PICTURE("news_title_picture", "新闻题图图片"),
+	NEWS_CONTENT_PICTURE("news_content_picture", "新闻内容图片"),
+	JT_BUSINESS_PICTURE("jt_business_picture","技淘品类图片"),
+	JT_PROJECT_PICTURE("jt_project_picture","技淘服务项目图片"),
+	USER_PICTURE("user_picture","用户图片"),
+	HONOR_PICTURE("honor_picture","荣誉图片");
+	private AttachmentType(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	private static Map<String, AttachmentType> status = new HashMap<String, AttachmentType>();
+
+	static {
+		for (AttachmentType value : AttachmentType.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+
+	public static AttachmentType getField(String code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return DEFAULT;
+	}
+
+	public static String getFieldDesc(String code) {
+		return getField(code).getDesc();
+	}
+
+	public static boolean containsType(String code) {
+		return status.containsKey(code);
+	}
+
+	private String	code;
+	private String	desc;
+
+	public String getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+}

+ 53 - 32
src/main/java/com/goafanti/common/mapper/JtBusinessCategoryMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 20 11:08:54 CST 2018.
+      This element was generated on Tue Jul 17 09:14:43 CST 2018.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
@@ -16,12 +16,13 @@
     <result column="img_url" jdbcType="VARCHAR" property="imgUrl" />
     <result column="layer" jdbcType="INTEGER" property="layer" />
     <result column="sort" jdbcType="INTEGER" property="sort" />
+    <result column="module" jdbcType="INTEGER" property="module" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 20 11:08:54 CST 2018.
+      This element was generated on Tue Jul 17 09:14:43 CST 2018.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -55,7 +56,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 20 11:08:54 CST 2018.
+      This element was generated on Tue Jul 17 09:14:43 CST 2018.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -89,15 +90,15 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 20 11:08:54 CST 2018.
+      This element was generated on Tue Jul 17 09:14:43 CST 2018.
     -->
-    id, name, summary, number, create_time, super_id, img_url, layer, sort
+    id, name, summary, number, create_time, super_id, img_url, layer, sort, module
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.JtBusinessCategoryExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 20 11:08:54 CST 2018.
+      This element was generated on Tue Jul 17 09:14:43 CST 2018.
     -->
     select
     <if test="distinct">
@@ -116,7 +117,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 20 11:08:54 CST 2018.
+      This element was generated on Tue Jul 17 09:14:43 CST 2018.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -127,7 +128,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 20 11:08:54 CST 2018.
+      This element was generated on Tue Jul 17 09:14:43 CST 2018.
     -->
     delete from jt_business_category
     where id = #{id,jdbcType=VARCHAR}
@@ -136,7 +137,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 20 11:08:54 CST 2018.
+      This element was generated on Tue Jul 17 09:14:43 CST 2018.
     -->
     delete from jt_business_category
     <if test="_parameter != null">
@@ -147,22 +148,22 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 20 11:08:54 CST 2018.
+      This element was generated on Tue Jul 17 09:14:43 CST 2018.
     -->
     insert into jt_business_category (id, name, summary, 
       number, create_time, super_id, 
-      img_url, layer, sort
-      )
+      img_url, layer, sort, 
+      module)
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{summary,jdbcType=VARCHAR}, 
       #{number,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{superId,jdbcType=VARCHAR}, 
-      #{imgUrl,jdbcType=VARCHAR}, #{layer,jdbcType=INTEGER}, #{sort,jdbcType=INTEGER}
-      )
+      #{imgUrl,jdbcType=VARCHAR}, #{layer,jdbcType=INTEGER}, #{sort,jdbcType=INTEGER}, 
+      #{module,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.JtBusinessCategory">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 20 11:08:54 CST 2018.
+      This element was generated on Tue Jul 17 09:14:43 CST 2018.
     -->
     insert into jt_business_category
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -193,6 +194,9 @@
       <if test="sort != null">
         sort,
       </if>
+      <if test="module != null">
+        module,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -222,13 +226,16 @@
       <if test="sort != null">
         #{sort,jdbcType=INTEGER},
       </if>
+      <if test="module != null">
+        #{module,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.JtBusinessCategoryExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 20 11:08:54 CST 2018.
+      This element was generated on Tue Jul 17 09:14:43 CST 2018.
     -->
     select count(*) from jt_business_category
     <if test="_parameter != null">
@@ -239,7 +246,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 20 11:08:54 CST 2018.
+      This element was generated on Tue Jul 17 09:14:43 CST 2018.
     -->
     update jt_business_category
     <set>
@@ -270,6 +277,9 @@
       <if test="record.sort != null">
         sort = #{record.sort,jdbcType=INTEGER},
       </if>
+      <if test="record.module != null">
+        module = #{record.module,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -279,7 +289,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 20 11:08:54 CST 2018.
+      This element was generated on Tue Jul 17 09:14:43 CST 2018.
     -->
     update jt_business_category
     set id = #{record.id,jdbcType=VARCHAR},
@@ -290,7 +300,8 @@
       super_id = #{record.superId,jdbcType=VARCHAR},
       img_url = #{record.imgUrl,jdbcType=VARCHAR},
       layer = #{record.layer,jdbcType=INTEGER},
-      sort = #{record.sort,jdbcType=INTEGER}
+      sort = #{record.sort,jdbcType=INTEGER},
+      module = #{record.module,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -299,7 +310,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 20 11:08:54 CST 2018.
+      This element was generated on Tue Jul 17 09:14:43 CST 2018.
     -->
     update jt_business_category
     <set>
@@ -327,6 +338,9 @@
       <if test="sort != null">
         sort = #{sort,jdbcType=INTEGER},
       </if>
+      <if test="module != null">
+        module = #{module,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -334,7 +348,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jun 20 11:08:54 CST 2018.
+      This element was generated on Tue Jul 17 09:14:43 CST 2018.
     -->
     update jt_business_category
     set name = #{name,jdbcType=VARCHAR},
@@ -344,7 +358,8 @@
       super_id = #{superId,jdbcType=VARCHAR},
       img_url = #{imgUrl,jdbcType=VARCHAR},
       layer = #{layer,jdbcType=INTEGER},
-      sort = #{sort,jdbcType=INTEGER}
+      sort = #{sort,jdbcType=INTEGER},
+      module = #{module,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   
@@ -352,7 +367,7 @@
 select
 	id,
 	name,
-	super_id as superId
+	super_id as superId,module
 from
 	jt_business_category
 where
@@ -366,7 +381,7 @@ where
 	id,
 	name,
 	super_id as superId,
-	sort
+	sort,module
 from
 	jt_business_category
 where
@@ -374,7 +389,7 @@ where
 <if test="superId!=null">
 	super_id = #{superId,jdbcType=VARCHAR}
 	</if>
-	<if  test="superId==null" >
+	<if test="superId==null">
 	layer=1
 	</if>
 
@@ -402,17 +417,17 @@ where
 	id,
 	name,
 	super_id as superId,
-	sort
+	sort,module
 from
 	jt_business_category
 where
 	super_id = #{0}
 	order by sort
   </select>
-  <resultMap type="com.goafanti.business.bo.JtBusinessCategoryBo" id="JtBusinessCategoryBoResult">  
-        <id column="name" property="topLevel"/>  
-        <id column="topLevelId"   property="topLevelId"/>
-        <collection property="children" select="getCategoryBySuperId" column="topLevelId" ofType="com.goafanti.common.model.JtBusinessCategory">
+  <resultMap id="JtBusinessCategoryBoResult" type="com.goafanti.business.bo.JtBusinessCategoryBo">  
+        <id column="name" property="topLevel" />  
+        <id column="topLevelId" property="topLevelId" />
+        <collection column="topLevelId" ofType="com.goafanti.common.model.JtBusinessCategory" property="children" select="getCategoryBySuperId">
         </collection>  
     </resultMap>  
     
@@ -428,12 +443,12 @@ where
   <update id="autoIncreaseSort">
 update jt_business_category set 
 sort=sort+1 
-where sort > #{1}
+where sort &gt; #{1}
 and layer=#{0}
   </update>
   
     <select id="getCategoryListByCondition" resultType="com.goafanti.common.model.JtBusinessCategoryResult">
-   select bc1.id,bc1.sort,bc1.number,bc1.name,bc1.super_id as superId,bc1.layer,bc2.name as superName
+   select bc1.id,bc1.sort,bc1.number,bc1.name,bc1.super_id as superId,bc1.layer,bc2.name as superName,bc1.module as module
     from jt_business_category bc1
     left join jt_business_category bc2 on bc2.id=bc1.super_id
     where 
@@ -443,6 +458,9 @@ and layer=#{0}
     <if test="name!=null">
     and bc1.name like concat("%",#{name,jdbcType=VARCHAR},"%")
     </if>
+    <if test="module !=null">
+    and bc1.module =#{module,jdbcType=INTEGER}
+    </if>
    <if test="page_sql!=null">
 		${page_sql}
 	</if>
@@ -460,5 +478,8 @@ and layer=#{0}
     <if test="name!=null">
     and bc1.name like concat("%",#{name,jdbcType=VARCHAR},"%")
     </if>
+     <if test="module !=null">
+    and bc1.module =#{module,jdbcType=INTEGER}
+    </if>
     </select>
 </mapper>

+ 23 - 0
src/main/java/com/goafanti/common/mapper/JtBusinessProjectMapper.xml

@@ -138,6 +138,16 @@
     from jt_business_project
     where id = #{id,jdbcType=VARCHAR}
   </select>
+  <select id="selectByPrimaryKeyWithModule" resultType="com.goafanti.business.bo.JtBusinessProjectResult">
+    select 
+        jtbp.id, jtbp.name, jtbp.category_id as categoryId, jtbp.number, jtbp.price, jtbp.activity_price as activityPrice, jtbp.member_price as memberPrice, jtbp.offset, 
+        jtbp.activity_flag as activityFlag, 
+    jtbp.introduce, jtbp.province, jtbp.city, jtbp.create_time as createTime, jtbp.min_img_url as minImgUrl, jtbp.max_img_url as maxImgUrl, jtbp.value, jtbp.apply_conditions as applyConditions, 
+    jtbp.owner_id as ownerId, jtbp.is_hot as isHot, jtbp.audit_status as auditStatus, jtbp.audit_info as auditInfo, jtbp.release_date as releaseDate,jtbc.module as module
+    from jt_business_project jtbp
+    left join jt_business_category jtbc on jtbc.id =  jtbp.category_id
+    where jtbp.id = #{id,jdbcType=VARCHAR}
+  </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     <!--
       WARNING - @mbg.generated
@@ -594,7 +604,13 @@
   <if test="topId!=null">
   left join jt_business_category jtbc on jtbc.super_id =#{topId,jdbcType=VARCHAR}
   </if>
+  <if test="module!=null">
+  left join jt_business_category jtbc1 on jtbc1.id = jtbp.category_id
+  </if>
   where 1=1
+  <if test="module !=null">
+  and jtbc1.module=#{module,jdbcType=INTEGER}
+  </if>
   <if test="secondId!=null">
   and jtbp.category_id=#{secondId,jdbcType=VARCHAR}
   </if>
@@ -610,6 +626,7 @@
   <if test="auditStatus!=null">
   and jtbp.audit_status=#{auditStatus,jdbcType=INTEGER}
   </if>
+  
   	<if test="page_sql!=null">
 		${page_sql}
 	</if>
@@ -621,7 +638,13 @@
 	  <if test="topId!=null">
 	  left join jt_business_category jtbc on jtbc.super_id =#{topId,jdbcType=VARCHAR}
 	  </if>
+	    <if test="module!=null">
+  left join jt_business_category jtbc1 on jtbc1.id = jtbp.category_id
+  </if>
 	  where 1=1
+	    <if test="module !=null">
+  and jtbc1.module=#{module,jdbcType=INTEGER}
+  </if>
 	  <if test="secondId!=null">
 	  and jtbp.category_id=#{secondId,jdbcType=VARCHAR}
 	  </if>

+ 381 - 0
src/main/java/com/goafanti/common/mapper/JtOrderDetailMapper.xml

@@ -0,0 +1,381 @@
+<?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.goafanti.common.dao.JtOrderDetailMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.JtOrderDetail">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+    <result column="commodity_id" jdbcType="VARCHAR" property="commodityId" />
+    <result column="commodity_name" jdbcType="VARCHAR" property="commodityName" />
+    <result column="commodity_quantity" jdbcType="INTEGER" property="commodityQuantity" />
+    <result column="commodity_price" jdbcType="DECIMAL" property="commodityPrice" />
+    <result column="commodity_type" jdbcType="INTEGER" property="commodityType" />
+    <result column="commodity_mode" jdbcType="VARCHAR" property="commodityMode" />
+    <result column="discount_price" jdbcType="DECIMAL" property="discountPrice" />
+    <result column="member_price" jdbcType="DECIMAL" property="memberPrice" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    id, order_no, commodity_id, commodity_name, commodity_quantity, commodity_price, 
+    commodity_type, commodity_mode, discount_price, member_price, create_time
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.JtOrderDetailExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from jt_order_detail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from jt_order_detail
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    delete from jt_order_detail
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.JtOrderDetailExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    delete from jt_order_detail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.JtOrderDetail">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    insert into jt_order_detail (id, order_no, commodity_id, 
+      commodity_name, commodity_quantity, commodity_price, 
+      commodity_type, commodity_mode, discount_price, 
+      member_price, create_time)
+    values (#{id,jdbcType=VARCHAR}, #{orderNo,jdbcType=VARCHAR}, #{commodityId,jdbcType=VARCHAR}, 
+      #{commodityName,jdbcType=VARCHAR}, #{commodityQuantity,jdbcType=INTEGER}, #{commodityPrice,jdbcType=DECIMAL}, 
+      #{commodityType,jdbcType=INTEGER}, #{commodityMode,jdbcType=VARCHAR}, #{discountPrice,jdbcType=DECIMAL}, 
+      #{memberPrice,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.JtOrderDetail">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    insert into jt_order_detail
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="orderNo != null">
+        order_no,
+      </if>
+      <if test="commodityId != null">
+        commodity_id,
+      </if>
+      <if test="commodityName != null">
+        commodity_name,
+      </if>
+      <if test="commodityQuantity != null">
+        commodity_quantity,
+      </if>
+      <if test="commodityPrice != null">
+        commodity_price,
+      </if>
+      <if test="commodityType != null">
+        commodity_type,
+      </if>
+      <if test="commodityMode != null">
+        commodity_mode,
+      </if>
+      <if test="discountPrice != null">
+        discount_price,
+      </if>
+      <if test="memberPrice != null">
+        member_price,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="orderNo != null">
+        #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityId != null">
+        #{commodityId,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityName != null">
+        #{commodityName,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityQuantity != null">
+        #{commodityQuantity,jdbcType=INTEGER},
+      </if>
+      <if test="commodityPrice != null">
+        #{commodityPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="commodityType != null">
+        #{commodityType,jdbcType=INTEGER},
+      </if>
+      <if test="commodityMode != null">
+        #{commodityMode,jdbcType=VARCHAR},
+      </if>
+      <if test="discountPrice != null">
+        #{discountPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="memberPrice != null">
+        #{memberPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.JtOrderDetailExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    select count(*) from jt_order_detail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    update jt_order_detail
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orderNo != null">
+        order_no = #{record.orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.commodityId != null">
+        commodity_id = #{record.commodityId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.commodityName != null">
+        commodity_name = #{record.commodityName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.commodityQuantity != null">
+        commodity_quantity = #{record.commodityQuantity,jdbcType=INTEGER},
+      </if>
+      <if test="record.commodityPrice != null">
+        commodity_price = #{record.commodityPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="record.commodityType != null">
+        commodity_type = #{record.commodityType,jdbcType=INTEGER},
+      </if>
+      <if test="record.commodityMode != null">
+        commodity_mode = #{record.commodityMode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.discountPrice != null">
+        discount_price = #{record.discountPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="record.memberPrice != null">
+        member_price = #{record.memberPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    update jt_order_detail
+    set id = #{record.id,jdbcType=VARCHAR},
+      order_no = #{record.orderNo,jdbcType=VARCHAR},
+      commodity_id = #{record.commodityId,jdbcType=VARCHAR},
+      commodity_name = #{record.commodityName,jdbcType=VARCHAR},
+      commodity_quantity = #{record.commodityQuantity,jdbcType=INTEGER},
+      commodity_price = #{record.commodityPrice,jdbcType=DECIMAL},
+      commodity_type = #{record.commodityType,jdbcType=INTEGER},
+      commodity_mode = #{record.commodityMode,jdbcType=VARCHAR},
+      discount_price = #{record.discountPrice,jdbcType=DECIMAL},
+      member_price = #{record.memberPrice,jdbcType=DECIMAL},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.JtOrderDetail">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    update jt_order_detail
+    <set>
+      <if test="orderNo != null">
+        order_no = #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityId != null">
+        commodity_id = #{commodityId,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityName != null">
+        commodity_name = #{commodityName,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityQuantity != null">
+        commodity_quantity = #{commodityQuantity,jdbcType=INTEGER},
+      </if>
+      <if test="commodityPrice != null">
+        commodity_price = #{commodityPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="commodityType != null">
+        commodity_type = #{commodityType,jdbcType=INTEGER},
+      </if>
+      <if test="commodityMode != null">
+        commodity_mode = #{commodityMode,jdbcType=VARCHAR},
+      </if>
+      <if test="discountPrice != null">
+        discount_price = #{discountPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="memberPrice != null">
+        member_price = #{memberPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.JtOrderDetail">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    update jt_order_detail
+    set order_no = #{orderNo,jdbcType=VARCHAR},
+      commodity_id = #{commodityId,jdbcType=VARCHAR},
+      commodity_name = #{commodityName,jdbcType=VARCHAR},
+      commodity_quantity = #{commodityQuantity,jdbcType=INTEGER},
+      commodity_price = #{commodityPrice,jdbcType=DECIMAL},
+      commodity_type = #{commodityType,jdbcType=INTEGER},
+      commodity_mode = #{commodityMode,jdbcType=VARCHAR},
+      discount_price = #{discountPrice,jdbcType=DECIMAL},
+      member_price = #{memberPrice,jdbcType=DECIMAL},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

+ 515 - 0
src/main/java/com/goafanti/common/mapper/JtOrderMapper.xml

@@ -0,0 +1,515 @@
+<?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.goafanti.common.dao.JtOrderMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.JtOrder">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    <id column="order_no" jdbcType="VARCHAR" property="orderNo" />
+    <result column="order_time" jdbcType="TIMESTAMP" property="orderTime" />
+    <result column="aid" jdbcType="VARCHAR" property="aid" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="buyer_id" jdbcType="VARCHAR" property="buyerId" />
+    <result column="seller_id" jdbcType="VARCHAR" property="sellerId" />
+    <result column="order_amount" jdbcType="DECIMAL" property="orderAmount" />
+    <result column="pay_amount" jdbcType="DECIMAL" property="payAmount" />
+    <result column="refund_amount" jdbcType="DECIMAL" property="refundAmount" />
+    <result column="pay_type" jdbcType="INTEGER" property="payType" />
+    <result column="order_status" jdbcType="INTEGER" property="orderStatus" />
+    <result column="order_channel" jdbcType="INTEGER" property="orderChannel" />
+    <result column="order_remarks" jdbcType="VARCHAR" property="orderRemarks" />
+    <result column="delete_sign" jdbcType="INTEGER" property="deleteSign" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    order_no, order_time, aid, update_time, buyer_id, seller_id, order_amount, pay_amount, 
+    refund_amount, pay_type, order_status, order_channel, order_remarks, delete_sign
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.JtOrderExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from jt_order
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from jt_order
+    where order_no = #{orderNo,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    delete from jt_order
+    where order_no = #{orderNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.JtOrderExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    delete from jt_order
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.JtOrder">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    insert into jt_order (order_no, order_time, aid, 
+      update_time, buyer_id, seller_id, 
+      order_amount, pay_amount, refund_amount, 
+      pay_type, order_status, order_channel, 
+      order_remarks, delete_sign)
+    values (#{orderNo,jdbcType=VARCHAR}, #{orderTime,jdbcType=TIMESTAMP}, #{aid,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{buyerId,jdbcType=VARCHAR}, #{sellerId,jdbcType=VARCHAR}, 
+      #{orderAmount,jdbcType=DECIMAL}, #{payAmount,jdbcType=DECIMAL}, #{refundAmount,jdbcType=DECIMAL}, 
+      #{payType,jdbcType=INTEGER}, #{orderStatus,jdbcType=INTEGER}, #{orderChannel,jdbcType=INTEGER}, 
+      #{orderRemarks,jdbcType=VARCHAR}, #{deleteSign,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.JtOrder">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    insert into jt_order
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="orderNo != null">
+        order_no,
+      </if>
+      <if test="orderTime != null">
+        order_time,
+      </if>
+      <if test="aid != null">
+        aid,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="buyerId != null">
+        buyer_id,
+      </if>
+      <if test="sellerId != null">
+        seller_id,
+      </if>
+      <if test="orderAmount != null">
+        order_amount,
+      </if>
+      <if test="payAmount != null">
+        pay_amount,
+      </if>
+      <if test="refundAmount != null">
+        refund_amount,
+      </if>
+      <if test="payType != null">
+        pay_type,
+      </if>
+      <if test="orderStatus != null">
+        order_status,
+      </if>
+      <if test="orderChannel != null">
+        order_channel,
+      </if>
+      <if test="orderRemarks != null">
+        order_remarks,
+      </if>
+      <if test="deleteSign != null">
+        delete_sign,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="orderNo != null">
+        #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="orderTime != null">
+        #{orderTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="aid != null">
+        #{aid,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="buyerId != null">
+        #{buyerId,jdbcType=VARCHAR},
+      </if>
+      <if test="sellerId != null">
+        #{sellerId,jdbcType=VARCHAR},
+      </if>
+      <if test="orderAmount != null">
+        #{orderAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="payAmount != null">
+        #{payAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="refundAmount != null">
+        #{refundAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="payType != null">
+        #{payType,jdbcType=INTEGER},
+      </if>
+      <if test="orderStatus != null">
+        #{orderStatus,jdbcType=INTEGER},
+      </if>
+      <if test="orderChannel != null">
+        #{orderChannel,jdbcType=INTEGER},
+      </if>
+      <if test="orderRemarks != null">
+        #{orderRemarks,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteSign != null">
+        #{deleteSign,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.JtOrderExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    select count(*) from jt_order
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    update jt_order
+    <set>
+      <if test="record.orderNo != null">
+        order_no = #{record.orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orderTime != null">
+        order_time = #{record.orderTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.aid != null">
+        aid = #{record.aid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.buyerId != null">
+        buyer_id = #{record.buyerId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sellerId != null">
+        seller_id = #{record.sellerId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orderAmount != null">
+        order_amount = #{record.orderAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.payAmount != null">
+        pay_amount = #{record.payAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.refundAmount != null">
+        refund_amount = #{record.refundAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.payType != null">
+        pay_type = #{record.payType,jdbcType=INTEGER},
+      </if>
+      <if test="record.orderStatus != null">
+        order_status = #{record.orderStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.orderChannel != null">
+        order_channel = #{record.orderChannel,jdbcType=INTEGER},
+      </if>
+      <if test="record.orderRemarks != null">
+        order_remarks = #{record.orderRemarks,jdbcType=VARCHAR},
+      </if>
+      <if test="record.deleteSign != null">
+        delete_sign = #{record.deleteSign,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    update jt_order
+    set order_no = #{record.orderNo,jdbcType=VARCHAR},
+      order_time = #{record.orderTime,jdbcType=TIMESTAMP},
+      aid = #{record.aid,jdbcType=VARCHAR},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      buyer_id = #{record.buyerId,jdbcType=VARCHAR},
+      seller_id = #{record.sellerId,jdbcType=VARCHAR},
+      order_amount = #{record.orderAmount,jdbcType=DECIMAL},
+      pay_amount = #{record.payAmount,jdbcType=DECIMAL},
+      refund_amount = #{record.refundAmount,jdbcType=DECIMAL},
+      pay_type = #{record.payType,jdbcType=INTEGER},
+      order_status = #{record.orderStatus,jdbcType=INTEGER},
+      order_channel = #{record.orderChannel,jdbcType=INTEGER},
+      order_remarks = #{record.orderRemarks,jdbcType=VARCHAR},
+      delete_sign = #{record.deleteSign,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.JtOrder">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    update jt_order
+    <set>
+      <if test="orderTime != null">
+        order_time = #{orderTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="aid != null">
+        aid = #{aid,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="buyerId != null">
+        buyer_id = #{buyerId,jdbcType=VARCHAR},
+      </if>
+      <if test="sellerId != null">
+        seller_id = #{sellerId,jdbcType=VARCHAR},
+      </if>
+      <if test="orderAmount != null">
+        order_amount = #{orderAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="payAmount != null">
+        pay_amount = #{payAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="refundAmount != null">
+        refund_amount = #{refundAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="payType != null">
+        pay_type = #{payType,jdbcType=INTEGER},
+      </if>
+      <if test="orderStatus != null">
+        order_status = #{orderStatus,jdbcType=INTEGER},
+      </if>
+      <if test="orderChannel != null">
+        order_channel = #{orderChannel,jdbcType=INTEGER},
+      </if>
+      <if test="orderRemarks != null">
+        order_remarks = #{orderRemarks,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteSign != null">
+        delete_sign = #{deleteSign,jdbcType=INTEGER},
+      </if>
+    </set>
+    where order_no = #{orderNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.JtOrder">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 18 08:33:51 CST 2018.
+    -->
+    update jt_order
+    set order_time = #{orderTime,jdbcType=TIMESTAMP},
+      aid = #{aid,jdbcType=VARCHAR},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      buyer_id = #{buyerId,jdbcType=VARCHAR},
+      seller_id = #{sellerId,jdbcType=VARCHAR},
+      order_amount = #{orderAmount,jdbcType=DECIMAL},
+      pay_amount = #{payAmount,jdbcType=DECIMAL},
+      refund_amount = #{refundAmount,jdbcType=DECIMAL},
+      pay_type = #{payType,jdbcType=INTEGER},
+      order_status = #{orderStatus,jdbcType=INTEGER},
+      order_channel = #{orderChannel,jdbcType=INTEGER},
+      order_remarks = #{orderRemarks,jdbcType=VARCHAR},
+      delete_sign = #{deleteSign,jdbcType=INTEGER}
+    where order_no = #{orderNo,jdbcType=VARCHAR}
+  </update>
+  <select id="searchJtOrderList" resultType="com.goafanti.order.bo.JtOrderResultDetail">
+  select 
+  jto.order_no as orderNo,
+  jtod.commodity_type as commodityType,
+  jto.order_time as createTime,
+  jto.order_amount as orderAmount,
+  jtod.commodity_name as commodityName,
+  jto.seller_id as sellerId,
+  jto.buyer_id as buyerId,
+  seller.identify_name as sellerName,
+  buyer.identify_name as buyerName,
+  seller.mobile as sellerMobile,
+  jtod.commodity_id as commodityId,
+  buyer.mobile as buyerMobile
+  from jt_order jto
+  left join jt_order_detail jtod on jtod.order_no=jto.order_no
+  left join user seller on seller.id = jto.seller_id
+  left join user buyer on  buyer.id=jto.buyer_id
+  where 1=1
+  <if test="sellerId!=null">
+  and jto.seller_id=#{sellerId,jdbcType=VARCHAR}
+  </if>
+  <if test="buyerId!=null">
+  and jto.buyer_id=#{buyerId,jdbcType=VARCHAR}
+  </if>
+   <if test="sellerName!=null">
+  and  ((seller.identify_name is not null and seller.identify_name like concat("%",#{sellerName,jdbcType=VARCHAR},"%")) or (seller.identify_name is null and  #{sellerName,jdbcType=VARCHAR}=''))
+  </if>
+   <if test="buyerName!=null">
+  and (( buyer.identify_name is not null and buyer.identify_name like concat("%",#{buyerName,jdbcType=VARCHAR},"%")) or  (buyer.identify_name is null and  #{buyerName,jdbcType=VARCHAR}=''))
+  </if>
+  <if test="orderNo!=null">
+   and  jto.order_no like concat("%",#{orderNo,jdbcType=VARCHAR},"%")
+  </if>
+  <if test="commodityName!=null">
+     and  jtod.commodity_name like concat("%",#{commodityName,jdbcType=VARCHAR},"%")
+  </if>
+  <if test="startCreateDate!=null">
+    and	jto.order_time <![CDATA[ >= ]]> #{startCreateDate,jdbcType=TIMESTAMP}
+  </if>
+    <if test="endCreateDate!=null">
+    and	jto.order_time <![CDATA[ <= ]]> #{endCreateDate,jdbcType=TIMESTAMP}
+  </if>
+  <if test="orderType!=null ">
+  and (jtod.commodity_type=#{orderType,jdbcType=INTEGER} or (#{orderType,jdbcType=INTEGER}=10 and (jtod.commodity_type=1 or jtod.commodity_type=0)))
+  </if>
+<if test="page_sql!=null">
+			${page_sql}
+		</if>
+  </select>
+  
+    <select id="searchJtOrderListCount" resultType="java.lang.Integer">
+  select 
+count(0)
+ from jt_order jto
+  left join jt_order_detail jtod on jtod.order_no=jto.order_no
+  left join user seller on seller.id = jto.seller_id
+  left join user buyer on  buyer.id=jto.buyer_id
+  where 1=1
+  <if test="sellerId!=null">
+  and jto.seller_id=#{sellerId,jdbcType=VARCHAR}
+  </if>
+  <if test="buyerId!=null">
+  and jto.buyer_id=#{buyerId,jdbcType=VARCHAR}
+  </if>
+  <if test="sellerName!=null">
+  and  ((seller.identify_name is not null and seller.identify_name like concat("%",#{sellerName,jdbcType=VARCHAR},"%")) or (seller.identify_name is null and  #{sellerName,jdbcType=VARCHAR}=''))
+  </if>
+   <if test="buyerName!=null">
+  and (( buyer.identify_name is not null and buyer.identify_name like concat("%",#{buyerName,jdbcType=VARCHAR},"%")) or  (buyer.identify_name is null and  #{buyerName,jdbcType=VARCHAR}=''))
+  </if>
+  <if test="orderNo!=null">
+   and  jto.order_no like concat("%",#{orderNo,jdbcType=VARCHAR},"%")
+  </if>
+  <if test="commodityName!=null">
+     and  jtod.commodity_name like concat("%",#{commodityName,jdbcType=VARCHAR},"%")
+  </if>
+  <if test="startCreateDate!=null">
+    and	jto.order_time <![CDATA[ >= ]]> #{startCreateDate,jdbcType=TIMESTAMP}
+  </if>
+    <if test="endCreateDate!=null">
+    and	jto.order_time <![CDATA[ <= ]]> #{endCreateDate,jdbcType=TIMESTAMP}
+  </if>
+  <if test="orderType!=null ">
+  and (jtod.commodity_type=#{orderType,jdbcType=INTEGER} or (#{orderType,jdbcType=INTEGER}=10 and (jtod.commodity_type=1 or jtod.commodity_type=0)))
+  </if>
+  </select>
+</mapper>

+ 2 - 2
src/main/java/com/goafanti/common/mapper/NewsMapper.xml

@@ -266,11 +266,11 @@
 			release_date as releaseDate
 		from news a
 		where
-		a.type != 1 and a.type != 2
+		(a.type = 0 or a.type = 99 or a.type =98)
 		<if test="provinceId != null">
 			and a.province_id = #{provinceId,jdbcType=INTEGER}
 		</if>
-		<if test="type != null and type != 0 " >
+		<if test="type != null" >
 			and a.type = #{type,jdbcType=INTEGER}
 		</if>
 		<!-- 

+ 1 - 1
src/main/java/com/goafanti/common/mapper/NewsMapperExt.xml

@@ -75,7 +75,7 @@
   	<if test="publishPage !=null">
   	left join news_publish np on np.news_id= n.id
   	</if>
-  	where 1 =1
+  	where (n.type =0 or n.type=98 or n.type=99)
   	<if test="publishPage !=null">
   	and np.publish_page =#{publishPage,jdbcType=VARCHAR}
   	</if>

+ 7 - 3
src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml

@@ -234,7 +234,7 @@
       tax_authority, ratepay_method, high_tech_zone, 
       risk_investment, business_scope, high_tech_name, 
       patent_prory_statement_url, international, 
-      review_instructions, investment)
+      review_instructions, investment,honor_picture)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR}, 
       #{contactMobile,jdbcType=VARCHAR}, #{fixedTel,jdbcType=VARCHAR}, #{qq,jdbcType=VARCHAR}, 
       #{postalAddress,jdbcType=VARCHAR}, #{postcode,jdbcType=VARCHAR}, #{unitName,jdbcType=VARCHAR}, 
@@ -256,7 +256,7 @@
       #{taxAuthority,jdbcType=INTEGER}, #{ratepayMethod,jdbcType=INTEGER}, #{highTechZone,jdbcType=INTEGER}, 
       #{riskInvestment,jdbcType=INTEGER}, #{businessScope,jdbcType=VARCHAR}, #{highTechName,jdbcType=VARCHAR}, 
       #{patentProryStatementUrl,jdbcType=VARCHAR}, #{international,jdbcType=INTEGER}, 
-      #{reviewInstructions,jdbcType=VARCHAR}, #{investment,jdbcType=INTEGER})
+      #{reviewInstructions,jdbcType=VARCHAR}, #{investment,jdbcType=INTEGER},#{honorPicture,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OrganizationIdentity">
     <!--
@@ -1129,6 +1129,9 @@
       <if test="investment != null">
         investment = #{investment,jdbcType=INTEGER},
       </if>
+      <if test="honorPicture !=null">
+      honor_picture=#{honorPicture,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -1239,7 +1242,8 @@
 			b.fixed_tel as fixedTel,
 			b.org_code_url as orgCodeUrl,
 			b.org_code as orgCode,
-			b.business_scope as businessScope
+			b.business_scope as businessScope,
+			b.honor_picture as honorPicture
 		from
 			user a left join organization_identity b on
 			a.id = b.uid

+ 236 - 301
src/main/java/com/goafanti/common/model/JtBusinessCategory.java

@@ -1,302 +1,237 @@
-package com.goafanti.common.model;
-
-import java.util.Date;
-
-public class JtBusinessCategory {
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jt_business_category.id
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    private String id;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jt_business_category.name
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    private String name;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jt_business_category.summary
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    private String summary;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jt_business_category.number
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    private String number;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jt_business_category.create_time
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    private Date createTime;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jt_business_category.super_id
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    private String superId;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jt_business_category.img_url
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    private String imgUrl;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jt_business_category.layer
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    private Integer layer;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jt_business_category.sort
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    private Integer sort;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jt_business_category.id
-     *
-     * @return the value of jt_business_category.id
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jt_business_category.id
-     *
-     * @param id the value for jt_business_category.id
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jt_business_category.name
-     *
-     * @return the value of jt_business_category.name
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jt_business_category.name
-     *
-     * @param name the value for jt_business_category.name
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jt_business_category.summary
-     *
-     * @return the value of jt_business_category.summary
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    public String getSummary() {
-        return summary;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jt_business_category.summary
-     *
-     * @param summary the value for jt_business_category.summary
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    public void setSummary(String summary) {
-        this.summary = summary;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jt_business_category.number
-     *
-     * @return the value of jt_business_category.number
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    public String getNumber() {
-        return number;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jt_business_category.number
-     *
-     * @param number the value for jt_business_category.number
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    public void setNumber(String number) {
-        this.number = number;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jt_business_category.create_time
-     *
-     * @return the value of jt_business_category.create_time
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jt_business_category.create_time
-     *
-     * @param createTime the value for jt_business_category.create_time
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jt_business_category.super_id
-     *
-     * @return the value of jt_business_category.super_id
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    public String getSuperId() {
-        return superId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jt_business_category.super_id
-     *
-     * @param superId the value for jt_business_category.super_id
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    public void setSuperId(String superId) {
-        this.superId = superId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jt_business_category.img_url
-     *
-     * @return the value of jt_business_category.img_url
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    public String getImgUrl() {
-        return imgUrl;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jt_business_category.img_url
-     *
-     * @param imgUrl the value for jt_business_category.img_url
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    public void setImgUrl(String imgUrl) {
-        this.imgUrl = imgUrl;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jt_business_category.layer
-     *
-     * @return the value of jt_business_category.layer
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    public Integer getLayer() {
-        return layer;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jt_business_category.layer
-     *
-     * @param layer the value for jt_business_category.layer
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    public void setLayer(Integer layer) {
-        this.layer = layer;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jt_business_category.sort
-     *
-     * @return the value of jt_business_category.sort
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    public Integer getSort() {
-        return sort;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jt_business_category.sort
-     *
-     * @param sort the value for jt_business_category.sort
-     *
-     * @mbg.generated Wed Jun 20 11:08:54 CST 2018
-     */
-    public void setSort(Integer sort) {
-        this.sort = sort;
-    }
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class JtBusinessCategory {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_business_category.id
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	private String id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_business_category.name
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	private String name;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_business_category.summary
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	private String summary;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_business_category.number
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	private String number;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_business_category.create_time
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_business_category.super_id
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	private String superId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_business_category.img_url
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	private String imgUrl;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_business_category.layer
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	private Integer layer;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_business_category.sort
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	private Integer sort;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column jt_business_category.module
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	private Integer module;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_business_category.id
+	 * @return  the value of jt_business_category.id
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_business_category.id
+	 * @param id  the value for jt_business_category.id
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_business_category.name
+	 * @return  the value of jt_business_category.name
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_business_category.name
+	 * @param name  the value for jt_business_category.name
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_business_category.summary
+	 * @return  the value of jt_business_category.summary
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	public String getSummary() {
+		return summary;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_business_category.summary
+	 * @param summary  the value for jt_business_category.summary
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	public void setSummary(String summary) {
+		this.summary = summary;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_business_category.number
+	 * @return  the value of jt_business_category.number
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	public String getNumber() {
+		return number;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_business_category.number
+	 * @param number  the value for jt_business_category.number
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	public void setNumber(String number) {
+		this.number = number;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_business_category.create_time
+	 * @return  the value of jt_business_category.create_time
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_business_category.create_time
+	 * @param createTime  the value for jt_business_category.create_time
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_business_category.super_id
+	 * @return  the value of jt_business_category.super_id
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	public String getSuperId() {
+		return superId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_business_category.super_id
+	 * @param superId  the value for jt_business_category.super_id
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	public void setSuperId(String superId) {
+		this.superId = superId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_business_category.img_url
+	 * @return  the value of jt_business_category.img_url
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	public String getImgUrl() {
+		return imgUrl;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_business_category.img_url
+	 * @param imgUrl  the value for jt_business_category.img_url
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	public void setImgUrl(String imgUrl) {
+		this.imgUrl = imgUrl;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_business_category.layer
+	 * @return  the value of jt_business_category.layer
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	public Integer getLayer() {
+		return layer;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_business_category.layer
+	 * @param layer  the value for jt_business_category.layer
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	public void setLayer(Integer layer) {
+		this.layer = layer;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_business_category.sort
+	 * @return  the value of jt_business_category.sort
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	public Integer getSort() {
+		return sort;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_business_category.sort
+	 * @param sort  the value for jt_business_category.sort
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	public void setSort(Integer sort) {
+		this.sort = sort;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column jt_business_category.module
+	 * @return  the value of jt_business_category.module
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	public Integer getModule() {
+		return module;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column jt_business_category.module
+	 * @param module  the value for jt_business_category.module
+	 * @mbg.generated  Tue Jul 17 09:14:43 CST 2018
+	 */
+	public void setModule(Integer module) {
+		this.module = module;
+	}
 }

Разница между файлами не показана из-за своего большого размера
+ 921 - 902
src/main/java/com/goafanti/common/model/JtBusinessCategoryExample.java


+ 468 - 0
src/main/java/com/goafanti/common/model/JtOrder.java

@@ -0,0 +1,468 @@
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class JtOrder {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jt_order.order_no
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    private String orderNo;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jt_order.order_time
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    private Date orderTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jt_order.aid
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    private String aid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jt_order.update_time
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    private Date updateTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jt_order.buyer_id
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    private String buyerId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jt_order.seller_id
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    private String sellerId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jt_order.order_amount
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    private BigDecimal orderAmount;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jt_order.pay_amount
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    private BigDecimal payAmount;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jt_order.refund_amount
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    private BigDecimal refundAmount;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jt_order.pay_type
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    private Integer payType;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jt_order.order_status
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    private Integer orderStatus;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jt_order.order_channel
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    private Integer orderChannel;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jt_order.order_remarks
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    private String orderRemarks;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jt_order.delete_sign
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    private Integer deleteSign;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jt_order.order_no
+     *
+     * @return the value of jt_order.order_no
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jt_order.order_no
+     *
+     * @param orderNo the value for jt_order.order_no
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jt_order.order_time
+     *
+     * @return the value of jt_order.order_time
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public Date getOrderTime() {
+        return orderTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jt_order.order_time
+     *
+     * @param orderTime the value for jt_order.order_time
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public void setOrderTime(Date orderTime) {
+        this.orderTime = orderTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jt_order.aid
+     *
+     * @return the value of jt_order.aid
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public String getAid() {
+        return aid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jt_order.aid
+     *
+     * @param aid the value for jt_order.aid
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public void setAid(String aid) {
+        this.aid = aid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jt_order.update_time
+     *
+     * @return the value of jt_order.update_time
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jt_order.update_time
+     *
+     * @param updateTime the value for jt_order.update_time
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jt_order.buyer_id
+     *
+     * @return the value of jt_order.buyer_id
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public String getBuyerId() {
+        return buyerId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jt_order.buyer_id
+     *
+     * @param buyerId the value for jt_order.buyer_id
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public void setBuyerId(String buyerId) {
+        this.buyerId = buyerId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jt_order.seller_id
+     *
+     * @return the value of jt_order.seller_id
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public String getSellerId() {
+        return sellerId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jt_order.seller_id
+     *
+     * @param sellerId the value for jt_order.seller_id
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public void setSellerId(String sellerId) {
+        this.sellerId = sellerId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jt_order.order_amount
+     *
+     * @return the value of jt_order.order_amount
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public BigDecimal getOrderAmount() {
+        return orderAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jt_order.order_amount
+     *
+     * @param orderAmount the value for jt_order.order_amount
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public void setOrderAmount(BigDecimal orderAmount) {
+        this.orderAmount = orderAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jt_order.pay_amount
+     *
+     * @return the value of jt_order.pay_amount
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public BigDecimal getPayAmount() {
+        return payAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jt_order.pay_amount
+     *
+     * @param payAmount the value for jt_order.pay_amount
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public void setPayAmount(BigDecimal payAmount) {
+        this.payAmount = payAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jt_order.refund_amount
+     *
+     * @return the value of jt_order.refund_amount
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public BigDecimal getRefundAmount() {
+        return refundAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jt_order.refund_amount
+     *
+     * @param refundAmount the value for jt_order.refund_amount
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public void setRefundAmount(BigDecimal refundAmount) {
+        this.refundAmount = refundAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jt_order.pay_type
+     *
+     * @return the value of jt_order.pay_type
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public Integer getPayType() {
+        return payType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jt_order.pay_type
+     *
+     * @param payType the value for jt_order.pay_type
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public void setPayType(Integer payType) {
+        this.payType = payType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jt_order.order_status
+     *
+     * @return the value of jt_order.order_status
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public Integer getOrderStatus() {
+        return orderStatus;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jt_order.order_status
+     *
+     * @param orderStatus the value for jt_order.order_status
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public void setOrderStatus(Integer orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jt_order.order_channel
+     *
+     * @return the value of jt_order.order_channel
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public Integer getOrderChannel() {
+        return orderChannel;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jt_order.order_channel
+     *
+     * @param orderChannel the value for jt_order.order_channel
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public void setOrderChannel(Integer orderChannel) {
+        this.orderChannel = orderChannel;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jt_order.order_remarks
+     *
+     * @return the value of jt_order.order_remarks
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public String getOrderRemarks() {
+        return orderRemarks;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jt_order.order_remarks
+     *
+     * @param orderRemarks the value for jt_order.order_remarks
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public void setOrderRemarks(String orderRemarks) {
+        this.orderRemarks = orderRemarks;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jt_order.delete_sign
+     *
+     * @return the value of jt_order.delete_sign
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public Integer getDeleteSign() {
+        return deleteSign;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jt_order.delete_sign
+     *
+     * @param deleteSign the value for jt_order.delete_sign
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public void setDeleteSign(Integer deleteSign) {
+        this.deleteSign = deleteSign;
+    }
+}

+ 369 - 0
src/main/java/com/goafanti/common/model/JtOrderDetail.java

@@ -0,0 +1,369 @@
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class JtOrderDetail {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jt_order_detail.id
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jt_order_detail.order_no
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    private String orderNo;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jt_order_detail.commodity_id
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    private String commodityId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jt_order_detail.commodity_name
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    private String commodityName;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jt_order_detail.commodity_quantity
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    private Integer commodityQuantity;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jt_order_detail.commodity_price
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    private BigDecimal commodityPrice;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jt_order_detail.commodity_type
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    private Integer commodityType;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jt_order_detail.commodity_mode
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    private String commodityMode;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jt_order_detail.discount_price
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    private BigDecimal discountPrice;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jt_order_detail.member_price
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    private BigDecimal memberPrice;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jt_order_detail.create_time
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    private Date createTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jt_order_detail.id
+     *
+     * @return the value of jt_order_detail.id
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jt_order_detail.id
+     *
+     * @param id the value for jt_order_detail.id
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jt_order_detail.order_no
+     *
+     * @return the value of jt_order_detail.order_no
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jt_order_detail.order_no
+     *
+     * @param orderNo the value for jt_order_detail.order_no
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jt_order_detail.commodity_id
+     *
+     * @return the value of jt_order_detail.commodity_id
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public String getCommodityId() {
+        return commodityId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jt_order_detail.commodity_id
+     *
+     * @param commodityId the value for jt_order_detail.commodity_id
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public void setCommodityId(String commodityId) {
+        this.commodityId = commodityId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jt_order_detail.commodity_name
+     *
+     * @return the value of jt_order_detail.commodity_name
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public String getCommodityName() {
+        return commodityName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jt_order_detail.commodity_name
+     *
+     * @param commodityName the value for jt_order_detail.commodity_name
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public void setCommodityName(String commodityName) {
+        this.commodityName = commodityName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jt_order_detail.commodity_quantity
+     *
+     * @return the value of jt_order_detail.commodity_quantity
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public Integer getCommodityQuantity() {
+        return commodityQuantity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jt_order_detail.commodity_quantity
+     *
+     * @param commodityQuantity the value for jt_order_detail.commodity_quantity
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public void setCommodityQuantity(Integer commodityQuantity) {
+        this.commodityQuantity = commodityQuantity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jt_order_detail.commodity_price
+     *
+     * @return the value of jt_order_detail.commodity_price
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public BigDecimal getCommodityPrice() {
+        return commodityPrice;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jt_order_detail.commodity_price
+     *
+     * @param commodityPrice the value for jt_order_detail.commodity_price
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public void setCommodityPrice(BigDecimal commodityPrice) {
+        this.commodityPrice = commodityPrice;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jt_order_detail.commodity_type
+     *
+     * @return the value of jt_order_detail.commodity_type
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public Integer getCommodityType() {
+        return commodityType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jt_order_detail.commodity_type
+     *
+     * @param commodityType the value for jt_order_detail.commodity_type
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public void setCommodityType(Integer commodityType) {
+        this.commodityType = commodityType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jt_order_detail.commodity_mode
+     *
+     * @return the value of jt_order_detail.commodity_mode
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public String getCommodityMode() {
+        return commodityMode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jt_order_detail.commodity_mode
+     *
+     * @param commodityMode the value for jt_order_detail.commodity_mode
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public void setCommodityMode(String commodityMode) {
+        this.commodityMode = commodityMode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jt_order_detail.discount_price
+     *
+     * @return the value of jt_order_detail.discount_price
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public BigDecimal getDiscountPrice() {
+        return discountPrice;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jt_order_detail.discount_price
+     *
+     * @param discountPrice the value for jt_order_detail.discount_price
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public void setDiscountPrice(BigDecimal discountPrice) {
+        this.discountPrice = discountPrice;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jt_order_detail.member_price
+     *
+     * @return the value of jt_order_detail.member_price
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public BigDecimal getMemberPrice() {
+        return memberPrice;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jt_order_detail.member_price
+     *
+     * @param memberPrice the value for jt_order_detail.member_price
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public void setMemberPrice(BigDecimal memberPrice) {
+        this.memberPrice = memberPrice;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jt_order_detail.create_time
+     *
+     * @return the value of jt_order_detail.create_time
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jt_order_detail.create_time
+     *
+     * @param createTime the value for jt_order_detail.create_time
+     *
+     * @mbg.generated Wed Jul 18 08:33:51 CST 2018
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

Разница между файлами не показана из-за своего большого размера
+ 1014 - 0
src/main/java/com/goafanti/common/model/JtOrderDetailExample.java


Разница между файлами не показана из-за своего большого размера
+ 1194 - 0
src/main/java/com/goafanti/common/model/JtOrderExample.java


+ 10 - 0
src/main/java/com/goafanti/common/model/OrganizationIdentity.java

@@ -321,6 +321,16 @@ public class OrganizationIdentity {
 	 */
 	private Integer investment;
 
+	private String honorPicture;
+	
+	public String getHonorPicture() {
+		return honorPicture;
+	}
+
+	public void setHonorPicture(String honorPicture) {
+		this.honorPicture = honorPicture;
+	}
+
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_identity.id
 	 * @return  the value of organization_identity.id

+ 1 - 1
src/main/java/com/goafanti/common/utils/FileUtils.java

@@ -97,7 +97,7 @@ public class FileUtils {
 		String suffix = mf.getOriginalFilename().substring(mf.getOriginalFilename().lastIndexOf("."));
 		boolean uniq = false;
 		if (sign.indexOf("demand_picture") != -1|| sign.indexOf("achievement_picture") != -1 || sign.indexOf("user_picture")!=-1
-				|| sign.indexOf("jt_project_picture")!=-1 || sign.indexOf("jt_business_picture")!=-1) {
+				|| sign.indexOf("jt_project_picture")!=-1 || sign.indexOf("jt_business_picture")!=-1 || sign.indexOf("honor_picture")!=-1) {
 			uniq = true;
 		}
 		String fileName = "";

+ 2 - 1
src/main/java/com/goafanti/news/controller/AdminNewsApiController.java

@@ -67,7 +67,7 @@ public class AdminNewsApiController extends BaseApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(newsService.listNews(type, title, author, startCreateTime, endCreateTime, source, hot, pNo, pSize,auditStatus,releaseStatus,publishPage));
+		res.setData(newsService.listNews(type, title, author, startCreateTime, endCreateTime, source, hot, pNo, pSize,auditStatus,releaseStatus,publishPage)); 
 		return res;
 	}
 
@@ -110,6 +110,7 @@ public Result apply(InputNews news,BindingResult bindingResult,String[] publishP
 		}
 		news.setId(idGenerator.generateId());
 		News news2=new News();
+		if(news.getType()==null)
 		news.setType(0);
 		BeanUtils.copyProperties(news, news2);
 		result.setData(newsService.save( news2,webPages,appPages)); 

+ 71 - 0
src/main/java/com/goafanti/order/bo/JtOrderInput.java

@@ -0,0 +1,71 @@
+package com.goafanti.order.bo;
+
+import java.util.List;
+
+public class JtOrderInput {
+	List<JtSingleOrder>list;
+
+	public List<JtSingleOrder> getList() {
+		return list;
+	}
+
+	public void setList(List<JtSingleOrder> list) {
+		this.list = list;
+	}
+
+	public static class JtSingleOrder{
+		String commodityId;
+		Integer commodityQuantity;
+		Integer commodityType;
+		String orderRemarks;
+		Integer orderChannel;
+		Integer payType;
+		String commodityMode;
+		public String getCommodityId() {
+			return commodityId;
+		}
+		public void setCommodityId(String commodityId) {
+			this.commodityId = commodityId;
+		}
+		public Integer getCommodityQuantity() {
+			return commodityQuantity;
+		}
+		public void setCommodityQuantity(Integer commodityQuantity) {
+			this.commodityQuantity = commodityQuantity;
+		}
+		public Integer getCommodityType() {
+			return commodityType;
+		}
+		public void setCommodityType(Integer commodityType) {
+			this.commodityType = commodityType;
+		}
+		public String getOrderRemarks() {
+			return orderRemarks;
+		}
+		public void setOrderRemarks(String orderRemarks) {
+			this.orderRemarks = orderRemarks;
+		}
+		public Integer getOrderChannel() {
+			return orderChannel;
+		}
+		public void setOrderChannel(Integer orderChannel) {
+			this.orderChannel = orderChannel;
+		}
+		public Integer getPayType() {
+			return payType;
+		}
+		public void setPayType(Integer payType) {
+			this.payType = payType;
+		}
+		public String getCommodityMode() {
+			return commodityMode;
+		}
+		public void setCommodityMode(String commodityMode) {
+			this.commodityMode = commodityMode;
+		}
+	
+		
+		
+	}
+
+}

+ 94 - 0
src/main/java/com/goafanti/order/bo/JtOrderResultDetail.java

@@ -0,0 +1,94 @@
+package com.goafanti.order.bo;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class JtOrderResultDetail {
+	String orderNo;
+	Integer commodityType;
+	Date createTime;
+	BigDecimal orderAmount;
+	String commodityName;
+	String sellerId;
+	String sellerName;
+	String sellerMobile;
+	String buyerId;
+	String buyerName;
+	String buyerMobile;
+	String commodityId;
+	
+	public String getCommodityId() {
+		return commodityId;
+	}
+	public void setCommodityId(String commodityId) {
+		this.commodityId = commodityId;
+	}
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+	public Integer getCommodityType() {
+		return commodityType;
+	}
+	public void setCommodityType(Integer commodityType) {
+		this.commodityType = commodityType;
+	}
+	public Date getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	public BigDecimal getOrderAmount() {
+		return orderAmount;
+	}
+	public void setOrderAmount(BigDecimal orderAmount) {
+		this.orderAmount = orderAmount;
+	}
+	public String getCommodityName() {
+		return commodityName;
+	}
+	public void setCommodityName(String commodityName) {
+		this.commodityName = commodityName;
+	}
+	public String getSellerId() {
+		return sellerId;
+	}
+	public void setSellerId(String sellerId) {
+		this.sellerId = sellerId;
+	}
+	public String getSellerName() {
+		return sellerName;
+	}
+	public void setSellerName(String sellerName) {
+		this.sellerName = sellerName;
+	}
+	public String getSellerMobile() {
+		return sellerMobile;
+	}
+	public void setSellerMobile(String sellerMobile) {
+		this.sellerMobile = sellerMobile;
+	}
+	public String getBuyerId() {
+		return buyerId;
+	}
+	public void setBuyerId(String buyerId) {
+		this.buyerId = buyerId;
+	}
+	public String getBuyerName() {
+		return buyerName;
+	}
+	public void setBuyerName(String buyerName) {
+		this.buyerName = buyerName;
+	}
+	public String getBuyerMobile() {
+		return buyerMobile;
+	}
+	public void setBuyerMobile(String buyerMobile) {
+		this.buyerMobile = buyerMobile;
+	}
+	
+
+}

+ 33 - 0
src/main/java/com/goafanti/order/controller/AdminJtOrderController.java

@@ -0,0 +1,33 @@
+package com.goafanti.order.controller;
+
+import java.util.Date;
+
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.order.service.JtOrderService;
+
+@RestController
+@RequestMapping(value = "/api/admin/jtOrder")
+public class AdminJtOrderController extends BaseApiController{
+	@Resource
+	JtOrderService jtOrderService;
+	/*
+	 * userType-----0-购买者   1-出售者  2-管理员
+	 * 
+	 * */
+	@RequestMapping(value="/list",method = RequestMethod.GET)
+	public Result getMyJtOrderList(Integer orderType,String orderNo,Date startCreateDate,Date endCreateDate,String sellerName,String buyerName,String commodityName,Integer pageNo,Integer pageSize) {
+		Result result=new Result();
+		
+		result.setData(jtOrderService.searchOrderList(orderType,orderNo, startCreateDate, endCreateDate, sellerName, buyerName, commodityName, 2, pageNo, pageSize));  
+		return result;
+	}
+
+}

+ 64 - 0
src/main/java/com/goafanti/order/controller/UserJtOrderController.java

@@ -0,0 +1,64 @@
+package com.goafanti.order.controller;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.order.bo.JtOrderInput;
+import com.goafanti.order.bo.JtOrderInput.JtSingleOrder;
+import com.goafanti.order.service.JtOrderService;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+
+@RestController
+@RequestMapping(value = "/api/user/jtOrder")
+public class UserJtOrderController extends BaseApiController {
+	@Resource
+	JtOrderService jtOrderService;
+	
+	@RequestMapping(value="/apply",method = RequestMethod.POST)
+	public Result addNewOrder(String orderList) {
+		Result result=new Result();
+		Gson gson=new Gson();
+		List<JtSingleOrder>orders=gson.fromJson(orderList,new TypeToken<ArrayList<JtSingleOrder>>() {}.getType());
+		if(orders==null || orders.size()<=0) {result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","列表不符合规范,")); return result;}
+		int addRes=jtOrderService.addOrder(orders);
+		if(addRes>=0) {result.setData("提交成功");return result;}
+		else if(addRes==-1) {
+			result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","商品id,")); return result;
+		}
+		else if(addRes==-2) {
+			result.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","商品类别,")); return result;
+		}
+		else if(addRes==-3) {
+			result.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","提交渠道,")); return result;
+		}
+		result.setData(orders);
+		return result;
+	} 
+	
+	/*
+	 * userType-----0-购买者   1-出售者  2-管理员
+	 * 
+	 * */
+	@RequestMapping(value="/list",method = RequestMethod.GET)
+	public Result getMyJtOrderList(Integer orderType,String orderNo,Date startCreateDate,Date endCreateDate,String sellerName,String buyerName,String commodityName,Integer userType,Integer pageNo,Integer pageSize) {
+		Result result=new Result();
+		if(userType==null || userType>1 || userType<0) { 
+			result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","用户类型错误"));
+			return result;
+		}
+		result.setData(jtOrderService.searchOrderList(orderType,orderNo, startCreateDate, endCreateDate, sellerName, buyerName, commodityName, userType, pageNo, pageSize)); 
+		return result;
+	}
+
+}

+ 15 - 0
src/main/java/com/goafanti/order/service/JtOrderService.java

@@ -0,0 +1,15 @@
+package com.goafanti.order.service;
+
+import java.util.Date;
+import java.util.List;
+
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.order.bo.JtOrderInput.JtSingleOrder;
+import com.goafanti.order.bo.JtOrderResultDetail;
+
+public interface JtOrderService {
+	int addOrder(List<JtSingleOrder>orderList); 
+	
+	Pagination<JtOrderResultDetail>searchOrderList(Integer orderType,String orderNo,Date startCreateDate,Date endCreateDate,String sellerName,String buyerName,String commodityName,Integer userType,Integer pageNo,Integer pageSize);
+
+}

+ 191 - 0
src/main/java/com/goafanti/order/service/impl/JtOrderServiceImpl.java

@@ -0,0 +1,191 @@
+package com.goafanti.order.service.impl;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.NativeWebRequest;
+
+import com.goafanti.business.bo.JtBusinessProjectResult;
+import com.goafanti.common.dao.AchievementMapper;
+import com.goafanti.common.dao.DemandMapper;
+import com.goafanti.common.dao.JtBusinessProjectMapper;
+import com.goafanti.common.dao.JtOrderDetailMapper;
+import com.goafanti.common.dao.JtOrderMapper;
+import com.goafanti.common.model.Achievement;
+import com.goafanti.common.model.Demand;
+import com.goafanti.common.model.JtBusinessProject;
+import com.goafanti.common.model.JtOrder;
+import com.goafanti.common.model.JtOrderDetail;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.JDBCIdGenerator;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.news.bo.newsInterestBo;
+import com.goafanti.order.bo.JtOrderInput.JtSingleOrder;
+import com.goafanti.order.bo.JtOrderResultDetail;
+import com.goafanti.order.service.JtOrderService;
+
+@Service
+public class JtOrderServiceImpl extends BaseMybatisDao<JtOrderMapper> implements JtOrderService{
+	@Autowired
+	JtOrderMapper jtOrderMapper;
+	@Autowired
+	JtOrderDetailMapper jtOrderDetailMapper;
+	@Autowired
+	JtBusinessProjectMapper JtBusinessProjectMapper;
+	@Autowired
+	AchievementMapper achievementMapper;
+	@Autowired
+	DemandMapper demandMapper;
+	@Override
+	public int addOrder(List<JtSingleOrder> orderList) {
+		// TODO Auto-generated method stub
+		List<JtOrder>jtOrders=new ArrayList<>();
+		List<JtOrderDetail>jtOrderDetails=new ArrayList<>();
+		for(JtSingleOrder order:orderList)
+		{
+			JtOrder jtOrder=new JtOrder();
+			JtOrderDetail jtOrderDetail=new JtOrderDetail();
+			if(order.getCommodityId()==null)return -1;
+			if(order.getCommodityType()==null || order.getCommodityType()<0 || order.getCommodityType()>=4)return -2;
+			if(order.getOrderChannel()==null)return -3;
+			if(order.getPayType()==null)order.setPayType(0);
+			switch(order.getCommodityType()) {
+			case 0:{
+				JtBusinessProjectResult jtBusinessProject=JtBusinessProjectMapper.selectByPrimaryKeyWithModule(order.getCommodityId());
+				if(jtBusinessProject==null || jtBusinessProject.getModule()!=0)return -1;
+				else {
+					jtOrder.setSellerId(jtBusinessProject.getOwnerId());
+					jtOrderDetail.setCommodityName(jtBusinessProject.getName());
+					if(jtBusinessProject.getPrice()==null) {
+						jtOrder.setOrderAmount(new BigDecimal(0));
+						}
+					else jtOrder.setOrderAmount(jtBusinessProject.getPrice().multiply(new BigDecimal(order.getCommodityQuantity())));
+					jtOrderDetail.setCommodityPrice(jtBusinessProject.getPrice()==null?new BigDecimal(0):jtBusinessProject.getPrice());
+				}
+				break;}
+			case 1:{
+				JtBusinessProjectResult jtBusinessProject=JtBusinessProjectMapper.selectByPrimaryKeyWithModule(order.getCommodityId());
+				if(jtBusinessProject==null || jtBusinessProject.getModule()!=1)return -1;
+				else {
+					jtOrder.setSellerId(jtBusinessProject.getOwnerId());
+					jtOrderDetail.setCommodityName(jtBusinessProject.getName());
+					if(jtBusinessProject.getPrice()==null) {
+						jtOrder.setOrderAmount(new BigDecimal(0));
+						}
+					else jtOrder.setOrderAmount(jtBusinessProject.getPrice().multiply(new BigDecimal(order.getCommodityQuantity())));
+					jtOrderDetail.setCommodityPrice(jtBusinessProject.getPrice()==null?new BigDecimal(0):jtBusinessProject.getPrice());
+				}
+				break;}
+			case 2:{
+				Achievement achievement=achievementMapper.selectByPrimaryKey(order.getCommodityId());
+				if(achievement ==null )return -1;
+				else {
+					jtOrder.setSellerId(achievement.getOwnerId());
+					jtOrderDetail.setCommodityName(achievement.getName());
+					if(achievement.getTransferPrice()==null)jtOrder.setOrderAmount(new BigDecimal(0));
+					else jtOrder.setOrderAmount(achievement.getTransferPrice().multiply(new BigDecimal(order.getCommodityQuantity())));
+					jtOrderDetail.setCommodityPrice(achievement.getTransferPrice()==null?new BigDecimal(0):achievement.getTransferPrice());
+				}
+				break;}
+			case 3:{
+				Demand demand=demandMapper.selectByPrimaryKey(order.getCommodityId());
+				if(demand==null )return -1;
+				else {
+					BigDecimal price=new BigDecimal(0);
+					jtOrder.setSellerId(demand.getEmployerId());
+					jtOrderDetail.setCommodityName(demand.getName());
+					if(demand.getDemandType()==3) {price=demand.getCrowdCost()==null?new BigDecimal(0):demand.getCostEscrow().multiply(new BigDecimal(-1));}
+					else price=demand.getBudgetCost();
+					if(price==null)jtOrder.setOrderAmount(new BigDecimal(0));
+					else jtOrder.setOrderAmount(price.multiply(new BigDecimal(order.getCommodityQuantity())));
+					jtOrderDetail.setCommodityPrice(price==null?new BigDecimal(0):price);
+				}
+				break;}
+			default:break;
+			}
+			JDBCIdGenerator jdbcIdGenerator=new JDBCIdGenerator();
+			String orderNo=jdbcIdGenerator.generateId()+"";
+			jtOrder.setBuyerId(TokenManager.getUserId());
+//			jtOrder.setBuyerId("0549c290-5178-4886-8294-5037f1743b0c");
+			jtOrder.setDeleteSign(0);
+			jtOrder.setOrderChannel(order.getOrderChannel());
+			jtOrder.setOrderNo(orderNo);
+			jtOrder.setOrderRemarks(order.getOrderRemarks());
+			jtOrder.setOrderStatus(0);
+			jtOrder.setOrderTime(new Date());
+			jtOrder.setPayType(order.getPayType());
+			jtOrder.setRefundAmount(new BigDecimal(0));
+			jtOrder.setPayAmount(new BigDecimal(0));
+			jtOrder.setUpdateTime(new Date());
+	
+			
+			jtOrderDetail.setCommodityId(order.getCommodityId());
+			jtOrderDetail.setCommodityMode(order.getCommodityMode());
+			jtOrderDetail.setCommodityQuantity(order.getCommodityQuantity());
+			jtOrderDetail.setCommodityType(order.getCommodityType());
+			jtOrderDetail.setCreateTime(new Date());
+			jtOrderDetail.setDiscountPrice(new BigDecimal(0));
+			jtOrderDetail.setId(UUID.randomUUID().toString());
+			jtOrderDetail.setMemberPrice(new BigDecimal(0));
+			jtOrderDetail.setOrderNo(orderNo);
+	
+			jtOrders.add(jtOrder);
+			jtOrderDetails.add(jtOrderDetail);
+		}
+		for(int i =0;i<jtOrders.size();i++) {
+			jtOrderMapper.insert(jtOrders.get(i));
+			jtOrderDetailMapper.insert(jtOrderDetails.get(i));
+		}
+		return 0;
+	}
+	
+	
+	/*
+	 * userType-----0-购买者   1-出售者  2-管理员
+	 * 
+	 * */
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<JtOrderResultDetail> searchOrderList(Integer orderType ,String orderNo, Date startCreateDate, Date endCreateDate,
+			String sellerName, String buyerName, String commodityName, Integer userType,Integer pageNo,Integer pageSize) {
+		Map<String, Object>params=new HashMap<>();
+		if(pageNo==null ||pageNo<1)pageNo=1;
+		if(pageSize==null || pageSize<1)pageSize=10;
+		String sellerId=null;
+		String buyerId=null;
+		if(userType==0) {
+			//购买者 将买家姓名置空,购买id为当前id进行搜索
+			buyerName=null;
+			buyerId=TokenManager.getUserId();
+			params.put("buyerId", buyerId);
+		}
+		else if(userType==1) {
+			//出售者  将卖家姓名置空,出售者id为当前id进行搜索
+			sellerName=null;
+			sellerId=TokenManager.getUserId();
+			params.put("sellerId", sellerId);
+		}
+		else {
+			//管理员  买卖id均为空,不额外处理买卖房姓名
+		}
+		if(buyerName!=null)params.put("buyerName", buyerName);
+		if(sellerName!=null)params.put("sellerName", sellerName);
+		if(orderNo!=null)params.put("orderNo", orderNo);
+		if(startCreateDate!=null)params.put("startCreateDate", startCreateDate);
+		if(endCreateDate!=null)params.put("endCreateDate", endCreateDate);
+		if(commodityName!=null)params.put("commodityName", commodityName);
+		if(orderType!=null  && ((orderType>=0 && orderType<=3)|| orderType==10))params.put("orderType", orderType);
+			return (Pagination<JtOrderResultDetail>) findPage("searchJtOrderList", "searchJtOrderListCount", params, pageNo, pageSize);
+	}
+	
+	
+
+}

+ 9 - 0
src/main/java/com/goafanti/user/bo/InputOrganizationIdentity.java

@@ -191,6 +191,15 @@ public class InputOrganizationIdentity {
 	@Size(min = 0, max = 512, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String introduction;
 	
+	private String honorPicture;
+	public String getHonorPicture() {
+		return honorPicture;
+	}
+
+	public void setHonorPicture(String honorPicture) {
+		this.honorPicture = honorPicture;
+	}
+
 	public String getId() {
 		return id;
 	}

+ 14 - 0
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -877,4 +877,18 @@ public class UserApiController extends BaseApiController {
         }
         return res;
     }
+    
+	@RequestMapping(value = "/uploadHonerPicture", method = RequestMethod.POST)
+	public Result uploadHonerPicture(HttpServletRequest req, String sign) {
+		Result res = new Result();
+		AttachmentType attachmentType = AttachmentType.getField(sign);
+
+		if (attachmentType == AttachmentType.HONOR_PICTURE
+				) {
+			res.setData(handleFiles(res, "/honorPicture/", false, req, sign, ""));
+		} else {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "图片"));
+		}
+		return res;
+	}
 }

Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceDetails.html


+ 2 - 0
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html

@@ -56,9 +56,11 @@
                         <li>
                             <a href="#patentTitle">专利技术</a>
                         </li>
+                        <li>/</li>
                         <li>
                             <a href="#practicalTitle">实用技术</a>
                         </li>
+                        <li>/</li>
                         <li>
                             <a href="#transactionTitle">知识产权交易政策</a>
                         </li>

+ 4 - 4
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementDetail.html

@@ -30,7 +30,7 @@
 			<div class="detail_center">
 				<div class="detail_centerimg" th:each="achievementdetail:${achievementdetail}">
 					<div class="big_text">
-						<h3 th:text="${achievementdetail.name}"></h3>
+						<h3 th:text="${achievementdetail.name}" type="2"  class="orderType"></h3>
 					</div>
 					<div class="big_img">
 						<div th:if="${achievementdetail.firstPicture} == null ">
@@ -39,9 +39,9 @@
 						<div th:if="${achievementdetail.firstPicture} != null ">
 							<img th:src= "${avatarUploadHost+achievementdetail.firstPicture}"alt=""  />
 						</div>
-<!-- 						     <div class="collection"> -->
-<!--              <p><span class="heart"></span><span>收藏</span></p> -->
-<!--         </div> -->
+						     <div class="collection">
+             <p><span class="heart"></span><span>收藏</span></p>
+        </div>
 					</div>
 					<div class="basic">
 						<div class="inline_span">

+ 2 - 0
src/main/webapp/WEB-INF/views/portal/technologyTrading/demand.html

@@ -56,7 +56,9 @@
 					<ol>
 						<li><a href="#technology">企业技术需求</a></li>
 <!-- 						<li><a href="#industry">地区产业需求</a></li> -->
+						 <li>/</li>
 						<li><a href="#study">产学研合作需求</a></li>
+						 <li>/</li>
 <!-- 						<li><a href="#capital">研产资金需求</a></li> -->
 						<li><a href="#personnel">技术人才需求</a></li>
 					</ol>

+ 4 - 4
src/main/webapp/WEB-INF/views/portal/technologyTrading/demandDetail.html

@@ -23,7 +23,7 @@
 			<div class="detail_center">
 				<div class="detail_centerimg" th:each="demand:${demand}">
 					<div class="big_text">
-						<h3 th:text="${#strings.abbreviate(demand.name,11)}"></h3>
+						<h3 th:text="${#strings.abbreviate(demand.name,11)}" type="3"  class="orderType"></h3>
 					</div>
 					<div class="big_img">
 						<div th:if="${demand.firstPic} == null " >
@@ -32,9 +32,9 @@
 						<div th:if="${demand.firstPic} != null " >
 							<img th:src= "${avatarUploadHost+demand.firstPic}"alt="" />
 						</div>
-<!-- 						<div class="collection"> -->
-<!-- 				             <p><span class="heart"></span><span>收藏</span></p> -->
-<!-- 				        </div> -->
+						<div class="collection">
+				             <p><span class="heart"></span><span>收藏</span></p>
+				        </div>
 					</div>
 					<div class="basic">
 						<div>

+ 3 - 3
src/main/webapp/WEB-INF/views/user/subscriberDetail.html

@@ -39,9 +39,9 @@
 						th:src="${portalHost + '/img/initPic/policyInit.jpg'}"
 						alt="" />
 			</div>
-<!-- 			<div class="collection"> -->
-<!--             	 <p><span class="heart"></span><span>收藏</span></p> -->
-<!--        		</div> -->
+			<div class="collection">
+            	 <p><span class="heart"></span><span>收藏</span></p>
+       		</div>
 		</div>
 		<div class="basc_p">
 			<h4>关于智者</h4>