添加列表接口：

1、系统配置
2、商品信息、商品分类
3、订单
4、购物车
5、优惠券

.idea/uiDesigner.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyBuycar/entity/TeambuyBuycar.java

@@ -5,10 +5,12 @@ import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.teambuyGoods.entity.TeambuyGoods;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -61,4 +63,8 @@ public class TeambuyBuycar implements Serializable {
 	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "关联用户id")
     private java.lang.String userId;
+
+    //商品信息
+    @TableField(exist = false)
+    TeambuyGoods goods;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderGoods/entity/TeambuyOrderGoods.java

@@ -5,10 +5,13 @@ import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.teambuyGoods.entity.TeambuyGoods;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -70,4 +73,8 @@ public class TeambuyOrderGoods implements Serializable {
 	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "关联用户id")
     private java.lang.String userId;
+
+    //商品信息
+    @TableField(exist = false)
+    TeambuyGoods goods;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/entity/TeambuyOrderLeader.java

@@ -4,11 +4,15 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.teambuyOrderMember.entity.TeambuyOrderMember;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -61,4 +65,9 @@ public class TeambuyOrderLeader implements Serializable {
 	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "关联团长id")
     private java.lang.String userId;
+
+    //团餐下的订单列表信息
+    @TableField(exist = false)
+    List<TeambuyOrderMember> orderMemberList;
+
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/entity/TeambuyOrderMember.java

@@ -4,11 +4,17 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.teambuyGoods.entity.TeambuyGoods;
+import org.jeecg.modules.teambuyOrderGoods.entity.TeambuyOrderGoods;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -78,4 +84,12 @@ public class TeambuyOrderMember implements Serializable {
 	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "关联用户id")
     private java.lang.String userId;
+
+    //商品列表信息
+    @TableField(exist = false)
+    List<TeambuyOrderGoods> goodsList;
+
+    //用户信息
+    @TableField(exist = false)
+    HanHaiMember hanHaiMember;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/ConfigController.java

@@ -0,0 +1,40 @@
+package org.jeecg.modules.api.teambuyController;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.PageBean;
+import org.jeecg.modules.apiService.ConfigService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Api(tags="小程序-系统配置相关接口")
+@RestController
+@RequestMapping("/teambuy/config")
+@Slf4j
+public class ConfigController {
+
+    /******************************************************************************************************************/
+    //配置信息
+    @Resource
+    private ConfigService configService;
+    /******************************************************************************************************************/
+    //查看系统配置列表
+    @ApiOperation(value="系统配置-查询系统配置列表", notes="系统配置-查询系统配置列表")
+    @RequestMapping(value = "/queryConfigList", method = {RequestMethod.GET})
+    public Result<?> queryConfigList(PageBean pageBean){
+        return configService.queryConfigList(pageBean);
+    }
+
+    //查看系统配置详情
+    @ApiOperation(value="系统配置-查询系统配置详情", notes="系统配置-查询系统配置详情")
+    @RequestMapping(value = "/queryConfigByParamCode", method = {RequestMethod.GET})
+    public Result<?> queryConfigByParamCode(String paramCode){
+        return configService.queryConfigByParamCode(paramCode);
+    }
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/CouponController.java

@@ -0,0 +1,36 @@
+package org.jeecg.modules.api.teambuyController;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.PageBean;
+import org.jeecg.modules.apiService.CouponService;
+import org.jeecg.modules.apiService.ShopcarService;
+import org.jeecg.modules.teambuyBuycar.entity.TeambuyBuycar;
+import org.jeecg.modules.teambuyCoupon.entity.TeambuyCoupon;
+import org.jeecg.modules.teambuyCouponUser.entity.TeambuyCouponUser;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Api(tags="我的-优惠券相关接口")
+@RestController
+@RequestMapping("/teambuy/coupon")
+@Slf4j
+public class CouponController {
+    /******************************************************************************************************************/
+    //优惠券
+    @Resource
+    private CouponService couponService;
+    /******************************************************************************************************************/
+    //查看优惠券列表
+    @ApiOperation(value="订单-查看优惠券列表/详情", notes="订单-查看优惠券列表/详情")
+    @RequestMapping(value = "/queryCouponList", method = {RequestMethod.GET})
+    public Result<?> queryCouponList(@RequestHeader("X-Access-Token") String token, TeambuyCouponUser teambuyCouponUser, PageBean pageBean){
+        return couponService.queryCouponList(token, teambuyCouponUser, pageBean);
+    }
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/GoodsController.java

@@ -0,0 +1,48 @@
+package org.jeecg.modules.api.teambuyController;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.PageBean;
+import org.jeecg.modules.apiService.GoodsService;
+import org.jeecg.modules.teambuyCategory.entity.TeambuyCategory;
+import org.jeecg.modules.teambuyGoods.entity.TeambuyGoods;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Api(tags="首页-商品信息相关接口")
+@RestController
+@RequestMapping("/teambuy/goods")
+@Slf4j
+public class GoodsController {
+    /******************************************************************************************************************/
+    //商品信息
+    @Resource
+    private GoodsService goodsService;
+    /******************************************************************************************************************/
+    //查看商品分类列表
+    @ApiOperation(value="商品信息-查看商品分类列表", notes="商品信息-查看商品分类列表")
+    @RequestMapping(value = "/queryCategoryList", method = {RequestMethod.GET})
+    public Result<?> queryCategoryList(TeambuyCategory teambuyCategory, PageBean pageBean){
+        return goodsService.queryCategoryList(teambuyCategory, pageBean);
+    }
+
+    //查看商品信息列表
+    @ApiOperation(value="商品信息-查询商品信息列表/详情", notes="商品信息-查询商品信息列表/详情")
+    @RequestMapping(value = "/queryGoodsList", method = {RequestMethod.GET})
+    public Result<?> queryGoodsList(TeambuyGoods teambuyGoods, PageBean pageBean){
+        return goodsService.queryGoodsList(teambuyGoods, pageBean);
+    }
+
+//    //查看商品信息详情
+//    @ApiOperation(value="商品信息-查询商品信息详情", notes="商品信息-查询商品信息列表")
+//    @RequestMapping(value = "/queryGoodsById", method = {RequestMethod.GET})
+//    public Result<?> queryItemById(String id){
+//        return goodsService.queryGoodsById(id);
+//    }
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/OrderController.java

@@ -0,0 +1,80 @@
+package org.jeecg.modules.api.teambuyController;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.PageBean;
+import org.jeecg.modules.apiService.OrderService;
+import org.jeecg.modules.teambuyOrderLeader.entity.TeambuyOrderLeader;
+import org.jeecg.modules.teambuyOrderMember.entity.TeambuyOrderMember;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Api(tags="订单-订单信息相关接口")
+@RestController
+@RequestMapping("/teambuy/order")
+@Slf4j
+public class OrderController {
+    /******************************************************************************************************************/
+    //订单
+    @Resource
+    private OrderService orderService;
+    /******************************************************************************************************************/
+
+    //查看团餐订单列表
+    @ApiOperation(value="订单-查询团餐订单列表/详情", notes="订单-查询团餐订单列表/详情")
+    @RequestMapping(value = "/queryLeaderOrderList", method = {RequestMethod.GET})
+    public Result<?> queryLeaderOrderList(@RequestHeader("X-Access-Token") String token, TeambuyOrderLeader teambuyOrderLeader, PageBean pageBean){
+        return orderService.queryLeaderOrderList(token, teambuyOrderLeader, pageBean);
+    }
+
+    //查看团员订单列表
+    @ApiOperation(value="订单-查看团员订单列表/详情", notes="订单-查看团员订单列表/详情")
+    @RequestMapping(value = "/queryMemberOrderList", method = {RequestMethod.GET})
+    public Result<?> queryMemberOrderList(@RequestHeader("X-Access-Token") String token, TeambuyOrderMember teambuyOrderMember, PageBean pageBean){
+        return orderService.queryMemberOrderList(token, teambuyOrderMember, pageBean);
+    }
+
+//    //查看团餐订单详情
+//    @ApiOperation(value="订单-查询团餐订单详情", notes="订单-查询团餐订单详情")
+//    @RequestMapping(value = "/queryLeaderOrderById", method = {RequestMethod.GET})
+//    public Result<?> queryLeaderOrderById(@RequestHeader("X-Access-Token") String token, String id){
+//        return orderService.queryLeaderOrderById(token, id);
+//    }
+//
+//    //查看订单列表
+//    @ApiOperation(value="订单-查询订单列表", notes="订单-查询订单列表")
+//    @RequestMapping(value = "/queryOrderList", method = {RequestMethod.GET})
+//    public Result<?> queryOrderList(@RequestHeader("X-Access-Token") String token, MassageOrder massageOrder, PageBean pageBean){
+//        return orderService.queryOrderList(token, massageOrder, pageBean);
+//    }
+//
+//    //查看订单详情
+//    @ApiOperation(value="订单-查询订单详情", notes="订单-查询订单详情")
+//    @RequestMapping(value = "/queryOrderById", method = {RequestMethod.GET})
+//    public Result<?> queryOrderById(@RequestHeader("X-Access-Token") String token, String id){
+//        return orderService.queryOrderById(token, id);
+//    }
+//
+//    //创建订单
+//    @ApiOperation(value="订单-创建订单", notes="支付方式(payType)：0-微信支付 1-余额支付")
+//    @RequestMapping(value = "/createOrder", method = {RequestMethod.POST})
+//    public Result<?> createOrder(@RequestHeader("X-Access-Token") String token, MassageOrder massageOrder, String payType){
+//        return orderService.createOrder(token, massageOrder, payType);
+//    }
+//
+//    //支付订单
+//    @ApiOperation(value="订单-支付订单", notes="支付方式(payType)：0-微信支付 1-余额支付")
+//    @RequestMapping(value = "/payOrder", method = {RequestMethod.POST})
+//    public Result<?> payOrder(@RequestHeader("X-Access-Token") String token, String orderId, String payType){
+//        return orderService.payOrder(token, orderId, payType);
+//    }
+//
+//    //支付回调
+//    @PostMapping("/payOrderNotify")
+//    public Object payOrderNotify(@RequestBody String requestBody){
+//        return orderService.payOrderNotify(requestBody);
+//    }
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/ShopcarContrller.java

@@ -0,0 +1,35 @@
+package org.jeecg.modules.api.teambuyController;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.PageBean;
+import org.jeecg.modules.apiService.OrderService;
+import org.jeecg.modules.apiService.ShopcarService;
+import org.jeecg.modules.teambuyBuycar.entity.TeambuyBuycar;
+import org.jeecg.modules.teambuyOrderMember.entity.TeambuyOrderMember;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Api(tags="购物车-购物车相关接口")
+@RestController
+@RequestMapping("/teambuy/shopcar")
+@Slf4j
+public class ShopcarContrller {
+    /******************************************************************************************************************/
+    //购物车
+    @Resource
+    private ShopcarService shopcarService;
+    /******************************************************************************************************************/
+    //查看购物车列表
+    @ApiOperation(value="订单-查看购物车列表/详情", notes="订单-查看购物车列表/详情")
+    @RequestMapping(value = "/queryShopcarList", method = {RequestMethod.GET})
+    public Result<?> queryShopcarList(@RequestHeader("X-Access-Token") String token, TeambuyBuycar teambuyBuycar, PageBean pageBean){
+        return shopcarService.queryShopcarList(token, teambuyBuycar, pageBean);
+    }
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ConfigService.java

@@ -0,0 +1,11 @@
+package org.jeecg.modules.apiService;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.PageBean;
+
+public interface ConfigService {
+    //查询系统配置列表
+    public Result<?> queryConfigList(PageBean pageBean);
+    //查询系统配置详情
+    public Result<?> queryConfigByParamCode(String paramCode);
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CouponService.java

@@ -0,0 +1,10 @@
+package org.jeecg.modules.apiService;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.PageBean;
+import org.jeecg.modules.teambuyCouponUser.entity.TeambuyCouponUser;
+
+public interface CouponService {
+    //查看优惠券列表
+    public Result<?> queryCouponList(String token, TeambuyCouponUser teambuyCouponUser, PageBean pageBean);
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/GoodsService.java

@@ -0,0 +1,20 @@
+package org.jeecg.modules.apiService;
+
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.PageBean;
+import org.jeecg.modules.teambuyCategory.entity.TeambuyCategory;
+import org.jeecg.modules.teambuyGoods.entity.TeambuyGoods;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+public interface GoodsService {
+    //查看商品分类列表
+    public Result<?> queryCategoryList(TeambuyCategory teambuyCategory, PageBean pageBean);
+
+    //查看商品信息列表
+    public Result<?> queryGoodsList(TeambuyGoods teambuyGoods, PageBean pageBean);
+
+    //查看商品信息详情
+    public Result<?> queryGoodsById(String id);
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderService.java

@@ -0,0 +1,33 @@
+package org.jeecg.modules.apiService;
+
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.PageBean;
+import org.jeecg.modules.teambuyOrderLeader.entity.TeambuyOrderLeader;
+import org.jeecg.modules.teambuyOrderMember.entity.TeambuyOrderMember;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+public interface OrderService {
+    //查看团餐订单列表
+    public Result<?> queryLeaderOrderList(String token, TeambuyOrderLeader teambuyOrderLeader, PageBean pageBean);
+    //查看团员订单列表
+    public Result<?> queryMemberOrderList(String token, TeambuyOrderMember teambuyOrderMember, PageBean pageBean);
+//    //查看团餐订单详情
+//    public Result<?> queryLeaderOrderById(String token, String id);
+//    //查看订单列表
+//    public Result<?> queryOrderList(String token, MassageOrder massageOrder, PageBean pageBean);
+//
+//    //查看订单详情
+//    public Result<?> queryOrderById(String token, String id);
+//
+//    //创建订单
+//    public Result<?> createOrder(String token, MassageOrder massageOrder, String payType);
+//
+//    //支付订单
+//    public Result<?> payOrder(String token, String orderId, String payType);
+//
+//    //支付回调
+//    Object payOrderNotify(String requestBody);
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/ShopcarService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.apiService;
+
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.PageBean;
+import org.jeecg.modules.teambuyBuycar.entity.TeambuyBuycar;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+public interface ShopcarService {
+    //查看购物车列表
+    public Result<?> queryShopcarList(String token, TeambuyBuycar teambuyBuycar, PageBean pageBean);
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java

@@ -0,0 +1,71 @@
+package org.jeecg.modules.apiService.impl;
+
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.PageBean;
+import org.jeecg.modules.apiService.ConfigService;
+import org.jeecg.modules.teambuyConfig.entity.TeambuyConfig;
+import org.jeecg.modules.teambuyConfig.service.ITeambuyConfigService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class ConfigServiceImpl implements ConfigService {
+    /******************************************************************************************************************/
+    //系统配置信息
+    @Resource
+    private ITeambuyConfigService teambuyConfigService;
+    /******************************************************************************************************************/
+    //查询系统配置列表
+    @Override
+    public Result<?> queryConfigList(PageBean pageBean) {
+        //返回信息
+        String massege = "";
+        //分页信息
+        Page<TeambuyConfig> page = null;
+        //查询信息
+        LambdaQueryChainWrapper<TeambuyConfig> query = null;
+        //返回信息
+        Page<TeambuyConfig> pageList = null;
+
+        try{
+            //分页
+            page = new Page<TeambuyConfig>(pageBean.getPageNo(), pageBean.getPageSize());
+            query = teambuyConfigService
+                    .lambdaQuery();
+
+            //组装查询条件
+            //按照创建时间降序排列
+            query.orderByDesc(TeambuyConfig::getCreateTime);
+
+            //获取分类列表信息
+            pageList = query.page(page);
+
+            return Result.OK("分类列表", pageList);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("分类列表查询失败");
+        }
+    }
+
+    //查询系统配置详情
+    @Override
+    public Result<?> queryConfigByParamCode(String paramCode) {
+        //返回信息
+        String massege = "";
+
+        try{
+            TeambuyConfig config = teambuyConfigService
+                    .lambdaQuery()
+                    .eq(TeambuyConfig::getParamCode, paramCode)
+                    .one();
+
+            return Result.OK("配置详情", config);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("配置详情查询失败");
+        }
+    }
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CouponServiceImpl.java

@@ -0,0 +1,71 @@
+package org.jeecg.modules.apiService.impl;
+
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.config.shiro.ShiroRealm;
+import org.jeecg.modules.apiBean.PageBean;
+import org.jeecg.modules.apiService.CouponService;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
+import org.jeecg.modules.teambuyCouponUser.entity.TeambuyCouponUser;
+import org.jeecg.modules.teambuyCouponUser.service.ITeambuyCouponUserService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class CouponServiceImpl implements CouponService {
+    /******************************************************************************************************************/
+    //权限验证
+    @Resource
+    private ShiroRealm shiroRealm;
+    //用户信息
+    @Resource
+    private IHanHaiMemberService hanHaiMemberService;
+    //用户优惠券信息
+    @Resource
+    private ITeambuyCouponUserService teambuyCouponUserService;
+    /******************************************************************************************************************/
+    //查看优惠券列表
+    @Override
+    public Result<?> queryCouponList(String token, TeambuyCouponUser teambuyCouponUser, PageBean pageBean) {
+        //权限验证
+        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        HanHaiMember hanHaiMember = hanHaiMemberService.getById("1898983659468853250");
+        //返回信息
+        String massege = "";
+        //分页信息
+        Page<TeambuyCouponUser> page = null;
+        //查询信息
+        LambdaQueryChainWrapper<TeambuyCouponUser> query = null;
+        //返回信息
+        Page<TeambuyCouponUser> pageList = null;
+
+        try{
+            //分页
+            page = new Page<TeambuyCouponUser>(pageBean.getPageNo(), pageBean.getPageSize());
+            query = teambuyCouponUserService
+                    .lambdaQuery();
+
+            //组装查询条件
+            if(StringUtils.isNotBlank(teambuyCouponUser.getId())){
+                //优惠券编号
+                query.eq(TeambuyCouponUser::getId, teambuyCouponUser.getId());
+            }
+            //优惠券所属
+            query.eq(TeambuyCouponUser::getUserId, hanHaiMember.getId());
+            //按照创建时间降序排列
+            query.orderByDesc(TeambuyCouponUser::getCreateTime);
+
+            //获取优惠券信息列表
+            pageList = query.page(page);
+
+            return Result.OK("优惠券列表", pageList);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("优惠券列表查询失败");
+        }
+    }
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/GoodsServiceImpl.java

@@ -0,0 +1,139 @@
+package org.jeecg.modules.apiService.impl;
+
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.apiBean.PageBean;
+import org.jeecg.modules.apiService.GoodsService;
+import org.jeecg.modules.teambuyCategory.entity.TeambuyCategory;
+import org.jeecg.modules.teambuyCategory.service.ITeambuyCategoryService;
+import org.jeecg.modules.teambuyGoods.entity.TeambuyGoods;
+import org.jeecg.modules.teambuyGoods.service.ITeambuyGoodsService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class GoodsServiceImpl implements GoodsService {
+    /******************************************************************************************************************/
+    //商品分类信息
+    @Resource
+    private ITeambuyGoodsService teambuyGoodsService;
+    //商品信息
+    @Resource
+    private ITeambuyCategoryService teambuyCategoryService;
+    /******************************************************************************************************************/
+
+    //查看商品分类列表
+    @Override
+    public Result<?> queryCategoryList(TeambuyCategory teambuyCategory, PageBean pageBean) {
+        //返回信息
+        String massege = "";
+        //分页信息
+        Page<TeambuyCategory> page = null;
+        //查询信息
+        LambdaQueryChainWrapper<TeambuyCategory> query = null;
+        //返回信息
+        Page<TeambuyCategory> pageList = null;
+
+        try{
+            //分页
+            page = new Page<TeambuyCategory>(pageBean.getPageNo(), pageBean.getPageSize());
+            query = teambuyCategoryService
+                    .lambdaQuery();
+
+            //组装查询条件
+            if(StringUtils.isNotBlank(teambuyCategory.getId())){
+                //分类编号
+                query.eq(TeambuyCategory::getId, teambuyCategory.getId());
+            }
+            if(StringUtils.isNotBlank(teambuyCategory.getPid())){
+                //父id
+                query.eq(TeambuyCategory::getPid, teambuyCategory.getPid());
+            }else {
+                //父id
+                query.eq(TeambuyCategory::getPid, "0");
+            }
+            if(StringUtils.isNotBlank(teambuyCategory.getName())){
+                //分类名称
+                query.like(TeambuyCategory::getPid, teambuyCategory.getName());
+            }
+
+            //按照排序编号升序排列
+            query.orderByDesc(TeambuyCategory::getCreateTime);
+
+            //获取商品信息信息
+            pageList = query.page(page);
+
+            return Result.OK("商品分类列表", pageList);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("商品分类列表查询失败");
+        }
+    }
+
+    //查看商品信息列表
+    @Override
+    public Result<?> queryGoodsList(TeambuyGoods teambuyGoods, PageBean pageBean) {
+        //返回信息
+        String massege = "";
+        //分页信息
+        Page<TeambuyGoods> page = null;
+        //查询信息
+        LambdaQueryChainWrapper<TeambuyGoods> query = null;
+        //返回信息
+        Page<TeambuyGoods> pageList = null;
+
+        try{
+            //分页
+            page = new Page<TeambuyGoods>(pageBean.getPageNo(), pageBean.getPageSize());
+            query = teambuyGoodsService
+                    .lambdaQuery();
+
+            //组装查询条件
+            if(StringUtils.isNotBlank(teambuyGoods.getId())){
+                //商品编号
+                query.eq(TeambuyGoods::getId, teambuyGoods.getId());
+            }
+            if(StringUtils.isNotBlank(teambuyGoods.getTitle())){
+                //商品名称
+                query.like(TeambuyGoods::getTitle, teambuyGoods.getTitle());
+            }
+            if(StringUtils.isNotBlank(teambuyGoods.getCategoryId())){
+                //商品分类id
+                query.eq(TeambuyGoods::getCategoryId, teambuyGoods.getCategoryId());
+            }
+
+            //按照排序编号升序排列
+            query.orderByDesc(TeambuyGoods::getCreateTime);
+
+            //获取商品信息信息
+            pageList = query.page(page);
+
+            return Result.OK("商品信息列表", pageList);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("商品信息列表查询失败");
+        }
+    }
+
+    //查看商品信息详情
+    @Override
+    public Result<?> queryGoodsById(String id) {
+        //返回信息
+        String massege = "";
+
+        try{
+            TeambuyGoods one = teambuyGoodsService
+                    .lambdaQuery()
+                    .eq(TeambuyGoods::getId, id)
+                    .one();
+
+            return Result.OK("商品信息详情", one);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("商品信息详情查询失败");
+        }
+    }
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java

@@ -0,0 +1,471 @@
+package org.jeecg.modules.apiService.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
+import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.config.shiro.ShiroRealm;
+import org.jeecg.modules.apiBean.PageBean;
+import org.jeecg.modules.apiService.OrderService;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
+import org.jeecg.modules.pay.MpWxPayService;
+import org.jeecg.modules.teambuyGoods.entity.TeambuyGoods;
+import org.jeecg.modules.teambuyGoods.service.ITeambuyGoodsService;
+import org.jeecg.modules.teambuyOrderGoods.entity.TeambuyOrderGoods;
+import org.jeecg.modules.teambuyOrderGoods.service.ITeambuyOrderGoodsService;
+import org.jeecg.modules.teambuyOrderLeader.entity.TeambuyOrderLeader;
+import org.jeecg.modules.teambuyOrderLeader.service.ITeambuyOrderLeaderService;
+import org.jeecg.modules.teambuyOrderMember.entity.TeambuyOrderMember;
+import org.jeecg.modules.teambuyOrderMember.service.ITeambuyOrderMemberService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class OrderServiceImpl implements OrderService {
+    /******************************************************************************************************************/
+    //支付接口
+    @Autowired
+    private MpWxPayService mpWxPayService;
+    //权限验证
+    @Resource
+    private ShiroRealm shiroRealm;
+    //用户信息
+    @Resource
+    private IHanHaiMemberService hanHaiMemberService;
+    //团餐订单信息
+    @Resource
+    private ITeambuyOrderLeaderService teambuyOrderLeaderService;
+    //团员订单信息
+    @Resource
+    private ITeambuyOrderMemberService teambuyOrderMemberService;
+    //团员订单商品信息
+    @Resource
+    private ITeambuyOrderGoodsService teambuyOrderGoodsService;
+    //商品信息信息
+    @Resource
+    private ITeambuyGoodsService teambuyGoodsService;
+    /******************************************************************************************************************/
+    //查看团餐订单列表
+    @Override
+    public Result<?> queryLeaderOrderList(String token, TeambuyOrderLeader teambuyOrderLeader, PageBean pageBean) {
+        //权限验证
+        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        HanHaiMember hanHaiMember = hanHaiMemberService.getById("1898983659468853250");
+        //返回信息
+        String massege = "";
+        //分页信息
+        Page<TeambuyOrderLeader> page = null;
+        //查询信息
+        LambdaQueryChainWrapper<TeambuyOrderLeader> query = null;
+        //返回信息
+        Page<TeambuyOrderLeader> pageList = null;
+
+        try{
+            //分页
+            page = new Page<TeambuyOrderLeader>(pageBean.getPageNo(), pageBean.getPageSize());
+            query = teambuyOrderLeaderService
+                    .lambdaQuery();
+
+            //组装查询条件
+            if(StringUtils.isNotBlank(teambuyOrderLeader.getId())){
+                //订单编号
+                query.eq(TeambuyOrderLeader::getId, teambuyOrderLeader.getId());
+            }
+            if(StringUtils.isNotBlank(teambuyOrderLeader.getStatus())){
+                //订单状态
+                query.eq(TeambuyOrderLeader::getStatus, teambuyOrderLeader.getStatus());
+            }
+            //团餐订单所属
+            query.eq(TeambuyOrderLeader::getUserId, hanHaiMember.getId());
+            //按照创建时间降序排列
+            query.orderByDesc(TeambuyOrderLeader::getCreateTime);
+
+            //获取团餐内团员订单信息
+            pageList = query.page(page);
+            if(null == pageList){
+                return Result.OK("团餐订单列表为空", pageList);
+            }
+            for (TeambuyOrderLeader record : pageList.getRecords()) {
+                List<TeambuyOrderMember> orderMemberList = getOrderMemberList(record.getId());
+                record.setOrderMemberList(orderMemberList);
+            }
+
+            return Result.OK("订单列表", pageList);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("订单列表查询失败");
+        }
+    }
+    //查询团餐订单内的团员订单列表
+    public List<TeambuyOrderMember> getOrderMemberList(String orderLeaderId){
+        try{
+            //查询团员订单列表
+            List<TeambuyOrderMember> orderList = teambuyOrderMemberService
+                    .lambdaQuery()
+                    .eq(TeambuyOrderMember::getOrderLeaderId, orderLeaderId)
+                    .list();
+
+            //查询团员订单商品信息列表列表
+            for (TeambuyOrderMember teambuyOrderMember : orderList) {
+                List<TeambuyOrderGoods> goodsList = teambuyOrderGoodsService
+                        .lambdaQuery()
+                        .eq(TeambuyOrderGoods::getOrderId, teambuyOrderMember.getId())
+                        .list();
+                //商品详情
+                for (TeambuyOrderGoods teambuyOrderGoods : goodsList) {
+                    TeambuyGoods goods = teambuyGoodsService.getById(teambuyOrderGoods.getGoodsId());
+                    teambuyOrderGoods.setGoods(goods);
+                }
+                teambuyOrderMember.setGoodsList(goodsList);
+            }
+
+            //查询订单所属用户信息
+            for (TeambuyOrderMember teambuyOrderMember : orderList) {
+                HanHaiMember hanHaiMember = hanHaiMemberService.getById(teambuyOrderMember.getUserId());
+                teambuyOrderMember.setHanHaiMember(hanHaiMember);
+            }
+
+            //返回订单列表
+            return orderList;
+        }catch (Exception e){
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    //查看团员订单列表
+    @Override
+    public Result<?> queryMemberOrderList(String token, TeambuyOrderMember teambuyOrderMember, PageBean pageBean) {
+        //权限验证
+        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        HanHaiMember hanHaiMember = hanHaiMemberService.getById("1898983659468853250");
+        //返回信息
+        String massege = "";
+        //分页信息
+        Page<TeambuyOrderMember> page = null;
+        //查询信息
+        LambdaQueryChainWrapper<TeambuyOrderMember> query = null;
+        //返回信息
+        Page<TeambuyOrderMember> pageList = null;
+
+        try{
+            //分页
+            page = new Page<TeambuyOrderMember>(pageBean.getPageNo(), pageBean.getPageSize());
+            query = teambuyOrderMemberService
+                    .lambdaQuery();
+
+            //组装查询条件
+            if(StringUtils.isNotBlank(teambuyOrderMember.getId())){
+                //订单编号
+                query.eq(TeambuyOrderMember::getId, teambuyOrderMember.getId());
+            }
+            if(StringUtils.isNotBlank(teambuyOrderMember.getStatus())){
+                //订单状态
+                query.eq(TeambuyOrderMember::getStatus, teambuyOrderMember.getStatus());
+            }
+            //团餐订单所属
+            query.eq(TeambuyOrderMember::getUserId, hanHaiMember.getId());
+            //按照创建时间降序排列
+            query.orderByDesc(TeambuyOrderMember::getCreateTime);
+
+            //获取团员订单信息列表
+            pageList = query.page(page);
+
+            //查询团员订单商品信息列表列表
+            for (TeambuyOrderMember record : pageList.getRecords()) {
+                List<TeambuyOrderGoods> goodsList = teambuyOrderGoodsService
+                        .lambdaQuery()
+                        .eq(TeambuyOrderGoods::getOrderId, record.getId())
+                        .list();
+                //商品详情
+                for (TeambuyOrderGoods teambuyOrderGoods : goodsList) {
+                    TeambuyGoods goods = teambuyGoodsService.getById(teambuyOrderGoods.getGoodsId());
+                    teambuyOrderGoods.setGoods(goods);
+                }
+                record.setGoodsList(goodsList);
+            }
+
+            //查询订单所属用户信息
+            for (TeambuyOrderMember record : pageList.getRecords()) {
+                HanHaiMember member = hanHaiMemberService.getById(record.getUserId());
+                record.setHanHaiMember(member);
+            }
+
+            return Result.OK("订单列表", pageList);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("订单列表查询失败");
+        }
+    }
+
+//    //查看团餐订单详情
+//    @Override
+//    public Result<?> queryLeaderOrderById(String token, String id) {
+//        //权限验证
+//        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+//        //返回信息
+//        String massege = "";
+//
+//        try{
+//            //订单信息
+//            MassageOrder order = massageOrderService
+//                    .lambdaQuery()
+//                    .eq(MassageOrder::getId, id)
+//                    .eq(MassageOrder::getUserId, hanHaiMember.getId())
+//                    .one();
+//            if(null == order){
+//                return Result.error("订单详情查询失败，请检查输入的订单编号：", order);
+//            }
+//            //项目信息
+//            MassageItem item = massageItemService.getById(order.getItemId());
+//            order.setMassageItem(item);
+//
+//            return Result.OK("订单详情", order);
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            return Result.error("订单详情查询失败");
+//        }
+//    }
+
+
+//    //查看订单列表
+//    @Override
+//    public Result<?> queryOrderList(String token, MassageOrder massageOrder, PageBean pageBean) {
+//        //权限验证
+//        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+//        //返回信息
+//        String massege = "";
+//        //分页信息
+//        Page<MassageOrder> page = null;
+//        //查询信息
+//        LambdaQueryChainWrapper<MassageOrder> query = null;
+//        //返回信息
+//        Page<MassageOrder> pageList = null;
+//
+//        try{
+//            //分页
+//            page = new Page<MassageOrder>(pageBean.getPageNo(), pageBean.getPageSize());
+//            query = massageOrderService
+//                    .lambdaQuery();
+//
+//            //组装查询条件
+//            if(StringUtils.isNotBlank(massageOrder.getStatus())){
+//                //订单状态
+//                query.eq(MassageOrder::getStatus, massageOrder.getStatus());
+//            }
+//            //订单所属
+//            query.eq(MassageOrder::getUserId, hanHaiMember.getId());
+//            //按照排序编号升序排列
+//            query.orderByDesc(MassageOrder::getCreateTime);
+//
+//            //获取订单信息
+//            pageList = query.page(page);
+//            if(null == pageList){
+//                return Result.OK("订单列表为空", pageList);
+//            }
+//            for (MassageOrder record : pageList.getRecords()) {
+//                MassageItem item = massageItemService.getById(record.getItemId());
+//                record.setMassageItem(item);
+//            }
+//
+//            return Result.OK("订单列表", pageList);
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            return Result.error("订单列表查询失败");
+//        }
+//    }
+
+//    //查看订单详情
+//    @Override
+//    public Result<?> queryOrderById(String token, String id) {
+//        //权限验证
+//        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+//        //返回信息
+//        String massege = "";
+//
+//        try{
+//            //订单信息
+//            MassageOrder order = massageOrderService
+//                    .lambdaQuery()
+//                    .eq(MassageOrder::getId, id)
+//                    .eq(MassageOrder::getUserId, hanHaiMember.getId())
+//                    .one();
+//            if(null == order){
+//                return Result.error("订单详情查询失败，请检查输入的订单编号：", order);
+//            }
+//            //项目信息
+//            MassageItem item = massageItemService.getById(order.getItemId());
+//            order.setMassageItem(item);
+//
+//            return Result.OK("订单详情", order);
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            return Result.error("订单详情查询失败");
+//        }
+//    }
+
+//    //创建订单
+//    @Override
+//    public Result<?> createOrder(String token, MassageOrder massageOrder, String payType) {
+//        //权限验证
+//        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+//
+//        try{
+//            //订单信息
+//            String payNo = IdWorker.getIdStr();//生成订单号
+//            massageOrder.setId(payNo);
+//            massageOrder.setUserId(hanHaiMember.getId());
+//
+//            //查询服务信息
+//            MassageItem item = massageItemService.getById(massageOrder.getItemId());
+//
+//            //创建订单
+//            massageOrderService.save(massageOrder);
+//
+//            //订单支付
+//            switch (payType){
+//                //微信支付
+//                case "0":
+//                    //吊起微信支付
+//                    BigDecimal price = massageOrder.getAmount();//价格
+//                    String productName = item.getTitle();//服务名称
+//
+//                    String s = price.multiply(new BigDecimal(100)).toString();
+//                    int i1 = Double.valueOf(s).intValue();
+//                    Object appOrder = mpWxPayService.createOrder(
+//                            "购买"+ productName ,
+//                            "127.0.0.1",
+//                            massageOrder.getId(),
+//                            i1,
+//                            massageOrder.getId(),
+//                            hanHaiMember.getAppletOpenid(),
+//                            massageOrder.toString());
+//                    return Result.OK("支付成功",appOrder);
+//
+//                //余额支付
+//                case "1":
+//                    //用户余额
+//                    BigDecimal balance = hanHaiMember.getPrice();
+//                    //订单实付金额
+//                    BigDecimal amount = massageOrder.getAmount();
+//
+//                    if(balance.compareTo(amount) == 1 ){
+//                        //等同于a>b
+//                        balance = balance.subtract(amount);
+//                    }
+//                    //修改用户余额
+//                    hanHaiMemberService.updateById(hanHaiMember);
+//
+//                    //修改订单信息
+//                    massageOrder.setStatus("1");//订单状态
+//                    massageOrder.setPayTime(CommonUtils.getCurrentTime());//订单支付时间
+//                    massageOrderService.updateById(massageOrder);
+//                    return Result.OK("支付成功");
+//
+//            }
+//            return Result.error("支付失败");
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            return Result.error("支付失败");
+//        }
+//
+//    }
+
+//    //支付订单
+//    @Override
+//    public Result<?> payOrder(String token, String orderId, String payType) {
+//        //权限验证
+//        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+//
+//        try{
+//            //订单信息
+//            MassageOrder massageOrder = massageOrderService.getById(orderId);
+//
+//            //查询服务信息
+//            MassageItem item = massageItemService.getById(massageOrder.getItemId());
+//
+//            //订单支付
+//            switch (payType){
+//                //微信支付
+//                case "0":
+//                    //吊起微信支付
+//                    BigDecimal price = massageOrder.getAmount();//价格
+//                    String productName = item.getTitle();//服务名称
+//
+//                    String s = price.multiply(new BigDecimal(100)).toString();
+//                    int i1 = Double.valueOf(s).intValue();
+//                    Object appOrder = mpWxPayService.createOrder(
+//                            "购买"+ productName ,
+//                            "127.0.0.1",
+//                            massageOrder.getId(),
+//                            i1,
+//                            massageOrder.getId(),
+//                            hanHaiMember.getAppletOpenid(),
+//                            massageOrder.toString());
+//                    return Result.OK("支付成功",appOrder);
+//
+//                //余额支付
+//                case "1":
+//                    //用户余额
+//                    BigDecimal balance = hanHaiMember.getPrice();
+//                    //订单实付金额
+//                    BigDecimal amount = massageOrder.getAmount();
+//
+//                    if(balance.compareTo(amount) == 1 ){
+//                        //等同于a>b
+//                        balance = balance.subtract(amount);
+//                    }else {
+//                        return Result.error("余额不足，支付失败");
+//                    }
+//                    //修改用户余额
+//                    hanHaiMember.setPrice(balance);
+//                    hanHaiMemberService.updateById(hanHaiMember);
+//
+//                    //修改订单信息
+//                    massageOrder.setStatus("1");//订单状态
+//                    massageOrder.setPayTime(CommonUtils.getCurrentTime());//订单支付时间
+//                    massageOrderService.updateById(massageOrder);
+//                    return Result.OK("支付成功");
+//
+//            }
+//
+//            return Result.error("支付失败");
+//
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            return Result.error("支付失败");
+//        }
+//    }
+
+//    //订单支付回调
+//    public Result<?> payOrderNotify(String requestBody){
+//        WxPayOrderNotifyResult notify = mpWxPayService.notify(requestBody);
+//        String outTradeNo = notify.getOutTradeNo();
+//        log.info("支付回调订单号码："+outTradeNo);
+//
+//        try{
+//            //查询订单信息
+//            MassageOrder massageOrder = massageOrderService.getById(outTradeNo);
+//            //如果订单存在则修改订单状态
+//            if (null != massageOrder){
+//                if("0".equals(massageOrder.getStatus())){
+//                    massageOrder.setStatus("1");
+//                }
+//                massageOrderService.updateById(massageOrder);
+//            }
+//
+//        }catch (Exception e){
+//            log.info("支付回调失败，订单号码："+outTradeNo);
+//            e.printStackTrace();
+//        }
+//        return null;
+//    }
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShopcarServiceImpl.java

@@ -0,0 +1,88 @@
+package org.jeecg.modules.apiService.impl;
+
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.config.shiro.ShiroRealm;
+import org.jeecg.modules.apiBean.PageBean;
+import org.jeecg.modules.apiService.ShopcarService;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
+import org.jeecg.modules.teambuyBuycar.entity.TeambuyBuycar;
+import org.jeecg.modules.teambuyBuycar.service.ITeambuyBuycarService;
+import org.jeecg.modules.teambuyGoods.entity.TeambuyGoods;
+import org.jeecg.modules.teambuyGoods.service.ITeambuyGoodsService;
+import org.jeecg.modules.teambuyOrderGoods.entity.TeambuyOrderGoods;
+import org.jeecg.modules.teambuyOrderGoods.service.ITeambuyOrderGoodsService;
+import org.jeecg.modules.teambuyOrderLeader.service.ITeambuyOrderLeaderService;
+import org.jeecg.modules.teambuyOrderMember.entity.TeambuyOrderMember;
+import org.jeecg.modules.teambuyOrderMember.service.ITeambuyOrderMemberService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class ShopcarServiceImpl implements ShopcarService {
+    /******************************************************************************************************************/
+    //权限验证
+    @Resource
+    private ShiroRealm shiroRealm;
+    //用户信息
+    @Resource
+    private IHanHaiMemberService hanHaiMemberService;
+    //购物车信息
+    @Resource
+    private ITeambuyBuycarService teambuyBuycarService;
+    //商品信息
+    @Resource
+    private ITeambuyGoodsService teambuyGoodsService;
+    /******************************************************************************************************************/
+    //查看购物车列表
+    @Override
+    public Result<?> queryShopcarList(String token, TeambuyBuycar teambuyBuycar, PageBean pageBean) {
+        //权限验证
+        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        HanHaiMember hanHaiMember = hanHaiMemberService.getById("1898983659468853250");
+        //返回信息
+        String massege = "";
+        //分页信息
+        Page<TeambuyBuycar> page = null;
+        //查询信息
+        LambdaQueryChainWrapper<TeambuyBuycar> query = null;
+        //返回信息
+        Page<TeambuyBuycar> pageList = null;
+
+        try{
+            //分页
+            page = new Page<TeambuyBuycar>(pageBean.getPageNo(), pageBean.getPageSize());
+            query = teambuyBuycarService
+                    .lambdaQuery();
+
+            //组装查询条件
+            if(StringUtils.isNotBlank(teambuyBuycar.getId())){
+                //购物车编号
+                query.eq(TeambuyBuycar::getId, teambuyBuycar.getId());
+            }
+            //购物车所属
+            query.eq(TeambuyBuycar::getUserId, hanHaiMember.getId());
+            //按照创建时间降序排列
+            query.orderByDesc(TeambuyBuycar::getCreateTime);
+
+            //获取购物车信息列表
+            pageList = query.page(page);
+
+            //查询购物车商品信息
+            for (TeambuyBuycar record : pageList.getRecords()) {
+                TeambuyGoods goods = teambuyGoodsService.getById(record.getGoodsId());
+                record.setGoods(goods);
+            }
+
+            return Result.OK("购物车列表", pageList);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("购物车列表查询失败");
+        }
+    }
+}