init

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

+package com.yunniu.farming.webadmin.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author zyf
+ * @date 2023/5/16
+ * @apiNote
+ */
+
+@Controller
+@RequestMapping("/groupOrder")
+public class GroupOrderController {
+
+}

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

+package com.yunniu.farming.webadmin.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunniu.farming.webadmin.model.GroupOrder;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author zyf
+ * @date 2023/5/16
+ * @apiNote
+ */
+@Mapper
+public interface GroupOrderDao  extends BaseMapper<GroupOrder> {
+
+}

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

@@ -30,6 +30,10 @@ public class GroupArea {
 
     private String lngandlat;
 
+    private String liaisonMan;
+
+    private String liaisonPhone;
+
     private Integer areaStatus;
 
     private Date createTime;

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

+package com.yunniu.farming.webadmin.model;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zyf
+ * @date 2023/5/16
+ * @apiNote
+ */
+@Data
+public class GroupOrder {
+
+    private Long id;
+
+    private Long groupBuyId;
+
+    private Long areaId;
+
+    private Integer groupSize;
+
+    private Integer groupStatus;
+
+    private Date successTime;
+
+    private Date createTime;
+
+    private String createBy;
+}

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

@@ -120,5 +120,10 @@ public class OrderMain {
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private Date ddef10; // 自定义项10
 
+    @TableField(exist = false)
+    private Long areaId;
+
+    @TableField(exist = false)
+    private Long groupBuyId;
 
 }

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

+package com.yunniu.farming.webadmin.service;
+
+/**
+ * @author zyf
+ * @date 2023/5/16
+ * @apiNote
+ */
+public interface GroupOrderService {
+
+}

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

+package com.yunniu.farming.webadmin.service.impl;
+
+import com.yunniu.farming.webadmin.service.GroupOrderService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author zyf
+ * @date 2023/5/16
+ * @apiNote
+ */
+@Service
+@Slf4j
+public class GroupOrderServiceImpl implements GroupOrderService {
+}

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

@@ -6,9 +6,11 @@ import com.yunniu.farming.util.DateUtils;
 import com.yunniu.farming.util.StringHelper;
 import com.yunniu.farming.util.WxPayAppUtils;
 import com.yunniu.farming.webadmin.dao.*;
+import com.yunniu.farming.webadmin.model.GroupOrder;
 import com.yunniu.farming.webadmin.model.Integralrec;
 import com.yunniu.farming.webadmin.model.OrderMain;
 import com.yunniu.farming.webadmin.model.OrderSub;
+import com.yunniu.farming.webadmin.service.GroupOrderService;
 import com.yunniu.farming.wx.WxConfigUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.aspectj.weaver.ast.Or;
@@ -37,6 +39,10 @@ public class OrderMainServiceImpl {
 	@Autowired
 	private IntegralrecDao integralrecDao;
 
+	@Autowired
+	private GroupOrderService orderService;
+
+
 	/**
 	 * 分页查询所有数据
 	 * @return
@@ -87,9 +93,8 @@ public class OrderMainServiceImpl {
 		if (item.getId() == null) {
 
 			if (item.getItype().equals(OrderMain.ITYPE_GROUP)){
-
+//				GroupOrder order = orderService.
 			}
-
 			// 单据日期
 			item.setSorderdate(DateTools.getDate("yyyy-MM-dd"));
 			// 提交订单时间

src/main/resources/mappings/GroupOrderMapper.xml

+<?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.yunniu.farming.webadmin.dao.GroupOrderDao">
+
+
+</mapper>
\ No newline at end of file