Просмотр исходного кода

Merge branch 'master' of https://git.coding.net/aft/AFT.git

zou_ht лет назад: 8
Родитель
Сommit
b0eb1854cd
24 измененных файлов с 1057 добавлено и 991 удалено
  1. 10 0
      schema/20170918-achievement-order-change.sql
  2. 91 56
      src/main/java/com/goafanti/achievement/bo/AchievementOrderListBo.java
  3. 33 50
      src/main/java/com/goafanti/achievement/bo/InputAchievementOrder.java
  4. 1 1
      src/main/java/com/goafanti/achievement/controller/AchievementApiController.java
  5. 7 4
      src/main/java/com/goafanti/achievement/service/impl/AchievementOrderServiceImpl.java
  6. 1 1
      src/main/java/com/goafanti/admin/controller/AdminAchievementApiController.java
  7. 1 2
      src/main/java/com/goafanti/admin/controller/AdminOrderApiController.java
  8. 0 1
      src/main/java/com/goafanti/common/controller/PortalController.java
  9. 22 22
      src/main/java/com/goafanti/common/dao/AchievementOrderMapper.java
  10. 0 1
      src/main/java/com/goafanti/common/dao/DemandMapper.java
  11. 30 30
      src/main/java/com/goafanti/common/dao/MemberGradeMapper.java
  12. 4 11
      src/main/java/com/goafanti/common/enums/AchievementOrderStatus.java
  13. 1 1
      src/main/java/com/goafanti/common/enums/OrderState.java
  14. 176 345
      src/main/java/com/goafanti/common/mapper/AchievementOrderMapper.xml
  15. 175 0
      src/main/java/com/goafanti/common/mapper/AchievementOrderMapperExt.xml
  16. 153 115
      src/main/java/com/goafanti/common/mapper/MemberGradeMapper.xml
  17. 157 157
      src/main/java/com/goafanti/common/model/AchievementOrder.java
  18. 100 90
      src/main/java/com/goafanti/memberGrade/controller/MemberGradeController.java
  19. 7 3
      src/main/java/com/goafanti/memberGrade/controller/MemberGradeFrontController.java
  20. 0 1
      src/main/java/com/goafanti/portal/bo/AchievementSearchListBo.java
  21. 4 3
      src/main/java/com/goafanti/portal/controller/PortalOrderApiController.java
  22. 1 1
      src/main/resources/props/config_dev.properties
  23. 36 30
      src/main/resources/props/config_local.properties
  24. 47 66
      src/main/webapp/WEB-INF/views/common.html

+ 10 - 0
schema/20170918-achievement-order-change.sql

@@ -0,0 +1,10 @@
+ALTER TABLE `achievement_order` 
+DROP COLUMN `service_money`,
+DROP COLUMN `commission`,
+DROP COLUMN `contract_money`,
+DROP COLUMN `intention_money`,
+CHANGE COLUMN `status` `status` INT(2) NULL DEFAULT NULL COMMENT '(0, \"未支付\"),(1, \"已支付\"),(2, \"支付中\"),(3, \"完成\"),(9, \"取消\"),(10, \"无效\")' ,
+ADD COLUMN `payment_value` DOUBLE(10,2) NULL COMMENT '实际支付金额' AFTER `status`,
+ADD COLUMN `payment_type` VARCHAR(16) NULL COMMENT '支付方式' AFTER `payment_value`,
+ADD COLUMN `payment_id` VARCHAR(45) NULL COMMENT '支付流水号' AFTER `payment_type`,
+ADD COLUMN `payment_time` DATETIME NULL COMMENT '支付时间' AFTER `payment_id`;

+ 91 - 56
src/main/java/com/goafanti/achievement/bo/AchievementOrderListBo.java

@@ -1,5 +1,6 @@
 package com.goafanti.achievement.bo;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
@@ -9,68 +10,77 @@ import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
 
 public class AchievementOrderListBo {
-	private String	id;
+	private String		id;
 
 	/**
 	 * 编号
 	 */
-	private Integer	serialNumber;
+	private Integer		serialNumber;
 
 	/**
 	 * 科技成果ID
 	 */
-	private String	achievementId;
+	private String		achievementId;
 
 	/**
 	 * 购买时间
 	 */
-	private Date	createTime;
-
+	private Date		createTime;
 
 	/**
-	 * 流程变动(0--初始意向,1--意向金,2--签订合同,3--合同金,4--佣金,5--服务金,6--关闭)
-	 */
-	private Integer	status;
+	* (0, "未支付"),(1, "已支付"),(2, "支付中"),(3, "完成"),(9, "取消"),(10, "无效")
+	*/
+	private Integer		status;
 
 	/**
-	 * 意向金
-	 */
-	private Integer	intentionMoney;
+	* 实际支付金额
+	*/
+	private Double		paymentValue;
 
 	/**
-	 * 合同金
-	 */
-	private Integer	contractMoney;
+	* 支付方式
+	*/
+	private String		paymentType;
 
 	/**
-	 * 佣金
-	 */
-	private Integer	commission;
+	* 支付流水号
+	*/
+	private String		paymentId;
 
 	/**
-	 * 服务金
-	 */
-	private Integer	serviceMoney;
+	* 支付时间
+	*/
+	private Date		paymentTime;
 
 	/**
 	 * 科技成果名称
 	 */
-	private String	name;
+	private String		name;
 
 	/**
 	 * 科技需求编号
 	 */
-	private Integer	achievementSerialNumber;
+	private Integer		achievementSerialNumber;
 
 	/**
 	 * 科技成果删除标记
 	 */
-	private Integer	deletedSign;
+	private Integer		deletedSign;
 
 	/**
 	 * 科技成果审核状态
 	 */
-	private Integer	auditStatus;
+	private Integer		auditStatus;
+
+	/**
+	 * 议价方式(0--面议,1--定价)
+	 */
+	private Integer		bargainingMode;
+
+	/**
+	 * 转让价格
+	 */
+	private BigDecimal	transferPrice;
 
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getDeletedSign() {
@@ -98,7 +108,6 @@ public class AchievementOrderListBo {
 		this.name = name;
 	}
 
-
 	public String getId() {
 		return id;
 	}
@@ -115,7 +124,6 @@ public class AchievementOrderListBo {
 		this.serialNumber = serialNumber;
 	}
 
-
 	public Date getCreateTime() {
 		return createTime;
 	}
@@ -124,7 +132,6 @@ public class AchievementOrderListBo {
 		this.createTime = createTime;
 	}
 
-
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getStatus() {
 		return status;
@@ -134,64 +141,92 @@ public class AchievementOrderListBo {
 		this.status = status;
 	}
 
-	public Integer getIntentionMoney() {
-		return intentionMoney;
+	public String getAchievementId() {
+		return achievementId;
+	}
+
+	public void setAchievementId(String achievementId) {
+		this.achievementId = achievementId;
+	}
+
+	public Integer getAchievementSerialNumber() {
+		return achievementSerialNumber;
 	}
 
-	public void setIntentionMoney(Integer intentionMoney) {
-		this.intentionMoney = intentionMoney;
+	public void setAchievementSerialNumber(Integer achievementSerialNumber) {
+		this.achievementSerialNumber = achievementSerialNumber;
 	}
 
-	public Integer getContractMoney() {
-		return contractMoney;
+	public String getCreateTimeFormattedDate() {
+		if (this.createTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
+		}
 	}
 
-	public void setContractMoney(Integer contractMoney) {
-		this.contractMoney = contractMoney;
+	public void setCreateTimeFormattedDate(String createTimeFormattedDate) {
+
 	}
 
-	public Integer getCommission() {
-		return commission;
+	public Double getPaymentValue() {
+		return paymentValue;
 	}
 
-	public void setCommission(Integer commission) {
-		this.commission = commission;
+	public void setPaymentValue(Double paymentValue) {
+		this.paymentValue = paymentValue;
 	}
 
-	public Integer getServiceMoney() {
-		return serviceMoney;
+	public String getPaymentType() {
+		return paymentType;
 	}
 
-	public void setServiceMoney(Integer serviceMoney) {
-		this.serviceMoney = serviceMoney;
+	public void setPaymentType(String paymentType) {
+		this.paymentType = paymentType;
 	}
-	
-	public String getAchievementId() {
-		return achievementId;
+
+	public String getPaymentId() {
+		return paymentId;
 	}
 
-	public void setAchievementId(String achievementId) {
-		this.achievementId = achievementId;
+	public void setPaymentId(String paymentId) {
+		this.paymentId = paymentId;
 	}
 
-	public Integer getAchievementSerialNumber() {
-		return achievementSerialNumber;
+	public Date getPaymentTime() {
+		return paymentTime;
 	}
 
-	public void setAchievementSerialNumber(Integer achievementSerialNumber) {
-		this.achievementSerialNumber = achievementSerialNumber;
+	public void setPaymentTime(Date paymentTime) {
+		this.paymentTime = paymentTime;
 	}
 
-	public String getCreateTimeFormattedDate() {
-		if (this.createTime == null) {
+	public String getPaymentTimeFormattedDate() {
+		if (this.paymentTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.getPaymentTime(), AFTConstants.YYYYMMDD);
 		}
 	}
 
-	public void setCreateTimeFormattedDate(String createTimeFormattedDate) {
+	public void setPaymentTimeFormattedDate(String paymentTimeFormattedDate) {
+
+	}
+
+	public Integer getBargainingMode() {
+		return bargainingMode;
+	}
+
+	public void setBargainingMode(Integer bargainingMode) {
+		this.bargainingMode = bargainingMode;
+	}
+
+	public BigDecimal getTransferPrice() {
+		return transferPrice;
+	}
 
+	public void setTransferPrice(BigDecimal transferPrice) {
+		this.transferPrice = transferPrice;
 	}
 
 }

+ 33 - 50
src/main/java/com/goafanti/achievement/bo/InputAchievementOrder.java

@@ -8,35 +8,28 @@ import com.goafanti.common.constant.ErrorConstants;
 
 public class InputAchievementOrder {
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String id;
-	
+	private String	id;
+
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	achievementId;
 
 	@Max(value = 99999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer	intentionMoney;
-	
-	@Max(value = 99999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer	contractMoney;
-	
-	@Max(value = 99999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer	commission;
-	
-	@Max(value = 99999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer	serviceMoney;
-	
+	private Double	paymentValue;
+
+	@Size(min = 0, max = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	paymentId;
+
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	paymentType;
+
 	@Max(value = 6, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer	status;
-	
+
 	@Size(min = 0, max = 128, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String comment;
-	
-	
+	private String	comment;
+
 	public String getId() {
 		return id;
 	}
@@ -53,54 +46,44 @@ public class InputAchievementOrder {
 		this.achievementId = achievementId;
 	}
 
-	public Integer getIntentionMoney() {
-		return intentionMoney;
-	}
-
-	public void setIntentionMoney(Integer intentionMoney) {
-		this.intentionMoney = intentionMoney;
-	}
-
-	public Integer getContractMoney() {
-		return contractMoney;
+	public Integer getStatus() {
+		return status;
 	}
 
-	public void setContractMoney(Integer contractMoney) {
-		this.contractMoney = contractMoney;
+	public void setStatus(Integer status) {
+		this.status = status;
 	}
 
-	public Integer getCommission() {
-		return commission;
+	public String getComment() {
+		return comment;
 	}
 
-	public void setCommission(Integer commission) {
-		this.commission = commission;
+	public void setComment(String comment) {
+		this.comment = comment;
 	}
 
-	public Integer getServiceMoney() {
-		return serviceMoney;
+	public Double getPaymentValue() {
+		return paymentValue;
 	}
 
-	public void setServiceMoney(Integer serviceMoney) {
-		this.serviceMoney = serviceMoney;
+	public void setPaymentValue(Double paymentValue) {
+		this.paymentValue = paymentValue;
 	}
 
-	public Integer getStatus() {
-		return status;
+	public String getPaymentId() {
+		return paymentId;
 	}
 
-	public void setStatus(Integer status) {
-		this.status = status;
+	public void setPaymentId(String paymentId) {
+		this.paymentId = paymentId;
 	}
 
-	public String getComment() {
-		return comment;
+	public String getPaymentType() {
+		return paymentType;
 	}
 
-	public void setComment(String comment) {
-		this.comment = comment;
+	public void setPaymentType(String paymentType) {
+		this.paymentType = paymentType;
 	}
-	
-	
 
 }

+ 1 - 1
src/main/java/com/goafanti/achievement/controller/AchievementApiController.java

@@ -292,7 +292,7 @@ public class AchievementApiController extends CertifyApiController {
 		} else {
 			List<AchievementOrder> list = achievementOrderService.selectAchievementOrderByAchievementId(ids[0]);
 			for (AchievementOrder order : list) {
-				if (!AchievementOrderStatus.CREATE.getCode().equals(order.getStatus())) {
+				if (!AchievementOrderStatus.UNPAYED.getCode().equals(order.getStatus())) {
 					res.getError().add(buildError("", "当前科技成果有订单,无法删除!"));
 					return res;
 				}

+ 7 - 4
src/main/java/com/goafanti/achievement/service/impl/AchievementOrderServiceImpl.java

@@ -48,9 +48,9 @@ public class AchievementOrderServiceImpl extends BaseMybatisDao<AchievementOrder
 		Calendar now = Calendar.getInstance();
 		now.set(Calendar.MILLISECOND, 0);
 		ao.setCreateTime(now.getTime());
-		ao.setStatus(AchievementOrderStatus.CREATE.getCode());
+		ao.setStatus(AchievementOrderStatus.UNPAYED.getCode());
 		ao.setUid(TokenManager.getUserId());
-		if (StringUtils.isBlank(ao.getUid())){
+		if (StringUtils.isBlank(ao.getUid())) {
 			return;
 		}
 		achievementOrderMapper.insert(ao);
@@ -84,11 +84,11 @@ public class AchievementOrderServiceImpl extends BaseMybatisDao<AchievementOrder
 
 	@Override
 	public int updateShutdownByUser(AchievementOrder order) {
-		order.setStatus(AchievementOrderStatus.SHUTDOWN.getCode());
+		order.setStatus(AchievementOrderStatus.CANCELLED.getCode());
 
 		AchievementOrderLog aol = new AchievementOrderLog();
 		aol.setId(UUID.randomUUID().toString());
-		aol.setStatus(AchievementOrderStatus.SHUTDOWN.getCode());
+		aol.setStatus(AchievementOrderStatus.CANCELLED.getCode());
 		aol.setAchievementOrderId(order.getId());
 		Calendar now = Calendar.getInstance();
 		now.set(Calendar.MILLISECOND, 0);
@@ -147,6 +147,9 @@ public class AchievementOrderServiceImpl extends BaseMybatisDao<AchievementOrder
 			}
 			aol.setRecordTime(recordTime);
 			achievementOrderLogMapper.insert(aol);
+			if (AchievementOrderStatus.PAYED == AchievementOrderStatus.getStatus(achievementOrder.getStatus())) {
+				achievementOrder.setPaymentTime(recordTime);
+			}
 		}
 		return achievementOrderMapper.updateByPrimaryKeySelective(achievementOrder);
 	}

+ 1 - 1
src/main/java/com/goafanti/admin/controller/AdminAchievementApiController.java

@@ -417,7 +417,7 @@ public class AdminAchievementApiController extends CertifyApiController {
         } else {
             List<AchievementOrder> list = achievementOrderService.selectAchievementOrderByAchievementId(ids[0]);
             for (AchievementOrder order : list) {
-                if (!AchievementOrderStatus.CREATE.getCode().equals(order.getStatus())) {
+                if (!AchievementOrderStatus.UNPAYED.getCode().equals(order.getStatus())) {
                     res.getError().add(buildError("", "当前科技成果有订单,无法删除!"));
                     return res;
                 }

+ 1 - 2
src/main/java/com/goafanti/admin/controller/AdminOrderApiController.java

@@ -1,6 +1,5 @@
 package com.goafanti.admin.controller;
 
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
@@ -75,7 +74,7 @@ public class AdminOrderApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (AchievementOrderStatus.SHUTDOWN.getCode().equals(ao.getStatus())) {
+		if (AchievementOrderStatus.CANCELLED.getCode().equals(ao.getStatus())) {
 			res.getError().add(buildError("", "当前科技成果线索单/意向单已关闭,无法修改!"));
 			return res;
 		}

+ 0 - 1
src/main/java/com/goafanti/common/controller/PortalController.java

@@ -193,7 +193,6 @@ public class PortalController extends BaseController {
 	/**
 	 * 科技成果详情
 	 */
-	@SuppressWarnings("null")
 	@RequestMapping(value = "/portal/technologyTrading/achievementDetail", method = RequestMethod.GET)
 	public ModelAndView portalAchievementDetail(String id, Integer type) {
 		ModelAndView mv = new ModelAndView();

+ 22 - 22
src/main/java/com/goafanti/common/dao/AchievementOrderMapper.java

@@ -1,23 +1,23 @@
-package com.goafanti.common.dao;
-
-import java.util.List;
-
-import com.goafanti.common.model.AchievementOrder;
-
-public interface AchievementOrderMapper {
-    int deleteByPrimaryKey(String id);
-
-    int insert(AchievementOrder record);
-
-    int insertSelective(AchievementOrder record);
-
-    AchievementOrder selectByPrimaryKey(String id);
-
-    int updateByPrimaryKeySelective(AchievementOrder record);
-
-    int updateByPrimaryKey(AchievementOrder record);
-
-	List<AchievementOrder> selectAchievementOrderByUidAndAchievementId(String uid, String achievementId);
-
-	List<AchievementOrder> selectAchievementOrderByAchievementId(String achievementId);
+package com.goafanti.common.dao;
+
+import java.util.List;
+
+import com.goafanti.common.model.AchievementOrder;
+
+public interface AchievementOrderMapper {
+	int deleteByPrimaryKey(String id);
+
+	int insert(AchievementOrder record);
+
+	int insertSelective(AchievementOrder record);
+
+	AchievementOrder selectByPrimaryKey(String id);
+
+	int updateByPrimaryKeySelective(AchievementOrder record);
+
+	int updateByPrimaryKey(AchievementOrder record);
+
+	List<AchievementOrder> selectAchievementOrderByUidAndAchievementId(String uid, String achievementId);
+
+	List<AchievementOrder> selectAchievementOrderByAchievementId(String achievementId);
 }

+ 0 - 1
src/main/java/com/goafanti/common/dao/DemandMapper.java

@@ -5,7 +5,6 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 
-import com.goafanti.achievement.bo.AchievementListBo;
 import com.goafanti.common.model.Demand;
 import com.goafanti.demand.bo.DemandListBo;
 import com.goafanti.demand.bo.DemandManageDetailBo;

+ 30 - 30
src/main/java/com/goafanti/common/dao/MemberGradeMapper.java

@@ -1,36 +1,36 @@
 package com.goafanti.common.dao;
+
 import java.util.List;
 import java.util.Map;
+
 import com.goafanti.common.model.MemberOrder;
 import com.goafanti.memberGrade.bo.MemberGrade;
+
 public interface MemberGradeMapper {
-    List<MemberGrade> selectMemberGrade();
-    
-    int delGrade(int id); 
-    
-    int selectRank(MemberGrade me);
-    int addGradeName(MemberGrade me);
-    
-    int addBusinessAndCost(MemberGrade me);
-    
-    List<MemberOrder> selectMemberOrder(Map<String, Object> map);
-    
-    List<MemberOrder> selectMemberOrderBa(Map<String, Object> map);
-    
-    int countMemberOrder(String userId);
-    
-    int addBasicsMemberOrder(MemberOrder mo);
-    
-    int countMemberOrderWhere(Map<String, Object> map);
-        
-    int updateMemberOrder(Map<String, Object> map);
-    
-    int delMemberOrder(Map<String, Object> map);
-    
-    int updateUserLvl(Map<String, Object> map);
-    
-    
-    
-    
-    
-}
+	List<MemberGrade> selectMemberGrade();
+
+	int delGrade(int id);
+
+	int selectRank(MemberGrade me);
+
+	int addGradeName(MemberGrade me);
+
+	int addBusinessAndCost(MemberGrade me);
+
+	List<MemberOrder> selectMemberOrder(Map<String, Object> map);
+
+	List<MemberOrder> selectMemberOrderBa(Map<String, Object> map);
+
+	int countMemberOrder(String userId);
+
+	int addBasicsMemberOrder(MemberOrder mo);
+
+	int countMemberOrderWhere(Map<String, Object> map);
+
+	int updateMemberOrder(Map<String, Object> map);
+
+	int delMemberOrder(Map<String, Object> map);
+
+	int updateUserLvl(Map<String, Object> map);
+
+}

+ 4 - 11
src/main/java/com/goafanti/common/enums/AchievementOrderStatus.java

@@ -6,15 +6,8 @@ import java.util.Map;
 import org.apache.commons.lang3.StringUtils;
 
 public enum AchievementOrderStatus {
-	
-	CREATE(0, "初始意向"),
-	INTENTIONMONEY(1,"交付意向金"),
-	SIGN(2,"签订合同"),
-	CONTRACTMONEY(3, "交付合同金"),
-	COMMISSION(4,"交付佣金"),
-	SERVICEMONEY(5, "交付服务金"),
-	SHUTDOWN(6,"关闭"),
-	OTHER(7, "其他");
+
+	UNPAYED(0, "未支付"), PAYED(1, "已支付"), PAYING(2, "支付中"), COMPLETED(3, "完成"), CANCELLED(9, "取消"), INVALID(10, "无效");
 
 	private AchievementOrderStatus(Integer code, String desc) {
 		this.code = code;
@@ -33,14 +26,14 @@ public enum AchievementOrderStatus {
 		if (containsType(code)) {
 			return status.get(code);
 		}
-		return OTHER;
+		return INVALID;
 	}
 
 	public static AchievementOrderStatus getStatus(String code) {
 		if (StringUtils.isNumeric(code)) {
 			return getStatus(Integer.parseInt(code));
 		}
-		return OTHER;
+		return INVALID;
 	}
 
 	public static boolean containsType(Integer code) {

+ 1 - 1
src/main/java/com/goafanti/common/enums/OrderState.java

@@ -6,7 +6,7 @@ import java.util.Map;
 import org.apache.commons.lang3.StringUtils;
 
 public enum OrderState {
-	UNPAYED(0, "未支付"), PAYED(1, "已支付"), PAYING(2, "支付中"), CANCELLED(9, "取消"), INVALID(10, "无效");
+	UNPAYED(0, "未支付"), PAYED(1, "已支付"), PAYING(2, "支付中"), COMPLETED(3, "完成"), CANCELLED(9, "取消"), INVALID(10, "无效");
 
 	private OrderState(Integer code, String desc) {
 		this.code = code;

+ 176 - 345
src/main/java/com/goafanti/common/mapper/AchievementOrderMapper.xml

@@ -1,346 +1,177 @@
-<?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.AchievementOrderMapper" >
-  <resultMap id="BaseResultMap" type="com.goafanti.common.model.AchievementOrder" >
-    <id column="id" property="id" jdbcType="VARCHAR" />
-    <result column="serial_number" property="serialNumber" jdbcType="INTEGER" />
-    <result column="achievement_id" property="achievementId" jdbcType="VARCHAR" />
-    <result column="uid" property="uid" jdbcType="VARCHAR" />
-    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
-    <result column="status" property="status" jdbcType="INTEGER" />
-    <result column="intention_money" property="intentionMoney" jdbcType="INTEGER" />
-    <result column="contract_money" property="contractMoney" jdbcType="INTEGER" />
-    <result column="commission" property="commission" jdbcType="INTEGER" />
-    <result column="service_money" property="serviceMoney" jdbcType="INTEGER" />
-    <result column="refund" property="refund" jdbcType="INTEGER" />
-    <result column="deleted_sign" property="deletedSign" jdbcType="INTEGER" />
-  </resultMap>
-  <sql id="Base_Column_List" >
-    id, serial_number, achievement_id, uid, create_time, status, intention_money, contract_money, 
-    commission, service_money, refund, deleted_sign
-  </sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select 
-    <include refid="Base_Column_List" />
-    from achievement_order
-    where id = #{id,jdbcType=VARCHAR}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
-    delete from achievement_order
-    where id = #{id,jdbcType=VARCHAR}
-  </delete>
-  <insert id="insert" parameterType="com.goafanti.common.model.AchievementOrder" >
-    insert into achievement_order (id, serial_number, achievement_id, 
-      uid, create_time, status, 
-      intention_money, contract_money, commission, 
-      service_money, refund, deleted_sign
-      )
-    values (#{id,jdbcType=VARCHAR}, #{serialNumber,jdbcType=INTEGER}, #{achievementId,jdbcType=VARCHAR}, 
-      #{uid,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, 
-      #{intentionMoney,jdbcType=INTEGER}, #{contractMoney,jdbcType=INTEGER}, #{commission,jdbcType=INTEGER}, 
-      #{serviceMoney,jdbcType=INTEGER}, #{refund,jdbcType=INTEGER}, #{deletedSign,jdbcType=INTEGER}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.goafanti.common.model.AchievementOrder" >
-    insert into achievement_order
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="id != null" >
-        id,
-      </if>
-      <if test="serialNumber != null" >
-        serial_number,
-      </if>
-      <if test="achievementId != null" >
-        achievement_id,
-      </if>
-      <if test="uid != null" >
-        uid,
-      </if>
-      <if test="createTime != null" >
-        create_time,
-      </if>
-      <if test="status != null" >
-        status,
-      </if>
-      <if test="intentionMoney != null" >
-        intention_money,
-      </if>
-      <if test="contractMoney != null" >
-        contract_money,
-      </if>
-      <if test="commission != null" >
-        commission,
-      </if>
-      <if test="serviceMoney != null" >
-        service_money,
-      </if>
-      <if test="refund != null" >
-        refund,
-      </if>
-      <if test="deletedSign != null" >
-        deleted_sign,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="id != null" >
-        #{id,jdbcType=VARCHAR},
-      </if>
-      <if test="serialNumber != null" >
-        #{serialNumber,jdbcType=INTEGER},
-      </if>
-      <if test="achievementId != null" >
-        #{achievementId,jdbcType=VARCHAR},
-      </if>
-      <if test="uid != null" >
-        #{uid,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null" >
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="status != null" >
-        #{status,jdbcType=INTEGER},
-      </if>
-      <if test="intentionMoney != null" >
-        #{intentionMoney,jdbcType=INTEGER},
-      </if>
-      <if test="contractMoney != null" >
-        #{contractMoney,jdbcType=INTEGER},
-      </if>
-      <if test="commission != null" >
-        #{commission,jdbcType=INTEGER},
-      </if>
-      <if test="serviceMoney != null" >
-        #{serviceMoney,jdbcType=INTEGER},
-      </if>
-      <if test="refund != null" >
-        #{refund,jdbcType=INTEGER},
-      </if>
-      <if test="deletedSign != null" >
-        #{deletedSign,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.AchievementOrder" >
-    update achievement_order
-    <set >
-      <if test="serialNumber != null" >
-        serial_number = #{serialNumber,jdbcType=INTEGER},
-      </if>
-      <if test="achievementId != null" >
-        achievement_id = #{achievementId,jdbcType=VARCHAR},
-      </if>
-      <if test="uid != null" >
-        uid = #{uid,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null" >
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="status != null" >
-        status = #{status,jdbcType=INTEGER},
-      </if>
-      <if test="intentionMoney != null" >
-        intention_money = #{intentionMoney,jdbcType=INTEGER},
-      </if>
-      <if test="contractMoney != null" >
-        contract_money = #{contractMoney,jdbcType=INTEGER},
-      </if>
-      <if test="commission != null" >
-        commission = #{commission,jdbcType=INTEGER},
-      </if>
-      <if test="serviceMoney != null" >
-        service_money = #{serviceMoney,jdbcType=INTEGER},
-      </if>
-      <if test="refund != null" >
-        refund = #{refund,jdbcType=INTEGER},
-      </if>
-      <if test="deletedSign != null" >
-        deleted_sign = #{deletedSign,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.AchievementOrder" >
-    update achievement_order
-    set serial_number = #{serialNumber,jdbcType=INTEGER},
-      achievement_id = #{achievementId,jdbcType=VARCHAR},
-      uid = #{uid,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      status = #{status,jdbcType=INTEGER},
-      intention_money = #{intentionMoney,jdbcType=INTEGER},
-      contract_money = #{contractMoney,jdbcType=INTEGER},
-      commission = #{commission,jdbcType=INTEGER},
-      service_money = #{serviceMoney,jdbcType=INTEGER},
-      refund = #{refund,jdbcType=INTEGER},
-      deleted_sign = #{deletedSign,jdbcType=INTEGER}
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-  
-  <select id="selectAchievementOrderByUidAndAchievementId" resultMap="BaseResultMap" >
-  	select 
-    <include refid="Base_Column_List" />
-    from achievement_order
-   where 
-   	uid = #{0} and achievement_id = #{1} and deleted_sign = 0
-  </select>
-  
-   <select id="findAchievementOrderListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.AchievementOrderListBo">
-  	select 
-  		ao.id, ao.serial_number as serialNumber, ao.achievement_id as achievementId,
-  		ao.create_time as createTime,ao.status,
-  		ao.intention_money as intentionMoney, ao.contract_money as contractMoney, ao.commission,
-  		ao.service_money as serviceMoney, a.name, a.serial_number as achievementSerialNumber,
-  		a.deleted_sign as deletedSign, a.audit_status as auditStatus
-  	from achievement_order ao
-  	left join achievement a on a.id = ao.achievement_id
-  	where ao.deleted_sign = 0 
-  	and   a.deleted_sign = 0 
-  	and   ao.uid = #{uid,jdbcType=VARCHAR}
-  	<if test="status != null">
-  		and ao.status = #{status,jdbcType=INTEGER}
-  	</if>
-  	order by ao.serial_number desc
-  	<if test="page_sql!=null">
-		${page_sql}
-	</if>
-  </select>
-  
-  <select id="findAchievementOrderCount" parameterType="String" resultType="java.lang.Integer">
-  	select 
-  		count(1)
-  	from achievement_order ao
-  	left join achievement a on a.id = ao.achievement_id
-  	where ao.deleted_sign = 0 
-  	and   a.deleted_sign 
-  	and   ao.uid = #{uid,jdbcType=VARCHAR}
-  	<if test="status != null">
-  		and ao.status = #{status,jdbcType=INTEGER}
-  	</if>
-  </select>
-  
-  <select id="selectAchievementOrderByAchievementId" parameterType="java.lang.String" resultMap="BaseResultMap">
-  	 select 
-    <include refid="Base_Column_List" />
-    from achievement_order
-    where achievement_id = #{achievementId,jdbcType=VARCHAR}
-  </select>
-  
-  
-   <select id="findUserAchievementOrderListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.UserAchievementOrderListBo">
-  	select 
-  		ao.id, ao.serial_number as serialNumber, ao.achievement_id as achievementId,
-  		ao.create_time as createTime,ao.status,
-  		ao.intention_money as intentionMoney, ao.contract_money as contractMoney, ao.commission,
-  		ao.service_money as serviceMoney, a.name, a.serial_number as achievementSerialNumber,
-  		a.deleted_sign as deletedSign, a.audit_status as auditStatus, ui.username,
-  		ao.uid, oi.unit_name as unitName
-  	from achievement_order ao
-  	left join achievement a on a.id = ao.achievement_id
-  	left join user_identity ui on ui.uid = ao.uid
-  	left join organization_identity oi on oi.uid = ao.uid
-  	where ao.deleted_sign = 0 
-  	and   a.deleted_sign = 0 
-  	and   a.owner_type= 0
-  	<if test="techBrokerId != null">
-  		and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
-  	</if>
-  	<if test="status != null">
-  		and ao.status = #{status,jdbcType=INTEGER}
-  	</if>
-  	<if test="uid != null">
-  		and ao.uid = #{uid,jdbcType=VARCHAR}
-  	</if>
-  	<if test="username != null">
-  		and (oi.unit_name = #{username,jdbcType=VARCHAR}
-  		or ui.username = #{username,jdbcType=VARCHAR})
-  	</if>
-  	order by ao.serial_number desc
-  	<if test="page_sql!=null">
-		${page_sql}
-	</if>
-  </select>
-  
-  <select id="findUserAchievementOrderCount" parameterType="String" resultType="java.lang.Integer">
-  	select 
-  		count(1)
-  	from achievement_order ao
-  	left join achievement a on a.id = ao.achievement_id
-  	left join user_identity ui on ui.uid = ao.uid
-  	left join organization_identity oi on oi.uid = ao.uid
-  	where ao.deleted_sign = 0 
-  	and   a.deleted_sign = 0 
-  	and   a.owner_type= 0
-  	<if test="techBrokerId != null">
-  		and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
-  	</if>
-  	<if test="status != null">
-  		and ao.status = #{status,jdbcType=INTEGER}
-  	</if>
-  	<if test="uid != null">
-  		and ao.uid = #{uid,jdbcType=VARCHAR}
-  	</if>
-  	<if test="username != null">
-  		and (oi.unit_name = #{username,jdbcType=VARCHAR}
-  		or ui.username = #{username,jdbcType=VARCHAR})
-  	</if>
-  </select>
-  
-  
-  <select id="findOrgAchievementOrderListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.OrgAchievementOrderListBo">
-  	select 
-  		ao.id, ao.serial_number as serialNumber, ao.achievement_id as achievementId,
-  		ao.create_time as createTime,ao.status,
-  		ao.intention_money as intentionMoney, ao.contract_money as contractMoney, ao.commission,
-  		ao.service_money as serviceMoney, a.name, a.serial_number as achievementSerialNumber,
-  		a.deleted_sign as deletedSign, a.audit_status as auditStatus, ao.uid,
-  		oi.unit_name as unitName, ui.username
-  	from achievement_order ao
-  	left join achievement a on a.id = ao.achievement_id
-  	left join user_identity ui on ui.uid = ao.uid
-  	left join organization_identity oi on oi.uid = ao.uid
-  	where ao.deleted_sign = 0 
-  	and   a.deleted_sign = 0 
-  	and   a.owner_type= 1
-  	<if test="techBrokerId != null">
-  		and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
-  	</if>
-  	<if test="status != null">
-  		and ao.status = #{status,jdbcType=INTEGER}
-  	</if>
-  	<if test="uid != null">
-  		and ao.uid = #{uid,jdbcType=VARCHAR}
-  	</if>
-  	<if test="unitName != null">
-  		and (oi.unit_name = #{unitName,jdbcType=VARCHAR}
-  		or ui.username = #{unitName,jdbcType=VARCHAR})
-  	</if>
-  	order by ao.serial_number desc
-  	<if test="page_sql!=null">
-		${page_sql}
-	</if>
-  </select>
-  
-  <select id="findOrgAchievementOrderCount" parameterType="String" resultType="java.lang.Integer">
-  	select 
-  		count(1)
-  	from achievement_order ao
-  	left join achievement a on a.id = ao.achievement_id
-  	left join user_identity ui on ui.uid = ao.uid
-  	left join organization_identity oi on oi.uid = ao.uid
-  	where ao.deleted_sign = 0 
-  	and   a.deleted_sign = 0 
-  	and   a.owner_type= 1
-  	<if test="techBrokerId != null">
-  		and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
-  	</if>
-  	<if test="status != null">
-  		and ao.status = #{status,jdbcType=INTEGER}
-  	</if>
-  	<if test="uid != null">
-  		and ao.uid = #{uid,jdbcType=VARCHAR}
-  	</if>
-  	<if test="unitName != null">
-  		and (oi.unit_name = #{unitName,jdbcType=VARCHAR}
-  		or ui.username = #{unitName,jdbcType=VARCHAR})
-  	</if>
-  </select>
+<?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.AchievementOrderMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.AchievementOrder">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="serial_number" jdbcType="INTEGER" property="serialNumber" />
+    <result column="achievement_id" jdbcType="VARCHAR" property="achievementId" />
+    <result column="uid" jdbcType="VARCHAR" property="uid" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="payment_value" jdbcType="DOUBLE" property="paymentValue" />
+    <result column="payment_type" jdbcType="VARCHAR" property="paymentType" />
+    <result column="payment_id" jdbcType="VARCHAR" property="paymentId" />
+    <result column="payment_time" jdbcType="TIMESTAMP" property="paymentTime" />
+    <result column="refund" jdbcType="INTEGER" property="refund" />
+    <result column="deleted_sign" jdbcType="INTEGER" property="deletedSign" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, serial_number, achievement_id, uid, create_time, status, payment_value, payment_type, 
+    payment_id, payment_time, refund, deleted_sign
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from achievement_order
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from achievement_order
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.AchievementOrder">
+    insert into achievement_order (id, serial_number, achievement_id, 
+      uid, create_time, status, 
+      payment_value, payment_type, payment_id, 
+      payment_time, refund, deleted_sign
+      )
+    values (#{id,jdbcType=VARCHAR}, #{serialNumber,jdbcType=INTEGER}, #{achievementId,jdbcType=VARCHAR}, 
+      #{uid,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, 
+      #{paymentValue,jdbcType=DOUBLE}, #{paymentType,jdbcType=VARCHAR}, #{paymentId,jdbcType=VARCHAR}, 
+      #{paymentTime,jdbcType=TIMESTAMP}, #{refund,jdbcType=INTEGER}, #{deletedSign,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.AchievementOrder">
+    insert into achievement_order
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="serialNumber != null">
+        serial_number,
+      </if>
+      <if test="achievementId != null">
+        achievement_id,
+      </if>
+      <if test="uid != null">
+        uid,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="paymentValue != null">
+        payment_value,
+      </if>
+      <if test="paymentType != null">
+        payment_type,
+      </if>
+      <if test="paymentId != null">
+        payment_id,
+      </if>
+      <if test="paymentTime != null">
+        payment_time,
+      </if>
+      <if test="refund != null">
+        refund,
+      </if>
+      <if test="deletedSign != null">
+        deleted_sign,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="serialNumber != null">
+        #{serialNumber,jdbcType=INTEGER},
+      </if>
+      <if test="achievementId != null">
+        #{achievementId,jdbcType=VARCHAR},
+      </if>
+      <if test="uid != null">
+        #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="paymentValue != null">
+        #{paymentValue,jdbcType=DOUBLE},
+      </if>
+      <if test="paymentType != null">
+        #{paymentType,jdbcType=VARCHAR},
+      </if>
+      <if test="paymentId != null">
+        #{paymentId,jdbcType=VARCHAR},
+      </if>
+      <if test="paymentTime != null">
+        #{paymentTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="refund != null">
+        #{refund,jdbcType=INTEGER},
+      </if>
+      <if test="deletedSign != null">
+        #{deletedSign,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.AchievementOrder">
+    update achievement_order
+    <set>
+      <if test="serialNumber != null">
+        serial_number = #{serialNumber,jdbcType=INTEGER},
+      </if>
+      <if test="achievementId != null">
+        achievement_id = #{achievementId,jdbcType=VARCHAR},
+      </if>
+      <if test="uid != null">
+        uid = #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="paymentValue != null">
+        payment_value = #{paymentValue,jdbcType=DOUBLE},
+      </if>
+      <if test="paymentType != null">
+        payment_type = #{paymentType,jdbcType=VARCHAR},
+      </if>
+      <if test="paymentId != null">
+        payment_id = #{paymentId,jdbcType=VARCHAR},
+      </if>
+      <if test="paymentTime != null">
+        payment_time = #{paymentTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="refund != null">
+        refund = #{refund,jdbcType=INTEGER},
+      </if>
+      <if test="deletedSign != null">
+        deleted_sign = #{deletedSign,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.AchievementOrder">
+    update achievement_order
+    set serial_number = #{serialNumber,jdbcType=INTEGER},
+      achievement_id = #{achievementId,jdbcType=VARCHAR},
+      uid = #{uid,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      status = #{status,jdbcType=INTEGER},
+      payment_value = #{paymentValue,jdbcType=DOUBLE},
+      payment_type = #{paymentType,jdbcType=VARCHAR},
+      payment_id = #{paymentId,jdbcType=VARCHAR},
+      payment_time = #{paymentTime,jdbcType=TIMESTAMP},
+      refund = #{refund,jdbcType=INTEGER},
+      deleted_sign = #{deletedSign,jdbcType=INTEGER}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
 </mapper>

+ 175 - 0
src/main/java/com/goafanti/common/mapper/AchievementOrderMapperExt.xml

@@ -0,0 +1,175 @@
+<?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.AchievementOrderMapper" >
+  <select id="selectAchievementOrderByUidAndAchievementId" resultMap="BaseResultMap" >
+  	select 
+    <include refid="Base_Column_List" />
+    from achievement_order
+   where 
+   	uid = #{0} and achievement_id = #{1} and deleted_sign = 0
+  </select>
+  
+   <select id="findAchievementOrderListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.AchievementOrderListBo">
+  	select 
+  		ao.id, ao.serial_number as serialNumber, ao.achievement_id as achievementId,
+  		ao.create_time as createTime,ao.status,
+  		ao.payment_value as paymentValue, ao.payment_type as paymentType, ao.payment_id as paymentId,
+  		ao.payment_time as paymentTime, a.name, a.serial_number as achievementSerialNumber,
+  		a.deleted_sign as deletedSign, a.audit_status as auditStatus, a.bargaining_mode as bargainingMode,
+  		a.transfer_price as transferPrice
+  	from achievement_order ao
+  	left join achievement a on a.id = ao.achievement_id
+  	where ao.deleted_sign = 0 
+  	and   a.deleted_sign = 0 
+  	and   ao.uid = #{uid,jdbcType=VARCHAR}
+  	<if test="status != null">
+  		and ao.status = #{status,jdbcType=INTEGER}
+  	</if>
+  	order by ao.serial_number desc
+  	<if test="page_sql!=null">
+		${page_sql}
+	</if>
+  </select>
+  
+  <select id="findAchievementOrderCount" parameterType="String" resultType="java.lang.Integer">
+  	select 
+  		count(1)
+  	from achievement_order ao
+  	left join achievement a on a.id = ao.achievement_id
+  	where ao.deleted_sign = 0 
+  	and   a.deleted_sign 
+  	and   ao.uid = #{uid,jdbcType=VARCHAR}
+  	<if test="status != null">
+  		and ao.status = #{status,jdbcType=INTEGER}
+  	</if>
+  </select>
+  
+  <select id="selectAchievementOrderByAchievementId" parameterType="java.lang.String" resultMap="BaseResultMap">
+  	 select 
+    <include refid="Base_Column_List" />
+    from achievement_order
+    where achievement_id = #{achievementId,jdbcType=VARCHAR}
+  </select>
+  
+  
+   <select id="findUserAchievementOrderListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.UserAchievementOrderListBo">
+  	select 
+  		ao.id, ao.serial_number as serialNumber, ao.achievement_id as achievementId,
+  		ao.create_time as createTime,ao.status,
+  		ao.payment_value as paymentValue, ao.payment_type as paymentType, ao.payment_id as paymentId,
+  		ao.payment_time as paymentTime, a.name, a.serial_number as achievementSerialNumber,
+  		a.deleted_sign as deletedSign, a.audit_status as auditStatus, ui.username,
+  		ao.uid, oi.unit_name as unitName, a.bargaining_mode as bargainingMode,
+  		a.transfer_price as transferPrice
+  	from achievement_order ao
+  	left join achievement a on a.id = ao.achievement_id
+  	left join user_identity ui on ui.uid = ao.uid
+  	left join organization_identity oi on oi.uid = ao.uid
+  	where ao.deleted_sign = 0 
+  	and   a.deleted_sign = 0 
+  	and   a.owner_type= 0
+  	<if test="techBrokerId != null">
+  		and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
+  	</if>
+  	<if test="status != null">
+  		and ao.status = #{status,jdbcType=INTEGER}
+  	</if>
+  	<if test="uid != null">
+  		and ao.uid = #{uid,jdbcType=VARCHAR}
+  	</if>
+  	<if test="username != null">
+  		and (oi.unit_name = #{username,jdbcType=VARCHAR}
+  		or ui.username = #{username,jdbcType=VARCHAR})
+  	</if>
+  	order by ao.serial_number desc
+  	<if test="page_sql!=null">
+		${page_sql}
+	</if>
+  </select>
+  
+  <select id="findUserAchievementOrderCount" parameterType="String" resultType="java.lang.Integer">
+  	select 
+  		count(1)
+  	from achievement_order ao
+  	left join achievement a on a.id = ao.achievement_id
+  	left join user_identity ui on ui.uid = ao.uid
+  	left join organization_identity oi on oi.uid = ao.uid
+  	where ao.deleted_sign = 0 
+  	and   a.deleted_sign = 0 
+  	and   a.owner_type= 0
+  	<if test="techBrokerId != null">
+  		and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
+  	</if>
+  	<if test="status != null">
+  		and ao.status = #{status,jdbcType=INTEGER}
+  	</if>
+  	<if test="uid != null">
+  		and ao.uid = #{uid,jdbcType=VARCHAR}
+  	</if>
+  	<if test="username != null">
+  		and (oi.unit_name = #{username,jdbcType=VARCHAR}
+  		or ui.username = #{username,jdbcType=VARCHAR})
+  	</if>
+  </select>
+  
+  
+  <select id="findOrgAchievementOrderListByPage" parameterType="String" resultType="com.goafanti.achievement.bo.OrgAchievementOrderListBo">
+  	select 
+  		ao.id, ao.serial_number as serialNumber, ao.achievement_id as achievementId,
+  		ao.create_time as createTime,ao.status,
+  		ao.payment_value as paymentValue, ao.payment_type as paymentType, ao.payment_id as paymentId,
+  		ao.payment_time as paymentTime,  a.name, a.serial_number as achievementSerialNumber,
+  		a.deleted_sign as deletedSign, a.audit_status as auditStatus, ao.uid,
+  		oi.unit_name as unitName, ui.username, a.bargaining_mode as bargainingMode,
+  		a.transfer_price as transferPrice
+  	from achievement_order ao
+  	left join achievement a on a.id = ao.achievement_id
+  	left join user_identity ui on ui.uid = ao.uid
+  	left join organization_identity oi on oi.uid = ao.uid
+  	where ao.deleted_sign = 0 
+  	and   a.deleted_sign = 0 
+  	and   a.owner_type= 1
+  	<if test="techBrokerId != null">
+  		and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
+  	</if>
+  	<if test="status != null">
+  		and ao.status = #{status,jdbcType=INTEGER}
+  	</if>
+  	<if test="uid != null">
+  		and ao.uid = #{uid,jdbcType=VARCHAR}
+  	</if>
+  	<if test="unitName != null">
+  		and (oi.unit_name = #{unitName,jdbcType=VARCHAR}
+  		or ui.username = #{unitName,jdbcType=VARCHAR})
+  	</if>
+  	order by ao.serial_number desc
+  	<if test="page_sql!=null">
+		${page_sql}
+	</if>
+  </select>
+  
+  <select id="findOrgAchievementOrderCount" parameterType="String" resultType="java.lang.Integer">
+  	select 
+  		count(1)
+  	from achievement_order ao
+  	left join achievement a on a.id = ao.achievement_id
+  	left join user_identity ui on ui.uid = ao.uid
+  	left join organization_identity oi on oi.uid = ao.uid
+  	where ao.deleted_sign = 0 
+  	and   a.deleted_sign = 0 
+  	and   a.owner_type= 1
+  	<if test="techBrokerId != null">
+  		and a.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR}
+  	</if>
+  	<if test="status != null">
+  		and ao.status = #{status,jdbcType=INTEGER}
+  	</if>
+  	<if test="uid != null">
+  		and ao.uid = #{uid,jdbcType=VARCHAR}
+  	</if>
+  	<if test="unitName != null">
+  		and (oi.unit_name = #{unitName,jdbcType=VARCHAR}
+  		or ui.username = #{unitName,jdbcType=VARCHAR})
+  	</if>
+  </select>
+</mapper>

+ 153 - 115
src/main/java/com/goafanti/common/mapper/MemberGradeMapper.xml

@@ -1,119 +1,157 @@
 <?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.MemberGradeMapper">
-    <resultMap id="memberOrderMap" type="com.goafanti.common.model.MemberOrder">
-        <id column="id" property="id" />
-        <result column="menber_type" property="menberType" />
-        <result column="gradeName" property="gradeName" />
-        <result column="price" property="price" />
-        <result column="valid_month" property="validMonth" />
-        <result column="order_state" property="orderState" />
-        <result column="order_time" property="orderTime" />
-        <result column="user_id" property="userId" />
-        <result column="payment_time" property="paymentTime" />
-        <result column="payment_value" property="paymentValue" />
-        <result column="payment_type" property="paymentType" />
-        <result column="payment_id" property="paymentId" />
-        <result column="valid_time" property="validTime" />
-    </resultMap>
-    <!-- 查询所有 -->
-    <select id="selectMemberGrade" resultType="com.goafanti.memberGrade.bo.MemberGrade">
-        SELECT * FROM
-        member_grade;
-    </select>
-    <!-- 删除会员等级 -->
-    <delete id="delGrade" parameterType="int">
-        DELETE FROM member_grade
-        WHERE id=#{id}
-    </delete>
-    <!-- 新增会员等级是否存在 -->
-    <select id="selectRank" parameterType="com.goafanti.memberGrade.bo.MemberGrade"
-        resultType="int">
-        SELECT COUNT(*) FROM member_grade WHERE
-        memberRank=#{memberRank}
-    </select>
-    <!-- 新增会员等级 -->
-    <insert id="addGradeName" parameterType="com.goafanti.memberGrade.bo.MemberGrade"
-        useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO
-        member_grade(gradeName,memberRank) VALUES (#{gradeName},#{memberRank})
-    </insert>
-    <!-- 为等级添加业务和费用 -->
-    <update id="addBusinessAndCost" parameterType="com.goafanti.memberGrade.bo.MemberGrade">
-        UPDATE
-        member_grade SET business=#{business},cost=#{cost} WHERE id=#{id}
-    </update>
-    <!-- 前台会员订单查询 -->
-    <select id="selectMemberOrder" parameterType="java.util.Map"
-        resultMap="memberOrderMap">
-        SELECT mo.id,menber_type , mg.gradeName, price,
-        valid_month,order_state ,order_time ,user_id ,
-        payment_time,payment_value,payment_type ,payment_id ,valid_time
-        FROM member_order mo
-        LEFT JOIN member_grade mg ON mg.memberRank=mo.menber_Type
-        WHERE user_id=#{id}
-        LIMIT #{pNos},#{pSize}
-    </select>
-    <!-- 后台会员订单查询 -->
-    <select id="selectMemberOrderBa" parameterType="java.util.Map"
-        resultMap="memberOrderMap">
-        SELECT mo.id,menber_type ,u.mobile ,u.nickname,mg.gradeName, price,
-        valid_month,order_state ,order_time ,user_id ,
-        payment_time
-        ,payment_value,payment_type ,payment_id ,valid_time FROM member_order
-        mo
-        LEFT JOIN member_grade mg ON mg.memberRank=mo.menber_Type
-        LEFT JOIN user u ON
-        u.id=mo.user_id
-        WHERE 1=1
-        <if test="id!=null">AND mo.id=#{id}</if>
-        <if test="mobile!=null">AND u.mobile LIKE CONCAT('%',#{mobile},'%')</if>
-        <if test="nickname!=null"> AND u.nickname LIKE CONCAT('%',#{nickname},'%')</if>
-        <if test="orderState!=null">AND order_state LIKE CONCAT('%',#{orderState},'%')</if>
-        <if test="startTimes!=null"> AND order_time&gt;=#{startTimes}</if>
-        <if test="endTimes!=null">AND order_time&lt;#{endTimes}</if>
-        LIMIT #{pNos},#{pSize}
-    </select>
-    <!-- 后台查询总记录 -->
-    <select id="countMemberOrderWhere" parameterType="java.util.Map"
-        resultType="int">
-        SELECT COUNT(*) FROM member_order mo
-        LEFT JOIN member_grade mg ON
-        mg.id=mo.menber_Type
-        LEFT JOIN user u ON u.id=mo.user_id
-        WHERE 1=1
-        <if test="id!=null">AND mo.id LIKE CONCAT('%',#{id},'%')</if>
-        <if test="mobile!=null">AND u.mobile LIKE CONCAT('%',#{mobile},'%')</if>
-        <if test="nickname!=null"> AND u.nickname LIKE CONCAT('%',#{nickname},'%')</if>
-        <if test="orderState!=null">AND order_state LIKE CONCAT('%',#{orderState},'%')</if>
-        <if test="startTimes!=null"> AND order_time&gt;=#{startTimes}</if>
-        <if test="endTimes!=null">AND order_time&lt;=#{endTimes}</if>
-    </select>
-    <!-- 前台生成订单 -->
-    <insert id="addBasicsMemberOrder" parameterType="com.goafanti.common.model.MemberOrder">
-        INSERT INTO
-        member_order(id,menber_type,price,valid_month,order_state,order_time,user_id)
-        VALUES(#{id},#{menberType},#{price},#{validMonth},#{orderState},#{orderTime},#{userId})
-    </insert>
-    <select id="countMemberOrder" parameterType="String"  resultType="int">
-        SELECT COUNT(*) FROM
-        member_order
-        WHERE  user_id=#{userId}
-    </select>
-    <!-- 后台订单更改 -->
-    <update id="updateMemberOrder" parameterType="java.util.Map" >
-        UPDATE member_order SET 
-        menber_type=#{menberType},
-        valid_month=#{validMonth},
-        payment_value=#{paymentValue},
-        order_state=#{orderState},
-        payment_time=#{paymentTime},
-        payment_type=#{paymentType}
-        WHERE id=#{id}
-    </update>
-    <!-- 更改用户会员等级 -->
-    <update id="updateUserLvl" parameterType="java.util.Map">
-        UPDATE user SET lvl=#{lvl}  WHERE id=#{userId}
-    </update>
-  
+
+
+	<resultMap id="memberOrderMap" type="com.goafanti.common.model.MemberOrder">
+		<id column="id" property="id" />
+		<result column="menber_type" property="menberType" />
+		<result column="grade_name" property="gradeName" />
+		<result column="price" property="price" />
+		<result column="valid_month" property="validMonth" />
+		<result column="order_state" property="orderState" />
+		<result column="order_time" property="orderTime" />
+		<result column="user_id" property="userId" />
+		<result column="payment_time" property="paymentTime" />
+		<result column="payment_value" property="paymentValue" />
+		<result column="payment_type" property="paymentType" />
+		<result column="payment_id" property="paymentId" />
+		<result column="valid_time" property="validTime" />
+	</resultMap>
+
+
+	<resultMap id="memberGradeMap" type="com.goafanti.memberGrade.bo.MemberGrade">
+		<id column="id" property="id" />
+		<result column="grade_name" property="gradeName" />
+		<result column="business" property="business" />
+		<result column="cost" property="cost" />
+		<result column="member_rank" property="memberRank" />
+	</resultMap>
+
+
+
+	<!-- 查询所有 -->
+	<select id="selectMemberGrade" resultMap="memberGradeMap">
+		SELECT * FROM
+		member_grade;
+	</select>
+
+	<!-- 删除会员等级 -->
+	<delete id="delGrade" parameterType="int">
+		DELETE FROM member_grade
+		WHERE id=#{id}
+	</delete>
+
+	<!-- 新增会员等级是否存在 -->
+	<select id="selectRank" parameterType="com.goafanti.memberGrade.bo.MemberGrade"
+		resultType="int">
+		SELECT COUNT(*) FROM member_grade WHERE
+		member_rank=#{memberRank}
+	</select>
+
+
+	<!-- 新增会员等级 -->
+	<insert id="addGradeName" parameterType="com.goafanti.memberGrade.bo.MemberGrade"
+		useGeneratedKeys="true" keyProperty="id">
+		INSERT INTO
+		member_grade(grade_name,member_rank) VALUES (#{gradeName},#{memberRank})
+	</insert>
+
+
+	<!-- 为等级添加业务和费用 -->
+	<update id="addBusinessAndCost" parameterType="com.goafanti.memberGrade.bo.MemberGrade">
+		UPDATE
+		member_grade SET business=#{business},cost=#{cost} WHERE id=#{id}
+	</update>
+
+
+	<!-- 前台会员订单查询 -->
+	<select id="selectMemberOrder" parameterType="java.util.Map"
+		resultMap="memberOrderMap">
+		SELECT mo.id,menber_type , mg.grade_name, price,
+		valid_month,order_state ,order_time ,user_id ,
+		payment_time,payment_value,payment_type ,payment_id ,valid_time
+		FROM member_order mo
+		LEFT JOIN member_grade mg ON mg.member_rank=mo.menber_type
+		WHERE user_id=#{id} and mo.order_state &lt; 9
+		LIMIT #{pNos},#{pSize}
+	</select>
+
+
+	<!-- 后台会员订单查询 -->
+	<select id="selectMemberOrderBa" parameterType="java.util.Map"
+		resultMap="memberOrderMap">
+		SELECT mo.id,menber_type ,u.mobile ,u.nickname,mg.grade_name, price,
+		valid_month,order_state ,order_time ,user_id ,
+		payment_time
+		,payment_value,payment_type ,payment_id ,valid_time FROM member_order
+		mo
+		LEFT JOIN member_grade mg ON mg.member_rank=mo.menber_Type
+		LEFT JOIN user u ON
+		u.id=mo.user_id
+		WHERE 1=1
+		<if test="id!=null">AND mo.id = #{id}</if>
+		<if test="mobile!=null">AND u.mobile LIKE CONCAT('%',#{mobile},'%')</if>
+		<if test="nickname!=null"> AND u.nickname LIKE CONCAT('%',#{nickname},'%')</if>
+		<if test="orderState!=null">AND order_state = #{orderState}</if>
+		<if test="orderState==null">AND order_state &lt; 9</if>
+		<if test="startTimes!=null"> AND order_time&gt;=#{startTimes}</if>
+		<if test="endTimes!=null">AND order_time&lt;=#{endTimes}</if>
+		LIMIT #{pNos},#{pSize}
+	</select>
+
+
+	<!-- 后台查询总记录 -->
+	<select id="countMemberOrderWhere" parameterType="java.util.Map"
+		resultType="int">
+		SELECT COUNT(*) FROM member_order mo
+		LEFT JOIN user u ON u.id=mo.user_id
+		WHERE 1=1
+		<if test="id!=null">AND mo.id = #{id}</if>
+		<if test="mobile!=null">AND u.mobile LIKE CONCAT('%',#{mobile},'%')</if>
+		<if test="nickname!=null"> AND u.nickname LIKE CONCAT('%',#{nickname},'%')</if>
+		<if test="orderState!=null">AND order_state = #{orderState}</if>
+		<if test="orderState==null">AND order_state &lt; 9</if>
+		<if test="startTimes!=null"> AND order_time&gt;=#{startTimes}</if>
+		<if test="endTimes!=null">AND order_time&lt;=#{endTimes}</if>
+	</select>
+
+	<!-- 前台生成订单 -->
+	<insert id="addBasicsMemberOrder" parameterType="com.goafanti.common.model.MemberOrder">
+		INSERT INTO
+		member_order(id,menber_type,price,valid_month,order_state,order_time,user_id)
+		VALUES(#{id},#{menberType},#{price},#{validMonth},#{orderState},#{orderTime},#{userId})
+	</insert>
+
+	<select id="countMemberOrder" parameterType="String"  resultType="int">
+		SELECT COUNT(*) FROM
+		member_order
+		WHERE  user_id=#{userId} and order_state &lt; 9
+	</select>
+
+	<!-- 后台订单更改 -->
+	<update id="updateMemberOrder" parameterType="java.util.Map" >
+		UPDATE member_order SET 
+		menber_type=#{menberType},
+		valid_month=#{validMonth},
+		payment_value=#{paymentValue},
+		order_state=#{orderState},
+		payment_time=#{paymentTime},
+		payment_type=#{paymentType},
+		payment_id=#{paymentId} 
+		WHERE id=#{id}
+	</update>
+	
+	<!-- 后台订单软删除 -->
+	<update id="delMemberOrder">
+		UPDATE member_order SET order_state=9 
+		WHERE id=#{id} and order_state = 0
+		<if test="uid!=null">AND user_id = #{uid}</if>
+	</update>
+
+	<!-- 更改用户会员等级 -->
+	<update id="updateUserLvl" parameterType="java.util.Map">
+		UPDATE user SET lvl=#{lvl}  WHERE id=#{userId}
+	</update>
+	
 </mapper>

+ 157 - 157
src/main/java/com/goafanti/common/model/AchievementOrder.java

@@ -1,158 +1,158 @@
-package com.goafanti.common.model;
-
-import java.util.Date;
-
-public class AchievementOrder {
-    private String id;
-
-    /**
-    * 编号
-    */
-    private Integer serialNumber;
-
-    /**
-    * 科技成果ID
-    */
-    private String achievementId;
-
-    /**
-    * 购买科技成果人ID
-    */
-    private String uid;
-
-    /**
-    * 购买时间
-    */
-    private Date createTime;
-
-    /**
-    * 流程变动(0--初始意向,1--意向金,2--签订合同,3--合同金,4--佣金,5--服务金,6--关闭(未签合同),7--关闭(已签合同))
-    */
-    private Integer status;
-
-    /**
-    * 意向金
-    */
-    private Integer intentionMoney;
-
-    /**
-    * 合同金
-    */
-    private Integer contractMoney;
-
-    /**
-    * 佣金
-    */
-    private Integer commission;
-
-    /**
-    * 服务金
-    */
-    private Integer serviceMoney;
-
-    /**
-    * 是否退款(0--未退款,1--已退款)
-    */
-    private Integer refund;
-
-    /**
-    * 删除标记(0--未删除,1--已删除)
-    */
-    private Integer deletedSign;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public Integer getSerialNumber() {
-        return serialNumber;
-    }
-
-    public void setSerialNumber(Integer serialNumber) {
-        this.serialNumber = serialNumber;
-    }
-
-    public String getAchievementId() {
-        return achievementId;
-    }
-
-    public void setAchievementId(String achievementId) {
-        this.achievementId = achievementId;
-    }
-
-    public String getUid() {
-        return uid;
-    }
-
-    public void setUid(String uid) {
-        this.uid = uid;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public Integer getIntentionMoney() {
-        return intentionMoney;
-    }
-
-    public void setIntentionMoney(Integer intentionMoney) {
-        this.intentionMoney = intentionMoney;
-    }
-
-    public Integer getContractMoney() {
-        return contractMoney;
-    }
-
-    public void setContractMoney(Integer contractMoney) {
-        this.contractMoney = contractMoney;
-    }
-
-    public Integer getCommission() {
-        return commission;
-    }
-
-    public void setCommission(Integer commission) {
-        this.commission = commission;
-    }
-
-    public Integer getServiceMoney() {
-        return serviceMoney;
-    }
-
-    public void setServiceMoney(Integer serviceMoney) {
-        this.serviceMoney = serviceMoney;
-    }
-
-    public Integer getRefund() {
-        return refund;
-    }
-
-    public void setRefund(Integer refund) {
-        this.refund = refund;
-    }
-
-    public Integer getDeletedSign() {
-        return deletedSign;
-    }
-
-    public void setDeletedSign(Integer deletedSign) {
-        this.deletedSign = deletedSign;
-    }
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class AchievementOrder {
+    private String id;
+
+    /**
+    * 编号
+    */
+    private Integer serialNumber;
+
+    /**
+    * 科技成果ID
+    */
+    private String achievementId;
+
+    /**
+    * 购买科技成果人ID
+    */
+    private String uid;
+
+    /**
+    * 购买时间
+    */
+    private Date createTime;
+
+    /**
+    * (0, "未支付"),(1, "已支付"),(2, "支付中"),(3, "完成"),(9, "取消"),(10, "无效")
+    */
+    private Integer status;
+
+    /**
+    * 实际支付金额
+    */
+    private Double paymentValue;
+
+    /**
+    * 支付方式
+    */
+    private String paymentType;
+
+    /**
+    * 支付流水号
+    */
+    private String paymentId;
+
+    /**
+    * 支付时间
+    */
+    private Date paymentTime;
+
+    /**
+    * 是否退款(0--未退款,1--已退款)
+    */
+    private Integer refund;
+
+    /**
+    * 删除标记(0--未删除,1--已删除)
+    */
+    private Integer deletedSign;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer getSerialNumber() {
+        return serialNumber;
+    }
+
+    public void setSerialNumber(Integer serialNumber) {
+        this.serialNumber = serialNumber;
+    }
+
+    public String getAchievementId() {
+        return achievementId;
+    }
+
+    public void setAchievementId(String achievementId) {
+        this.achievementId = achievementId;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Double getPaymentValue() {
+        return paymentValue;
+    }
+
+    public void setPaymentValue(Double paymentValue) {
+        this.paymentValue = paymentValue;
+    }
+
+    public String getPaymentType() {
+        return paymentType;
+    }
+
+    public void setPaymentType(String paymentType) {
+        this.paymentType = paymentType;
+    }
+
+    public String getPaymentId() {
+        return paymentId;
+    }
+
+    public void setPaymentId(String paymentId) {
+        this.paymentId = paymentId;
+    }
+
+    public Date getPaymentTime() {
+        return paymentTime;
+    }
+
+    public void setPaymentTime(Date paymentTime) {
+        this.paymentTime = paymentTime;
+    }
+
+    public Integer getRefund() {
+        return refund;
+    }
+
+    public void setRefund(Integer refund) {
+        this.refund = refund;
+    }
+
+    public Integer getDeletedSign() {
+        return deletedSign;
+    }
+
+    public void setDeletedSign(Integer deletedSign) {
+        this.deletedSign = deletedSign;
+    }
 }

+ 100 - 90
src/main/java/com/goafanti/memberGrade/controller/MemberGradeController.java

@@ -1,13 +1,16 @@
 package com.goafanti.memberGrade.controller;
+
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+
 import com.alibaba.fastjson.JSON;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.bo.Result;
@@ -19,6 +22,7 @@ import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.memberGrade.bo.MemberGrade;
 import com.goafanti.memberGrade.bo.MemberGradeBO;
 import com.goafanti.memberGrade.service.MemberGradeService;
+
 /**
  * 会员等级管理 后台
  * 
@@ -28,95 +32,101 @@ import com.goafanti.memberGrade.service.MemberGradeService;
 @RestController
 @RequestMapping(value = "/api/admin/member")
 public class MemberGradeController extends BaseApiController {
-    @Autowired
-    private MemberGradeService memberGradeService;
-    /**
-     * 查询全部信息
-     * 
-     * @return
-     */
-    @RequestMapping(value = "/selectMemberGrade", method = RequestMethod.GET)
-    public Result selectMemberGrade() {
-        List<MemberGrade> list = memberGradeService.selectMemberGrade();
-        List<MemberGradeBO> result = new ArrayList<>();
-        for (MemberGrade mg : list) {
-            result.add(new MemberGradeBO(mg.getId(), mg.getGradeName(), JSON.parseObject(mg.getBusiness()),
-                    JSON.parseObject(mg.getCost()), mg.getMemberRank()));
-        }
-        return res().data(result);
-    }
-    /**
-     * 删除会员等级
-     * 
-     * @param id
-     * @return
-     */
-    @RequestMapping(value = "/delGrade", method = RequestMethod.POST)
-    public Result delGrade(int id) {
-        return res().data(memberGradeService.delGrade(id));
-    }
-    /**
-     * 新增会员等级名称
-     * 
-     * @param name
-     * @return
-     */
-    @RequestMapping(value = "/addGradeName", method = RequestMethod.POST)
-    public Result addGradeName(MemberGrade me) {
-        if (memberGradeService.selectRank(me) >= 1) {
-            Error e = new Error();
-            e.setMessage("该会员等级已存在");
-            return res().error(e);
-        }
-        memberGradeService.addGradeName(me);
-        return res().data(me.getId());
-    }
-    /**
-     * 增加业务及费用 与更改
-     * 
-     * @param me
-     * @return
-     */
-    @RequestMapping(value = "/addBusinessAndCost", method = RequestMethod.POST)
-    public Result addBusinessAndCost(MemberGrade me) {
-        return res().data(memberGradeService.addBusinessAndCost(me));
-    }
-    /**
-     * 后台会员订单列表单
-     * 
-     * @param pageNo
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value = "/selectMemberOrderBa", method = RequestMethod.GET)
-    public Result selectMemberOrderBa(String pageNo, String pageSize, Long id, String mobile, String nickname,
-            Integer orderState, String startTime, String endTime) {
-        Integer pNo=getPageNo(pageNo);
-        Integer pSize=getPageSize(pageSize);
-        Integer pNos = (pNo - 1) * pSize;
-        Map<String, Object> map = new HashMap<>();
-        map.put("pNos", pNos);
-        map.put("pSize", pSize);
-        map.put("id", id);
-        map.put("mobile", mobile);
-        map.put("nickname", nickname);
-        map.put("orderState", orderState);
-        map.put("startTimes", startTime);
-        if(endTime!=null){
-            try {
-                map.put("endTimes", DateUtils.addDays(DateUtils.parseDate(endTime, AFTConstants.YYYYMMDD), 1));
-            } catch (ParseException e) {
-                LoggerUtils.error(this.getClass(), "ffff", e);
-            }
-        }
-        List<MemberOrder> list = memberGradeService.selectMemberOrderBa(map);
-        int countWhere = memberGradeService.countMemberOrderWhere(map);
-        Map<String, Object> maps = new HashMap<>();
-        maps.put("list", list);
-        maps.put("countWhere", countWhere);
-        maps.put("pNo", pNo);
-        return res().data(maps);
-    }
+	@Autowired
+	private MemberGradeService memberGradeService;
+
+	/**
+	 * 查询全部信息
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/selectMemberGrade", method = RequestMethod.GET)
+	public Result selectMemberGrade() {
+		List<MemberGrade> list = memberGradeService.selectMemberGrade();
+		List<MemberGradeBO> result = new ArrayList<>();
+		for (MemberGrade mg : list) {
+			result.add(new MemberGradeBO(mg.getId(), mg.getGradeName(), JSON.parseObject(mg.getBusiness()),
+					JSON.parseObject(mg.getCost()), mg.getMemberRank()));
+		}
+		return res().data(result);
+	}
+
+	/**
+	 * 删除会员等级
+	 * 
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/delGrade", method = RequestMethod.POST)
+	public Result delGrade(int id) {
+		return res().data(memberGradeService.delGrade(id));
+	}
+
+	/**
+	 * 新增会员等级名称
+	 * 
+	 * @param name
+	 * @return
+	 */
+	@RequestMapping(value = "/addGradeName", method = RequestMethod.POST)
+	public Result addGradeName(MemberGrade me) {
+		if (memberGradeService.selectRank(me) >= 1) {
+			Error e = new Error();
+			e.setMessage("该会员等级已存在");
+			return res().error(e);
+		}
+		memberGradeService.addGradeName(me);
+		return res().data(me.getId());
+	}
+
+	/**
+	 * 增加业务及费用 与更改
+	 * 
+	 * @param me
+	 * @return
+	 */
+	@RequestMapping(value = "/addBusinessAndCost", method = RequestMethod.POST)
+	public Result addBusinessAndCost(MemberGrade me) {
+		return res().data(memberGradeService.addBusinessAndCost(me));
+	}
+
+	/**
+	 * 后台会员订单列表单
+	 * 
+	 * @param pageNo
+	 * @param pageSize
+	 * @return
+	 */
+	@RequestMapping(value = "/selectMemberOrderBa", method = RequestMethod.GET)
+	public Result selectMemberOrderBa(String pageNo, String pageSize, Long id, String mobile, String nickname,
+			Integer orderState, String startTime, String endTime) {
+		Integer pNo = getPageNo(pageNo);
+		Integer pSize = getPageSize(pageSize);
+		Integer pNos = (pNo - 1) * pSize;
+		Map<String, Object> map = new HashMap<>();
+		map.put("pNos", pNos);
+		map.put("pSize", pSize);
+		map.put("id", id);
+		map.put("mobile", mobile);
+		map.put("nickname", nickname);
+		map.put("orderState", orderState);
+		map.put("startTimes", startTime);
+		if (endTime != null) {
+			try {
+				map.put("endTimes", DateUtils.addDays(DateUtils.parseDate(endTime, AFTConstants.YYYYMMDD), 1));
+			} catch (ParseException e) {
+				LoggerUtils.error(this.getClass(), "ffff", e);
+			}
+		}
+		List<MemberOrder> list = memberGradeService.selectMemberOrderBa(map);
+		int countWhere = memberGradeService.countMemberOrderWhere(map);
+		Map<String, Object> maps = new HashMap<>();
+		maps.put("list", list);
+		maps.put("countWhere", countWhere);
+		maps.put("pNo", pNo);
+		return res().data(maps);
+	}
+
 	/**
 	 * 后台会员更改
 	 * 
@@ -158,4 +168,4 @@ public class MemberGradeController extends BaseApiController {
 		return res().data(memberGradeService.delMemberOrder(id));
 	}
 
-}
+}

+ 7 - 3
src/main/java/com/goafanti/memberGrade/controller/MemberGradeFrontController.java

@@ -4,11 +4,13 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.Assert;
 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.controller.BaseApiController;
 import com.goafanti.common.enums.OrderState;
@@ -27,9 +29,9 @@ import com.goafanti.memberGrade.service.MemberGradeService;
 @RequestMapping(value = "/api/user/member")
 public class MemberGradeFrontController extends BaseApiController {
 	@Autowired
-	private MemberGradeService memberGradeService;
+	private MemberGradeService	memberGradeService;
 	@Autowired
-	private JDBCIdGenerator jDBCIdGenerator;
+	private JDBCIdGenerator		jDBCIdGenerator;
 
 	/**
 	 * 前台会员订单
@@ -75,6 +77,7 @@ public class MemberGradeFrontController extends BaseApiController {
 		mo.setUserId(TokenManager.getUserId());
 		return res().data(memberGradeService.addBasicsMemberOrder(mo));
 	}
+
 	/**
 	 * 
 	 * @param id
@@ -84,4 +87,5 @@ public class MemberGradeFrontController extends BaseApiController {
 	public Result delMemberOrder(Long id) {
 		return res().data(memberGradeService.delMemberOrder(id));
 	}
-}
+
+}

+ 0 - 1
src/main/java/com/goafanti/portal/bo/AchievementSearchListBo.java

@@ -8,7 +8,6 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.model.Achievement;
 
 public class AchievementSearchListBo {
 	private String		id;

+ 4 - 3
src/main/java/com/goafanti/portal/controller/PortalOrderApiController.java

@@ -106,7 +106,7 @@ public class PortalOrderApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!AchievementOrderStatus.CREATE.getCode().equals(order.getStatus())) {
+		if (!AchievementOrderStatus.UNPAYED.getCode().equals(order.getStatus())) {
 			res.getError().add(buildError("", "当前状态无法撤销!"));
 			return res;
 		}
@@ -158,8 +158,9 @@ public class PortalOrderApiController extends CertifyApiController {
 				.selectAchievementOrderByUidAndAchievementId(TokenManager.getUserId(), achievementId);
 		if (!ao.isEmpty()) {
 			for (AchievementOrder os : ao) {
-				if (!AchievementOrderStatus.SHUTDOWN.getCode().equals(os.getStatus())) {
-					res.getError().add(buildError("", "当前科技成果已购买!"));
+				AchievementOrderStatus status = AchievementOrderStatus.getStatus(os.getStatus());
+				if (status != AchievementOrderStatus.CANCELLED || status != AchievementOrderStatus.INVALID) {
+					res.getError().add(buildError("", "当前科技成果已被购买!"));
 					return res;
 				}
 			}

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

@@ -51,7 +51,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.43
+static.host=//afts.hnzhiming.com/1.0.44
 
 upload.path=/data/wwwroot/aft/upload
 upload.private.path=/data/upload

+ 36 - 30
src/main/resources/props/config_local.properties

@@ -1,49 +1,49 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
-#\u6570\u636e\u5e93\u94fe\u63a5\uff0c
-jdbc.url=jdbc:mysql://192.168.1.213:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#\u5e10\u53f7
-jdbc.username=dev
-#\u5bc6\u7801
+#\u6570\u636E\u5E93\u94FE\u63A5\uFF0C
+jdbc.url=jdbc:mysql://127.0.0.1:3306/aft_dev?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#\u5E10\u53F7
+jdbc.username=root
+#\u5BC6\u7801
 jdbc.password=123456
-#\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
+#\u68C0\u6D4B\u6570\u636E\u5E93\u94FE\u63A5\u662F\u5426\u6709\u6548\uFF0C\u5FC5\u987B\u914D\u7F6E
 jdbc.validationQuery=SELECT 'x'
-#\u521d\u59cb\u8fde\u63a5\u6570
+#\u521D\u59CB\u8FDE\u63A5\u6570
 jdbc.initialSize=3
-#\u6700\u5927\u8fde\u63a5\u6c60\u6570\u91cf
+#\u6700\u5927\u8FDE\u63A5\u6C60\u6570\u91CF
 jdbc.maxActive=20
-#\u53bb\u6389\uff0c\u914d\u7f6e\u6587\u4ef6\u5bf9\u5e94\u53bb\u6389
+#\u53BB\u6389\uFF0C\u914D\u7F6E\u6587\u4EF6\u5BF9\u5E94\u53BB\u6389
 #jdbc.maxIdle=20
-#\u914d\u7f6e0,\u5f53\u7ebf\u7a0b\u6c60\u6570\u91cf\u4e0d\u8db3\uff0c\u81ea\u52a8\u8865\u5145\u3002
+#\u914D\u7F6E0,\u5F53\u7EBF\u7A0B\u6C60\u6570\u91CF\u4E0D\u8DB3\uFF0C\u81EA\u52A8\u8865\u5145\u3002
 jdbc.minIdle=0
-#\u83b7\u53d6\u94fe\u63a5\u8d85\u65f6\u65f6\u95f4\u4e3a1\u5206\u949f\uff0c\u5355\u4f4d\u4e3a\u6beb\u79d2\u3002
+#\u83B7\u53D6\u94FE\u63A5\u8D85\u65F6\u65F6\u95F4\u4E3A1\u5206\u949F\uFF0C\u5355\u4F4D\u4E3A\u6BEB\u79D2\u3002
 jdbc.maxWait=120000
-#\u83b7\u53d6\u94fe\u63a5\u7684\u65f6\u5019\uff0c\u4e0d\u6821\u9a8c\u662f\u5426\u53ef\u7528\uff0c\u5f00\u542f\u4f1a\u6709\u635f\u6027\u80fd\u3002
+#\u83B7\u53D6\u94FE\u63A5\u7684\u65F6\u5019\uFF0C\u4E0D\u6821\u9A8C\u662F\u5426\u53EF\u7528\uFF0C\u5F00\u542F\u4F1A\u6709\u635F\u6027\u80FD\u3002
 jdbc.testOnBorrow=false
-#\u5f52\u8fd8\u94fe\u63a5\u5230\u8fde\u63a5\u6c60\u7684\u65f6\u5019\u6821\u9a8c\u94fe\u63a5\u662f\u5426\u53ef\u7528\u3002
+#\u5F52\u8FD8\u94FE\u63A5\u5230\u8FDE\u63A5\u6C60\u7684\u65F6\u5019\u6821\u9A8C\u94FE\u63A5\u662F\u5426\u53EF\u7528\u3002
 jdbc.testOnReturn=false
-#\u6b64\u9879\u914d\u7f6e\u4e3atrue\u5373\u53ef\uff0c\u4e0d\u5f71\u54cd\u6027\u80fd\uff0c\u5e76\u4e14\u4fdd\u8bc1\u5b89\u5168\u6027\u3002\u610f\u4e49\u4e3a\uff1a\u7533\u8bf7\u8fde\u63a5\u7684\u65f6\u5019\u68c0\u6d4b\uff0c\u5982\u679c\u7a7a\u95f2\u65f6\u95f4\u5927\u4e8etimeBetweenEvictionRunsMillis\uff0c\u6267\u884cvalidationQuery\u68c0\u6d4b\u8fde\u63a5\u662f\u5426\u6709\u6548\u3002
+#\u6B64\u9879\u914D\u7F6E\u4E3Atrue\u5373\u53EF\uFF0C\u4E0D\u5F71\u54CD\u6027\u80FD\uFF0C\u5E76\u4E14\u4FDD\u8BC1\u5B89\u5168\u6027\u3002\u610F\u4E49\u4E3A\uFF1A\u7533\u8BF7\u8FDE\u63A5\u7684\u65F6\u5019\u68C0\u6D4B\uFF0C\u5982\u679C\u7A7A\u95F2\u65F6\u95F4\u5927\u4E8EtimeBetweenEvictionRunsMillis\uFF0C\u6267\u884CvalidationQuery\u68C0\u6D4B\u8FDE\u63A5\u662F\u5426\u6709\u6548\u3002
 jdbc.testWhileIdle=true
-#1.Destroy\u7ebf\u7a0b\u4f1a\u68c0\u6d4b\u8fde\u63a5\u7684\u95f4\u9694\u65f6\u95f4
-#2.testWhileIdle\u7684\u5224\u65ad\u4f9d\u636e
+#1.Destroy\u7EBF\u7A0B\u4F1A\u68C0\u6D4B\u8FDE\u63A5\u7684\u95F4\u9694\u65F6\u95F4
+#2.testWhileIdle\u7684\u5224\u65AD\u4F9D\u636E
 jdbc.timeBetweenEvictionRunsMillis=60000
-#\u4e00\u4e2a\u94fe\u63a5\u751f\u5b58\u7684\u65f6\u95f4\uff08\u4e4b\u524d\u7684\u503c\uff1a25200000\uff0c\u8fd9\u4e2a\u65f6\u95f4\u6709\u70b9BT\uff0c\u8fd9\u4e2a\u7ed3\u679c\u4e0d\u77e5\u9053\u662f\u600e\u4e48\u6765\u7684\uff0c\u6362\u7b97\u540e\u7684\u7ed3\u679c\u662f\uff1a25200000/1000/60/60 = 7\u4e2a\u5c0f\u65f6\uff09
+#\u4E00\u4E2A\u94FE\u63A5\u751F\u5B58\u7684\u65F6\u95F4\uFF08\u4E4B\u524D\u7684\u503C\uFF1A25200000\uFF0C\u8FD9\u4E2A\u65F6\u95F4\u6709\u70B9BT\uFF0C\u8FD9\u4E2A\u7ED3\u679C\u4E0D\u77E5\u9053\u662F\u600E\u4E48\u6765\u7684\uFF0C\u6362\u7B97\u540E\u7684\u7ED3\u679C\u662F\uFF1A25200000/1000/60/60 = 7\u4E2A\u5C0F\u65F6\uFF09
 jdbc.minEvictableIdleTimeMillis=300000
-#\u94fe\u63a5\u4f7f\u7528\u8d85\u8fc7\u65f6\u95f4\u9650\u5236\u662f\u5426\u56de\u6536
+#\u94FE\u63A5\u4F7F\u7528\u8D85\u8FC7\u65F6\u95F4\u9650\u5236\u662F\u5426\u56DE\u6536
 jdbc.removeAbandoned=true
-#\u8d85\u8fc7\u65f6\u95f4\u9650\u5236\u65f6\u95f4\uff08\u5355\u4f4d\u79d2\uff09\uff0c\u76ee\u524d\u4e3a5\u5206\u949f\uff0c\u5982\u679c\u6709\u4e1a\u52a1\u5904\u7406\u65f6\u95f4\u8d85\u8fc75\u5206\u949f\uff0c\u53ef\u4ee5\u9002\u5f53\u8c03\u6574\u3002
+#\u8D85\u8FC7\u65F6\u95F4\u9650\u5236\u65F6\u95F4\uFF08\u5355\u4F4D\u79D2\uFF09\uFF0C\u76EE\u524D\u4E3A5\u5206\u949F\uFF0C\u5982\u679C\u6709\u4E1A\u52A1\u5904\u7406\u65F6\u95F4\u8D85\u8FC75\u5206\u949F\uFF0C\u53EF\u4EE5\u9002\u5F53\u8C03\u6574\u3002
 jdbc.removeAbandonedTimeout=300
-#\u94fe\u63a5\u56de\u6536\u7684\u65f6\u5019\u63a7\u5236\u53f0\u6253\u5370\u4fe1\u606f\uff0c\u6d4b\u8bd5\u73af\u5883\u53ef\u4ee5\u52a0\u4e0atrue\uff0c\u7ebf\u4e0a\u73af\u5883false\u3002\u4f1a\u5f71\u54cd\u6027\u80fd\u3002
+#\u94FE\u63A5\u56DE\u6536\u7684\u65F6\u5019\u63A7\u5236\u53F0\u6253\u5370\u4FE1\u606F\uFF0C\u6D4B\u8BD5\u73AF\u5883\u53EF\u4EE5\u52A0\u4E0Atrue\uFF0C\u7EBF\u4E0A\u73AF\u5883false\u3002\u4F1A\u5F71\u54CD\u6027\u80FD\u3002
 jdbc.logAbandoned=true
-#\u7edf\u8ba1\u76d1\u63a7
+#\u7EDF\u8BA1\u76D1\u63A7
 jdbc.filters=stat
 
 logging.level.com.goafanti=DEBUG
 
-jedis.host=192.168.1.213
+jedis.host=127.0.0.1
 jedis.port=6379
 jedis.timeout=5000
-jedis.password=aft123456
+jedis.password=123456
 
 pwd.hash_algorithm_name=md5
 pwd.hash_iterations=2
@@ -52,23 +52,29 @@ session.timeout=12000000
 session.validate.timespan=18000000
 
 app.name=AFT
-template.cacheable=false
 
-static.host=//sb.jishutao.com/1.0.43
-portal.host=//sf.jishutao.com/portal/2.0.0
-avatar.host=//sb.jishutao.com
-avatar.upload.host=//sb.jishutao.com/upload
+static.host=//afts.hnzhiming.com/1.0.44
 
-upload.path=E:/data/public/upload
-upload.private.path=E:/data/private/upload
+upload.path=/Users/xiaolong/Sites/upload
+upload.private.path=/Users/xiaolong/Sites/doc
 
 accessKey=LTAIqTgQLLwz252Z
 accessSecret=ICGuiUnqzaar7urw4zecVcJrJ1MHg9
+
+avatar.host=//afts.hnzhiming.com
+
 aesSecretKey=aft1234567890123
 
+template.cacheable=false
+
 mobileCodeTemplate=SMS_37845022
+
+portal.host=//afts.hnzhiming.com/portal/2.0.0
+
 patentTemplate=SMS_72005286
 
+avatar.upload.host=//afts.hnzhiming.com/upload
+
 easemob.client.url=https://a1.easemob.com/1117170814115609/jitao
 easemob.client.id=YXA6RUDGkIDSEeemq9_4PWzcNA
 easemob.client.secret=YXA61NHE0renI5N8gEgizoI5ivM9SYE

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