init

src/main/java/com/yunniu/farming/webadmin/model/GroupBuy.java

@@ -38,6 +38,11 @@ public class GroupBuy {
     private String groupBuyPic;
 
     /**
+     * 简介
+     */
+    private String groupBlurb;
+
+    /**
      * 拼团开始时间
      */
     private Date startTime;

src/main/java/com/yunniu/farming/webadmin/model/OrderMain.java

@@ -25,6 +25,7 @@ public class OrderMain {
 
     // 订单类型
     public static final Integer ITYPE_TAKE = 10; // 外卖订单
+    public static final Integer ITYPE_GROUP = 20; // 团购订单
 
     // 关联查询对象: 关联用户表
     @TableField(exist = false)

src/main/java/com/yunniu/farming/webadmin/service/impl/OrderMainServiceImpl.java

@@ -14,6 +14,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.aspectj.weaver.ast.Or;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
 import java.text.DecimalFormat;
@@ -80,6 +81,7 @@ public class OrderMainServiceImpl {
 	 * 创建订单
 	 * @return
 	 */
+	@Transactional(rollbackFor = Exception.class)
 	public OrderMain addOrder(OrderMain item) {
 
 		if (item.getId() == null) {
@@ -114,6 +116,10 @@ public class OrderMainServiceImpl {
 				this.orderSubDao.insertBatch(item.getSubs());
 			}
 
+			if (item.getItype().equals(OrderMain.ITYPE_GROUP)){
+
+			}
+
 		}
 
 		return item;