init

src/main/java/com/yunniu/farming/app/GroupAreaAppController.java

@@ -63,7 +63,7 @@ public class GroupAreaAppController {
             item.setPageinfo(pinfo);
             item.setPageinfo(pinfo);
         }
         }
 
 
-        List<GroupBuy> list = groupAreaService.findPageList(item);
+        List<GroupArea> list = groupAreaService.findPageList(item);
 
 
         // 3.将查询结果的 分页数据封装后返回
         // 3.将查询结果的 分页数据封装后返回
         int totalRs = pinfo.getTotalRecords();        //总记录数
         int totalRs = pinfo.getTotalRecords();        //总记录数

src/main/java/com/yunniu/farming/webadmin/controller/GroupAreaController.java

@@ -66,7 +66,7 @@ public class GroupAreaController {
             item.setPageinfo(pinfo);
             item.setPageinfo(pinfo);
         }
         }
 
 
-        List<GroupBuy> list = groupAreaService.findPageList(item);
+        List<GroupArea> list = groupAreaService.findPageList(item);
 
 
         // 3.将查询结果的 分页数据封装后返回
         // 3.将查询结果的 分页数据封装后返回
         int totalRs = pinfo.getTotalRecords();        //总记录数
         int totalRs = pinfo.getTotalRecords();        //总记录数

src/main/java/com/yunniu/farming/webadmin/dao/GroupAreaDao.java

@@ -16,7 +16,7 @@ import java.util.List;
 @Mapper
 @Mapper
 public interface GroupAreaDao extends BaseMapper<GroupArea> {
 public interface GroupAreaDao extends BaseMapper<GroupArea> {
 
 
-    List<GroupBuy> findPageList(GroupArea item);
+    List<GroupArea> findPageList(GroupArea item);
 
 
     @Update("udpate group_area set area_status = 1 where id = #{id}")
     @Update("udpate group_area set area_status = 1 where id = #{id}")
     String deleteArea(Integer id);
     String deleteArea(Integer id);

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

@@ -19,6 +19,12 @@ public class GroupArea {
 
 
     private String areaName;
     private String areaName;
 
 
+    private String province;
+
+    private String city;
+
+    private String region;
+
     private String areaAddress;
     private String areaAddress;
 
 
     private String lngandlat;
     private String lngandlat;

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

@@ -30,6 +30,8 @@ public class GroupBuyProduct {
 
 
     private BigDecimal productPrice;
     private BigDecimal productPrice;
 
 
+    private String sunit;
+
     private Integer status;
     private Integer status;
 
 
     private Date createTime;
     private Date createTime;

src/main/java/com/yunniu/farming/webadmin/service/GroupAreaService.java

@@ -14,7 +14,7 @@ import java.util.List;
 public interface GroupAreaService {
 public interface GroupAreaService {
 
 
 
 
-    List<GroupBuy> findPageList(GroupArea item);
+    List<GroupArea> findPageList(GroupArea item);
 
 
     Result addOrEdit(GroupArea item);
     Result addOrEdit(GroupArea item);
 
 

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

@@ -24,7 +24,7 @@ public class GroupAreaServiceimpl implements GroupAreaService {
     @Autowired
     @Autowired
     private GroupAreaDao mapper;
     private GroupAreaDao mapper;
     @Override
     @Override
-    public List<GroupBuy> findPageList(GroupArea item) {
+    public List<GroupArea> findPageList(GroupArea item) {
 
 
         return mapper.findPageList(item);
         return mapper.findPageList(item);
     }
     }

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

@@ -86,6 +86,10 @@ public class OrderMainServiceImpl {
 
 
 		if (item.getId() == null) {
 		if (item.getId() == null) {
 
 
+			if (item.getItype().equals(OrderMain.ITYPE_GROUP)){
+
+			}
+
 			// 单据日期
 			// 单据日期
 			item.setSorderdate(DateTools.getDate("yyyy-MM-dd"));
 			item.setSorderdate(DateTools.getDate("yyyy-MM-dd"));
 			// 提交订单时间
 			// 提交订单时间
@@ -115,11 +119,6 @@ public class OrderMainServiceImpl {
 				// 调用 子表批量保存方法
 				// 调用 子表批量保存方法
 				this.orderSubDao.insertBatch(item.getSubs());
 				this.orderSubDao.insertBatch(item.getSubs());
 			}
 			}
-
-			if (item.getItype().equals(OrderMain.ITYPE_GROUP)){
-
-			}
-
 		}
 		}
 
 
 		return item;
 		return item;

src/main/resources/mappings/GroupAreaMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.yunniu.farming.webadmin.dao.GroupAreaDao">
 <mapper namespace="com.yunniu.farming.webadmin.dao.GroupAreaDao">
 
 
-	<select id="findPageList" resultType="com.yunniu.farming.webadmin.model.GroupBuy">
+	<select id="findPageList" resultType="com.yunniu.farming.webadmin.model.GroupArea">
 		select * from group_area
 		select * from group_area
 		<where>
 		<where>
 			area_status = 0
 			area_status = 0