添加通知信息

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/OrderInfo.java

@@ -232,6 +232,16 @@ public class OrderInfo implements Serializable {
 	 */
 	String payImg;
 
+	/**
+	 * 审核状态： 1、审核通过，2、审核拒绝
+	 */
+	Integer auditStatus;
+
+	/**
+	 * 审核理由
+	 */
+	String auditReason;
+
 	@Transient
 	private List<OrderItem> orderItemList;
 

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/OrderInfoBiz.java

@@ -1019,18 +1019,25 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 	 * @return
 	 */
 	public ObjectRestResponse payByCompanyBank(OrderInfo orderInfo) {
-		if (orderInfo == null || StringUtils.isBlank(orderInfo.getOrderNo())) {
+		if (orderInfo == null || StringUtils.isBlank(orderInfo.getOrderNo()) || orderInfo.getAuditStatus() == null) {
 			return ObjectRestResponse.createFailedResult(ResultCode.PARAM_ILLEGAL_CODE, ResultCode.getMsg(ResultCode.PARAM_ILLEGAL_CODE));
 		}
 		OrderInfo old = getOneByOrderNo(orderInfo.getOrderNo());
 		if (old == null) {
 			return ObjectRestResponse.createFailedResult(ResultCode.ORDER_NOT_EXIST, ResultCode.getMsg(ResultCode.ORDER_NOT_EXIST));
 		}
-		old.setPayImg(orderInfo.getPayImg());
-		old.setPayCode(orderInfo.getPayCode());
-		old.setPayType(3);
-		old.setPayTime(new Date());
-		updateSelectiveByIdRe(old);
+		if (orderInfo.getAuditStatus() == 1) {
+			old.setPayImg(orderInfo.getPayImg());
+			old.setPayCode(orderInfo.getPayCode());
+			old.setPayType(3);
+			old.setPayTime(new Date());
+			old.setAuditStatus(1);
+			updateSelectiveByIdRe(old);
+		} else {
+			old.setAuditStatus(2);
+			old.setAuditReason(orderInfo.getAuditReason());
+			updateSelectiveByIdRe(old);
+		}
 		return ObjectRestResponse.succ();
 	}