1、团长模块

2、钱包模块
3、推荐模块
4、购物车模块
5、用户信息模块

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/controller/TeambuyOrderMemberController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 团员订单表
  * @Author: jeecg-boot
- * @Date:   2025-04-24
+ * @Date:   2025-05-06
  * @Version: V1.0
  */
 @Api(tags="团员订单表")

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

@@ -13,7 +13,6 @@ 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;
@@ -26,7 +25,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 团员订单表
  * @Author: jeecg-boot
- * @Date:   2025-04-24
+ * @Date:   2025-05-06
  * @Version: V1.0
  */
 @Data
@@ -69,6 +68,10 @@ public class TeambuyOrderMember implements Serializable {
 	@Excel(name = "订单实付金额", width = 15)
     @ApiModelProperty(value = "订单实付金额")
     private java.math.BigDecimal pricePay;
+	/**付款时间*/
+	@Excel(name = "付款时间", width = 15)
+    @ApiModelProperty(value = "付款时间")
+    private java.util.Date payTime;
 	/**订单状态*/
 	@Excel(name = "订单状态", width = 15, dicCode = "teambuy_status_order")
 	@Dict(dicCode = "teambuy_status_order")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/mapper/TeambuyOrderMemberMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 团员订单表
  * @Author: jeecg-boot
- * @Date:   2025-04-24
+ * @Date:   2025-05-06
  * @Version: V1.0
  */
 public interface TeambuyOrderMemberMapper extends BaseMapper<TeambuyOrderMember> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/service/ITeambuyOrderMemberService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 团员订单表
  * @Author: jeecg-boot
- * @Date:   2025-04-24
+ * @Date:   2025-05-06
  * @Version: V1.0
  */
 public interface ITeambuyOrderMemberService extends IService<TeambuyOrderMember> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/service/impl/TeambuyOrderMemberServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 团员订单表
  * @Author: jeecg-boot
- * @Date:   2025-04-24
+ * @Date:   2025-05-06
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/vue/TeambuyOrderMemberList.vue

@@ -142,6 +142,11 @@
             align:"center",
             dataIndex: 'pricePay'
           },
+          {
+            title:'付款时间',
+            align:"center",
+            dataIndex: 'payTime'
+          },
           {
             title:'订单状态',
             align:"center",
@@ -195,6 +200,7 @@
         fieldList.push({type:'BigDecimal',value:'priceAll',text:'订单总金额',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'pricePreferential',text:'订单优惠金额',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'pricePay',text:'订单实付金额',dictCode:''})
+        fieldList.push({type:'datetime',value:'payTime',text:'付款时间'})
         fieldList.push({type:'string',value:'status',text:'订单状态',dictCode:'teambuy_status_order'})
         fieldList.push({type:'string',value:'orderLeaderId',text:'关联团餐订单id',dictCode:"teambuy_order_leader,title,id"})
         fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"})

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/vue/modules/TeambuyOrderMemberForm.vue

@@ -23,6 +23,11 @@
               <a-input-number v-model="model.pricePay" placeholder="请输入订单实付金额" style="width: 100%" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="付款时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payTime">
+              <j-date placeholder="请选择付款时间"  v-model="model.payTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="订单状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
               <j-dict-select-tag type="list" v-model="model.status" dictCode="teambuy_status_order" placeholder="请选择订单状态" />

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/vue3/TeambuyOrderMember.data.ts

@@ -24,6 +24,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'pricePay'
    },
+   {
+    title: '付款时间',
+    align:"center",
+    dataIndex: 'payTime'
+   },
    {
     title: '订单状态',
     align:"center",
@@ -65,6 +70,11 @@ export const formSchema: FormSchema[] = [
     field: 'pricePay',
     component: 'InputNumber',
   },
+  {
+    label: '付款时间',
+    field: 'payTime',
+    component: 'Input',
+  },
   {
     label: '订单状态',
     field: 'status',

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyTeamRelation/controller/TeambuyTeamRelationController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 团员团长关联表
  * @Author: jeecg-boot
- * @Date:   2025-04-24
+ * @Date:   2025-05-07
  * @Version: V1.0
  */
 @Api(tags="团员团长关联表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyTeamRelation/entity/TeambuyTeamRelation.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.teambuyTeamLeader.entity.TeambuyTeamLeader;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -20,7 +23,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 团员团长关联表
  * @Author: jeecg-boot
- * @Date:   2025-04-24
+ * @Date:   2025-05-07
  * @Version: V1.0
  */
 @Data
@@ -47,14 +50,32 @@ public class TeambuyTeamRelation implements Serializable {
 	/**更新日期*/
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
-	/**关联团长id*/
-	@Excel(name = "关联团长id", width = 15, dictTable = "teambuy_team_leader", dicText = "name", dicCode = "user_id")
-	@Dict(dictTable = "teambuy_team_leader", dicText = "name", dicCode = "user_id")
-    @ApiModelProperty(value = "关联团长id")
+	/**现团长id*/
+	@Excel(name = "现团长id", width = 15, dictTable = "teambuy_team_leader", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "teambuy_team_leader", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "现团长id")
     private java.lang.String leaderId;
+	/**更换团长id*/
+	@Excel(name = "更换团长id", width = 15, dictTable = "teambuy_team_leader", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "teambuy_team_leader", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "更换团长id")
+    private java.lang.String leaderUpdateId;
 	/**关联团员id*/
 	@Excel(name = "关联团员id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
 	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "关联团员id")
     private java.lang.String memberId;
+	/**关联状态*/
+	@Excel(name = "关联状态", width = 15, dicCode = "teambuy_status_relation")
+	@Dict(dicCode = "teambuy_status_relation")
+    @ApiModelProperty(value = "关联状态")
+    private java.lang.String status;
+
+    //团长信息
+    @TableField(exist = false)
+    private TeambuyTeamLeader teamLeader;
+
+    //团员信息
+    @TableField(exist = false)
+    private HanHaiMember member;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyTeamRelation/mapper/TeambuyTeamRelationMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 团员团长关联表
  * @Author: jeecg-boot
- * @Date:   2025-04-24
+ * @Date:   2025-05-07
  * @Version: V1.0
  */
 public interface TeambuyTeamRelationMapper extends BaseMapper<TeambuyTeamRelation> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyTeamRelation/service/ITeambuyTeamRelationService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 团员团长关联表
  * @Author: jeecg-boot
- * @Date:   2025-04-24
+ * @Date:   2025-05-07
  * @Version: V1.0
  */
 public interface ITeambuyTeamRelationService extends IService<TeambuyTeamRelation> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyTeamRelation/service/impl/TeambuyTeamRelationServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 团员团长关联表
  * @Author: jeecg-boot
- * @Date:   2025-04-24
+ * @Date:   2025-05-07
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyTeamRelation/vue/TeambuyTeamRelationList.vue

@@ -123,15 +123,25 @@
             }
           },
           {
-            title:'关联团长id',
+            title:'现团长id',
             align:"center",
             dataIndex: 'leaderId_dictText'
           },
+          {
+            title:'更换团长id',
+            align:"center",
+            dataIndex: 'leaderUpdateId_dictText'
+          },
           {
             title:'关联团员id',
             align:"center",
             dataIndex: 'memberId_dictText'
           },
+          {
+            title:'关联状态',
+            align:"center",
+            dataIndex: 'status_dictText'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -166,8 +176,10 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'leaderId',text:'关联团长id',dictCode:"teambuy_team_leader,name,user_id"})
+        fieldList.push({type:'string',value:'leaderId',text:'现团长id',dictCode:"teambuy_team_leader,name,id"})
+        fieldList.push({type:'string',value:'leaderUpdateId',text:'更换团长id',dictCode:"teambuy_team_leader,name,id"})
         fieldList.push({type:'string',value:'memberId',text:'关联团员id',dictCode:"han_hai_member,nick_name,id"})
+        fieldList.push({type:'string',value:'status',text:'关联状态',dictCode:'teambuy_status_relation'})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyTeamRelation/vue/modules/TeambuyTeamRelationForm.vue

@@ -4,8 +4,13 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="关联团长id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leaderId">
-              <j-dict-select-tag type="list" v-model="model.leaderId" dictCode="teambuy_team_leader,name,user_id" placeholder="请选择关联团长id" />
+            <a-form-model-item label="现团长id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leaderId">
+              <j-dict-select-tag type="list" v-model="model.leaderId" dictCode="teambuy_team_leader,name,id" placeholder="请选择现团长id" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="更换团长id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leaderUpdateId">
+              <j-dict-select-tag type="list" v-model="model.leaderUpdateId" dictCode="teambuy_team_leader,name,id" placeholder="请选择更换团长id" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -13,6 +18,11 @@
               <j-dict-select-tag type="list" v-model="model.memberId" dictCode="han_hai_member,nick_name,id" placeholder="请选择关联团员id" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关联状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
+              <j-dict-select-tag type="list" v-model="model.status" dictCode="teambuy_status_relation" placeholder="请选择关联状态" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyTeamRelation/vue3/TeambuyTeamRelation.data.ts

@@ -5,15 +5,25 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
-    title: '关联团长id',
+    title: '现团长id',
     align:"center",
     dataIndex: 'leaderId_dictText'
    },
+   {
+    title: '更换团长id',
+    align:"center",
+    dataIndex: 'leaderUpdateId_dictText'
+   },
    {
     title: '关联团员id',
     align:"center",
     dataIndex: 'memberId_dictText'
    },
+   {
+    title: '关联状态',
+    align:"center",
+    dataIndex: 'status_dictText'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -21,11 +31,19 @@ export const searchFormSchema: FormSchema[] = [
 //表单数据
 export const formSchema: FormSchema[] = [
   {
-    label: '关联团长id',
+    label: '现团长id',
     field: 'leaderId',
     component: 'JDictSelectTag',
     componentProps:{
-        dictCode:"teambuy_team_leader,name,user_id"
+        dictCode:"teambuy_team_leader,name,id"
+     },
+  },
+  {
+    label: '更换团长id',
+    field: 'leaderUpdateId',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"teambuy_team_leader,name,id"
      },
   },
   {
@@ -36,4 +54,12 @@ export const formSchema: FormSchema[] = [
         dictCode:"han_hai_member,nick_name,id"
      },
   },
+  {
+    label: '关联状态',
+    field: 'status',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"teambuy_status_relation"
+     },
+  },
 ];

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

@@ -0,0 +1,49 @@
+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.AmountService;
+import org.jeecg.modules.apiService.LeaderService;
+import org.jeecg.modules.teambuyBalanceLog.entity.TeambuyBalanceLog;
+import org.jeecg.modules.teambuyTeamLeader.entity.TeambuyTeamLeader;
+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/amount")
+@Slf4j
+public class AmountController {
+    /******************************************************************************************************************/
+    //团长
+    @Resource
+    private AmountService amountService;
+    /******************************************************************************************************************/
+//    //提现
+//    @ApiOperation(value="钱包-提现", notes="钱包-提现")
+//    @RequestMapping(value = "/addLeader", method = {RequestMethod.POST})
+//    public Result<?> addLeader(@RequestHeader("X-Access-Token") String token, TeambuyTeamLeader teamLeader){
+//        return leaderService.addLeader(token, teamLeader);
+//    }
+
+//    //充值
+//    @ApiOperation(value="钱包-充值", notes="钱包-充值")
+//    @RequestMapping(value = "/addLeader", method = {RequestMethod.POST})
+//    public Result<?> addLeader(@RequestHeader("X-Access-Token") String token, TeambuyTeamLeader teamLeader){
+//        return leaderService.addLeader(token, teamLeader);
+//    }
+
+    //收入明细
+    @ApiOperation(value="钱包-收支明细", notes="钱包-收支明细")
+    @RequestMapping(value = "/queryAmountLog", method = {RequestMethod.POST})
+    public Result<?> queryAmountLog(@RequestHeader("X-Access-Token") String token, TeambuyBalanceLog balanceLog, PageBean pageBean){
+        return amountService.queryAmountLog(token, balanceLog, pageBean);
+    }
+}

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

@@ -32,17 +32,17 @@ public class GoodsController {
     }
 
     //查看商品信息列表
-    @ApiOperation(value="商品信息-查询商品信息列表/详情", notes="商品信息-查询商品信息列表/详情")
+    @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);
-//    }
+    //查看商品信息详情
+    @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/LeaderController.java

@@ -0,0 +1,79 @@
+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.LeaderService;
+import org.jeecg.modules.apiService.ShopcarService;
+import org.jeecg.modules.teambuyBuycar.entity.TeambuyBuycar;
+import org.jeecg.modules.teambuyTeamLeader.entity.TeambuyTeamLeader;
+import org.jeecg.modules.teambuyTeamRelation.entity.TeambuyTeamRelation;
+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/leader")
+@Slf4j
+public class LeaderController {
+    /******************************************************************************************************************/
+    //团长
+    @Resource
+    private LeaderService leaderService;
+    /******************************************************************************************************************/
+    //团长申请
+    @ApiOperation(value="我的-团长申请", notes="我的-团长申请")
+    @RequestMapping(value = "/addLeader", method = {RequestMethod.POST})
+    public Result<?> addLeader(@RequestHeader("X-Access-Token") String token, TeambuyTeamLeader teamLeader){
+        return leaderService.addLeader(token, teamLeader);
+    }
+
+    //解绑团长
+    @ApiOperation(value="我的-解绑团长", notes="我的-解绑团长")
+    @RequestMapping(value = "/deleteLeader", method = {RequestMethod.POST})
+    public Result<?> deleteLeader(@RequestHeader("X-Access-Token") String token, TeambuyTeamRelation teamRelation){
+        return leaderService.deleteLeader(token, teamRelation);
+    }
+
+    //更换团长
+    @ApiOperation(value="我的-更换团长", notes="我的-更换团长")
+    @RequestMapping(value = "/updateLeader", method = {RequestMethod.POST})
+    public Result<?> updateLeader(@RequestHeader("X-Access-Token") String token, TeambuyTeamRelation teamRelation){
+        return leaderService.updateLeader(token, teamRelation);
+    }
+
+    //团长信息查询
+    @ApiOperation(value="我的-查询团长信息", notes="我的-查询团长信息")
+    @RequestMapping(value = "/queryLeaderInfo", method = {RequestMethod.GET})
+    public Result<?> queryLeaderInfo(@RequestHeader("X-Access-Token") String token){
+        return leaderService.queryLeaderInfo(token);
+    }
+
+    //团长信息修改
+    @ApiOperation(value="我的-修改团长信息", notes="我的-修改团长信息")
+    @RequestMapping(value = "/updateLeaderInfo", method = {RequestMethod.POST})
+    public Result<?> updateLeaderInfo(@RequestHeader("X-Access-Token") String token, TeambuyTeamLeader teamLeader){
+        return leaderService.updateLeaderInfo(token, teamLeader);
+    }
+
+    //团员列表信息查询
+    @ApiOperation(value="我的-我的团员", notes="我的-我的团员")
+    @RequestMapping(value = "/queryMemberList", method = {RequestMethod.GET})
+    public Result<?> queryMemberList(@RequestHeader("X-Access-Token") String token, PageBean pageBean){
+        return leaderService.queryMemberList(token, pageBean);
+    }
+
+    //团长列表查询
+    @ApiOperation(value="我的-查询团长列表(下单选择地址)", notes="我的-查询团长列表(下单选择地址)")
+    @RequestMapping(value = "/queryLeaderList", method = {RequestMethod.GET})
+    public Result<?> queryLeaderList(PageBean pageBean){
+        return leaderService.queryLeaderList(pageBean);
+    }
+
+}

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

@@ -6,11 +6,13 @@ 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.teambuyOrderGoods.entity.TeambuyOrderGoods;
 import org.jeecg.modules.teambuyOrderLeader.entity.TeambuyOrderLeader;
 import org.jeecg.modules.teambuyOrderMember.entity.TeambuyOrderMember;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Api(tags="订单-订单信息相关接口")
 @RestController
@@ -37,44 +39,29 @@ public class OrderController {
         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);
-//    }
+    //创建订单
+    @ApiOperation(value="订单-创建订单", notes="支付方式(payType)：0-微信支付 1-余额支付")
+    @RequestMapping(value = "/createOrder", method = {RequestMethod.POST})
+    public Result<?> createOrder(@RequestHeader("X-Access-Token") String token, TeambuyOrderMember teambuyOrderMember, String payType){
+        return orderService.createOrder(token, teambuyOrderMember, payType);
+    }
+    //创建订单
+    @ApiOperation(value="订单-创建订单2", notes="支付方式(payType)：0-微信支付 1-余额支付")
+    @RequestMapping(value = "/createOrder2", method = {RequestMethod.POST})
+    public Result<?> createOrder2(@RequestHeader("X-Access-Token") String token, TeambuyOrderMember teambuyOrderMember, String payType, String leaderId, String goodss){
+        return orderService.createOrder2(token, teambuyOrderMember, payType, leaderId, goodss);
+    }
+
+    //支付订单
+    @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

@@ -27,9 +27,17 @@ public class ShopcarContrller {
     private ShopcarService shopcarService;
     /******************************************************************************************************************/
     //查看购物车列表
-    @ApiOperation(value="订单-查看购物车列表/详情", notes="订单-查看购物车列表/详情")
+    @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);
     }
+
+    //添加购物车
+    @ApiOperation(value="购物车-添加购物车", notes="购物车-添加购物车")
+    @RequestMapping(value = "/addShopcar", method = {RequestMethod.POST})
+    public Result<?> addShopcar(@RequestHeader("X-Access-Token") String token, TeambuyBuycar teambuyBuycar){
+        return shopcarService.addShopcar(token, teambuyBuycar);
+    }
+
 }

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

@@ -0,0 +1,45 @@
+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.apiService.UserInfoService;
+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/userInfo")
+@Slf4j
+public class UserInfoController {
+    /******************************************************************************************************************/
+    @Resource
+    private UserInfoService userInfoService;
+    /******************************************************************************************************************/
+
+    //查看个人信息
+    @ApiOperation(value="查看个人信息", notes="查看个人信息")
+    @RequestMapping(value = "/queryUser", method = {RequestMethod.GET})
+    public Result<?> queryUser(@RequestHeader("X-Access-Token") String token){
+        return userInfoService.queryUserInfo(token);
+    }
+
+    //修改个人信息
+    @ApiOperation(value="修改个人信息", notes="修改个人信息")
+    @RequestMapping(value = "/updateUser", method = {RequestMethod.POST})
+    public Result<?> updateUser(@RequestHeader("X-Access-Token") String token,String nickName,String phone,String headImage){
+        return userInfoService.updateUserInfo(token, nickName, phone, headImage);
+    }
+
+    //获取个人中心基础数据信息
+    @ApiOperation(value="获取个人中心基础数据信息", notes="获取个人中心基础数据信息")
+    @RequestMapping(value = "/getUserCenterData", method = {RequestMethod.GET})
+    public Result<?> getUserCenterData(@RequestHeader("X-Access-Token") String token){
+        return userInfoService.getUserCenterData(token);
+    }
+}

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

@@ -0,0 +1,16 @@
+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.teambuyBalanceLog.entity.TeambuyBalanceLog;
+import org.jeecg.modules.teambuyTeamLeader.entity.TeambuyTeamLeader;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+public interface AmountService {
+
+    //收支明细
+    public Result<?> queryAmountLog(String token, TeambuyBalanceLog balanceLog, PageBean pageBean);
+}

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

@@ -0,0 +1,27 @@
+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.teambuyTeamLeader.entity.TeambuyTeamLeader;
+import org.jeecg.modules.teambuyTeamRelation.entity.TeambuyTeamRelation;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+public interface LeaderService {
+    //团长申请
+    public Result<?> addLeader(String token, TeambuyTeamLeader teamLeader);
+    //解绑团长
+    public Result<?> deleteLeader(String token, TeambuyTeamRelation teamRelation);
+    //更换团长
+    public Result<?> updateLeader(String token, TeambuyTeamRelation teamRelation);
+    //查询团长信息
+    public Result<?> queryLeaderInfo(String token);
+    //修改团长信息
+    public Result<?> updateLeaderInfo(String token, TeambuyTeamLeader teamLeader);
+    //查询团长列表
+    public Result<?> queryMemberList(String token, PageBean pageBean);
+    //查询团长列表
+    public Result<?> queryLeaderList(PageBean pageBean);
+}

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

@@ -3,31 +3,27 @@ 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.teambuyOrderGoods.entity.TeambuyOrderGoods;
 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;
 
+import java.util.List;
+
 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);
+    //创建订单
+    public Result<?> createOrder(String token, TeambuyOrderMember teambuyOrderMember, String payType);
+    //创建订单
+    public Result<?> createOrder2(String token, TeambuyOrderMember teambuyOrderMember, String payType, String leaderId, String goodsList);
+    //支付订单
+    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

@@ -11,4 +11,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 public interface ShopcarService {
     //查看购物车列表
     public Result<?> queryShopcarList(String token, TeambuyBuycar teambuyBuycar, PageBean pageBean);
+
+    //添加购物车
+    public Result<?> addShopcar(String token, TeambuyBuycar teambuyBuycar);
 }

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.apiService;
+
+import org.jeecg.common.api.vo.Result;
+
+public interface UserInfoService {
+    //查询个人信息接口
+    Result<?> queryUserInfo(String token);
+
+    //修改个人信息接口
+    Result<?> updateUserInfo(String token, String nickName, String phone, String headImage);
+
+    //获取个人中心基础数据信息
+    Result<?> getUserCenterData(String token);
+}

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

@@ -0,0 +1,78 @@
+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.AmountService;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
+import org.jeecg.modules.teambuyBalanceLog.entity.TeambuyBalanceLog;
+import org.jeecg.modules.teambuyBalanceLog.service.ITeambuyBalanceLogService;
+import org.jeecg.modules.teambuyTeamLeader.entity.TeambuyTeamLeader;
+import org.jeecg.modules.teambuyTeamLeader.service.ITeambuyTeamLeaderService;
+import org.jeecg.modules.teambuyTeamRelation.service.ITeambuyTeamRelationService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class AmountServiceImpl implements AmountService {
+    /******************************************************************************************************************/
+    //权限验证
+    @Resource
+    private ShiroRealm shiroRealm;
+    //用户信息
+    @Resource
+    private IHanHaiMemberService hanHaiMemberService;
+    //收支信息
+    @Resource
+    private ITeambuyBalanceLogService teambuyBalanceLogService;
+    /******************************************************************************************************************/
+    @Override
+    public Result<?> queryAmountLog(String token, TeambuyBalanceLog balanceLog, PageBean pageBean) {
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919589727643111426");
+        //返回信息
+        String massege = "";
+        //分页信息
+        Page<TeambuyBalanceLog> page = null;
+        //查询信息
+        LambdaQueryChainWrapper<TeambuyBalanceLog> query = null;
+        //返回信息
+        Page<TeambuyBalanceLog> pageList = null;
+
+        try{
+            //分页
+            page = new Page<TeambuyBalanceLog>(pageBean.getPageNo(), pageBean.getPageSize());
+            query = teambuyBalanceLogService
+                    .lambdaQuery();
+
+            //收支关联者
+            query.eq(TeambuyBalanceLog::getUserId, hanHaiMember.getId());
+
+            //收支类型
+            if(StringUtils.isNotBlank(balanceLog.getCashType())){
+                query.eq(TeambuyBalanceLog::getCashType, balanceLog.getCashType());
+            }
+            //记录类型
+            if(StringUtils.isNotBlank(balanceLog.getRecordType())){
+                query.eq(TeambuyBalanceLog::getRecordType, balanceLog.getRecordType());
+            }
+
+            //按照排序编号降序排列
+            query.orderByDesc(TeambuyBalanceLog::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/CouponServiceImpl.java

@@ -32,8 +32,8 @@ public class CouponServiceImpl implements CouponService {
     @Override
     public Result<?> queryCouponList(String token, TeambuyCouponUser teambuyCouponUser, PageBean pageBean) {
         //权限验证
-        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        HanHaiMember hanHaiMember = hanHaiMemberService.getById("1898983659468853250");
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1898983659468853250");
         //返回信息
         String massege = "";
         //分页信息

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

@@ -0,0 +1,266 @@
+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.LeaderService;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
+import org.jeecg.modules.teambuyCategory.entity.TeambuyCategory;
+import org.jeecg.modules.teambuyGoods.entity.TeambuyGoods;
+import org.jeecg.modules.teambuyTeamLeader.entity.TeambuyTeamLeader;
+import org.jeecg.modules.teambuyTeamLeader.service.ITeambuyTeamLeaderService;
+import org.jeecg.modules.teambuyTeamRelation.entity.TeambuyTeamRelation;
+import org.jeecg.modules.teambuyTeamRelation.service.ITeambuyTeamRelationService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class LeaderServiceImpl implements LeaderService {
+    /******************************************************************************************************************/
+    //权限验证
+    @Resource
+    private ShiroRealm shiroRealm;
+    //用户信息
+    @Resource
+    private IHanHaiMemberService hanHaiMemberService;
+    //团长信息
+    @Resource
+    private ITeambuyTeamLeaderService teambuyTeamLeaderService;
+    //团员团长关联
+    @Resource
+    private ITeambuyTeamRelationService teambuyTeamRelationService;
+    /******************************************************************************************************************/
+
+    //团长申请
+    @Override
+    public Result<?> addLeader(String token, TeambuyTeamLeader teamLeader) {
+        //权限验证
+        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919587097244078081");
+        //返回信息
+        String massege = "";
+
+        try{
+            //执行新增操作(不传id进行新增，传了id则进行修改)
+            teamLeader.setUserId(hanHaiMember.getId());
+            boolean result = teambuyTeamLeaderService.saveOrUpdate(teamLeader);
+
+            //判断是否新增成功
+            if(result){
+                return Result.OK("操作成功");
+            }else {
+                return Result.OK("操作失败");
+            }
+
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("操作失败");
+        }
+    }
+
+    //修改团长信息
+    @Override
+    public Result<?> updateLeaderInfo(String token, TeambuyTeamLeader teamLeader) {
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //返回信息
+        String massege = "";
+
+        try{
+            //执行新增操作(不传id进行新增，传了id则进行修改)
+            teamLeader.setUserId(hanHaiMember.getId());
+            boolean result = teambuyTeamLeaderService.saveOrUpdate(teamLeader);
+
+            //判断是否新增成功
+            if(result){
+                return Result.OK("操作成功");
+            }else {
+                return Result.OK("操作失败");
+            }
+
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("操作失败");
+        }
+    }
+
+
+
+    //解绑团长
+    @Override
+    public Result<?> deleteLeader(String token, TeambuyTeamRelation teamRelation) {
+        //权限验证
+        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        HanHaiMember hanHaiMember = hanHaiMemberService.getById("1898983659468853250");
+        //返回信息
+        String massege = "";
+
+        try{
+            //解绑团长
+            boolean result = teambuyTeamRelationService
+                    .lambdaUpdate()
+                    .eq(TeambuyTeamRelation::getMemberId, teamRelation.getMemberId())
+                    .eq(TeambuyTeamRelation::getLeaderId, teamRelation.getLeaderId())
+                    .set(TeambuyTeamRelation::getStatus, "0")
+                    .update();
+
+            //判断是否新增成功
+            if(result){
+                return Result.OK("操作成功");
+            }else {
+                return Result.OK("操作失败");
+            }
+
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("操作失败");
+        }
+    }
+
+    //更换团长
+    @Override
+    public Result<?> updateLeader(String token, TeambuyTeamRelation teamRelation) {
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //返回信息
+        String massege = "";
+
+        //查询用户是否有绑定团长，如果有，需要先解除绑定
+        TeambuyTeamRelation relation = teambuyTeamRelationService.lambdaQuery()
+                .eq(TeambuyTeamRelation::getMemberId, hanHaiMember.getId())
+                .one();
+
+        if(null == relation){
+            return Result.error("还没有绑定团长");
+        }
+        if("0".equals(relation.getStatus())){
+            return Result.error("原团长解绑中，解绑成功后方可更换团长");
+        }
+        if("1".equals(relation.getStatus())){
+            return Result.error("请先解除当前团长绑定");
+        }
+
+        try{
+            //更换团长
+            boolean result = teambuyTeamRelationService
+                    .lambdaUpdate()
+                    .eq(TeambuyTeamRelation::getMemberId, teamRelation.getMemberId())
+                    .set(TeambuyTeamRelation::getLeaderId, teamRelation.getLeaderId())
+                    .set(TeambuyTeamRelation::getStatus, "1")
+                    .update();
+
+            //判断是否更换成功
+            if(result){
+                return Result.OK("操作成功");
+            }else {
+                return Result.error("操作失败");
+            }
+
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("操作失败");
+        }
+    }
+
+    //查询团长信息
+    @Override
+    public Result<?> queryLeaderInfo(String token) {
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //返回信息
+        String massege = "";
+
+        try{
+            TeambuyTeamLeader one = teambuyTeamLeaderService
+                    .lambdaQuery()
+                    .eq(TeambuyTeamLeader::getUserId, hanHaiMember.getId())
+                    .one();
+
+            return Result.OK("团长信息详情", one);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("团长信息详情查询失败");
+        }
+    }
+
+    //查询团团员列表
+    @Override
+    public Result<?> queryMemberList(String token, PageBean pageBean) {
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //返回信息
+        String massege = "";
+        //分页信息
+        Page<TeambuyTeamRelation> page = null;
+        //查询信息
+        LambdaQueryChainWrapper<TeambuyTeamRelation> query = null;
+        //返回信息
+        Page<TeambuyTeamRelation> pageList = null;
+
+        try{
+            //分页
+            page = new Page<TeambuyTeamRelation>(pageBean.getPageNo(), pageBean.getPageSize());
+            query = teambuyTeamRelationService
+                    .lambdaQuery();
+
+            //团长id
+            query.eq(TeambuyTeamRelation::getLeaderId, hanHaiMember.getId());
+            //按照排序编号升序排列
+            query.orderByDesc(TeambuyTeamRelation::getCreateTime);
+
+            //获取商品信息信息
+            pageList = query.page(page);
+
+            for (TeambuyTeamRelation record : pageList.getRecords()) {
+                //团长信息
+                TeambuyTeamLeader teamLeader = teambuyTeamLeaderService.getById(record.getLeaderId());
+                record.setTeamLeader(teamLeader);
+
+                //团员信息
+                HanHaiMember member = hanHaiMemberService.getById(record.getMemberId());
+                record.setMember(member);
+            }
+
+            return Result.OK("团员列表", pageList);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("团员列表查询失败");
+        }
+    }
+
+    //查询团长列表
+    @Override
+    public Result<?> queryLeaderList(PageBean pageBean) {
+        //返回信息
+        String massege = "";
+        //分页信息
+        Page<TeambuyTeamLeader> page = null;
+        //查询信息
+        LambdaQueryChainWrapper<TeambuyTeamLeader> query = null;
+        //返回信息
+        Page<TeambuyTeamLeader> pageList = null;
+
+        try{
+            //分页
+            page = new Page<TeambuyTeamLeader>(pageBean.getPageNo(), pageBean.getPageSize());
+            query = teambuyTeamLeaderService
+                    .lambdaQuery();
+
+            //按照排序编号升序排列
+            query.orderByDesc(TeambuyTeamLeader::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/LoginApiServiceImpl.java

@@ -30,7 +30,7 @@ public class LoginApiServiceImpl implements LoginApiService {
     //微信小程序appid(敢为人鲜)
     private static final String mpAppId = "wx94a640f07969d6c9";
     //微信小程序appSecret(敢为人鲜)
-    private static final String mpAppSecret = "";
+    private static final String mpAppSecret = "7553d1ab6f599524024df1a02e27d208";
 
     @Resource
     private RedisUtil redisUtil;

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

@@ -4,11 +4,13 @@ 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 lombok.extern.slf4j.Slf4j;
 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.apiUtils.CommonUtils;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.jeecg.modules.pay.MpWxPayService;
@@ -20,6 +22,8 @@ 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.jeecg.modules.teambuyTeamLeader.entity.TeambuyTeamLeader;
+import org.jeecg.modules.teambuyTeamLeader.service.ITeambuyTeamLeaderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -28,6 +32,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
+@Slf4j
 @Service
 public class OrderServiceImpl implements OrderService {
     /******************************************************************************************************************/
@@ -40,6 +45,9 @@ public class OrderServiceImpl implements OrderService {
     //用户信息
     @Resource
     private IHanHaiMemberService hanHaiMemberService;
+    //团长信息
+    @Resource
+    private ITeambuyTeamLeaderService teambuyTeamLeaderService;
     //团餐订单信息
     @Resource
     private ITeambuyOrderLeaderService teambuyOrderLeaderService;
@@ -58,7 +66,7 @@ public class OrderServiceImpl implements OrderService {
     public Result<?> queryLeaderOrderList(String token, TeambuyOrderLeader teambuyOrderLeader, PageBean pageBean) {
         //权限验证
         //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        HanHaiMember hanHaiMember = hanHaiMemberService.getById("1898983659468853250");
+        HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919589727643111426");
         //返回信息
         String massege = "";
         //分页信息
@@ -84,7 +92,12 @@ public class OrderServiceImpl implements OrderService {
                 query.eq(TeambuyOrderLeader::getStatus, teambuyOrderLeader.getStatus());
             }
             //团餐订单所属
-            query.eq(TeambuyOrderLeader::getUserId, hanHaiMember.getId());
+            TeambuyTeamLeader leader = teambuyTeamLeaderService
+                    .lambdaQuery()
+                    .eq(TeambuyTeamLeader::getUserId, hanHaiMember.getId())
+                    .one();
+            //团长id
+            query.eq(TeambuyOrderLeader::getUserId, leader.getId());
             //按照创建时间降序排列
             query.orderByDesc(TeambuyOrderLeader::getCreateTime);
 
@@ -146,7 +159,7 @@ public class OrderServiceImpl implements OrderService {
     public Result<?> queryMemberOrderList(String token, TeambuyOrderMember teambuyOrderMember, PageBean pageBean) {
         //权限验证
         //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        HanHaiMember hanHaiMember = hanHaiMemberService.getById("1898983659468853250");
+        HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919589727643111426");
         //返回信息
         String massege = "";
         //分页信息
@@ -206,266 +219,284 @@ public class OrderServiceImpl implements OrderService {
         }
     }
 
-//    //查看团餐订单详情
-//    @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;
-//    }
+    //创建订单
+    @Override
+    public Result<?> createOrder(String token, TeambuyOrderMember teambuyOrderMember, String payType) {
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
+        try{
+            //订单信息
+            String payNo = IdWorker.getIdStr();//生成订单号
+            teambuyOrderMember.setId(payNo);
+            teambuyOrderMember.setUserId(hanHaiMember.getId());
+
+            //订单信息编辑
+            teambuyOrderMember.setTitle("的订单");//订单名称
+            teambuyOrderMember.setUserId(hanHaiMember.getId());//订单拥有者
+            teambuyOrderMember.setOrderLeaderId("");//团餐订单编号
+
+            //查询团长信息
+
+
+            //创建团员订单
+            teambuyOrderMemberService.save(teambuyOrderMember);
+
+            //订单支付
+            switch (payType){
+                //微信支付
+                case "0":
+                    //吊起微信支付
+                    BigDecimal price = teambuyOrderMember.getPricePay();//价格
+                    String productName = teambuyOrderMember.getTitle();//服务名称
+
+                    String s = price.multiply(new BigDecimal(100)).toString();
+                    int i1 = Double.valueOf(s).intValue();
+                    Object appOrder = mpWxPayService.createOrder(
+                            "购买"+ productName ,
+                            "127.0.0.1",
+                            teambuyOrderMember.getId(),
+                            i1,
+                            teambuyOrderMember.getId(),
+                            hanHaiMember.getAppletOpenid(),
+                            teambuyOrderMember.toString());
+                    return Result.OK("支付成功",appOrder);
+
+                //余额支付
+                case "1":
+                    //用户余额
+                    BigDecimal balance = hanHaiMember.getPrice();
+                    //订单实付金额
+                    BigDecimal amount = teambuyOrderMember.getPricePay();
+
+                    if(balance.compareTo(amount) == 1 ){
+                        //等同于a>b
+                        balance = balance.subtract(amount);
+                    }else {
+                        return Result.error("余额不足");
+                    }
+                    //修改用户余额
+                    hanHaiMember.setPrice(balance);
+                    hanHaiMemberService.updateById(hanHaiMember);
+
+                    //修改订单信息
+                    teambuyOrderMember.setStatus("1");//订单状态
+                    teambuyOrderMember.setPayTime(CommonUtils.getCurrentTime());//订单支付时间
+                    teambuyOrderMemberService.updateById(teambuyOrderMember);
+                    return Result.OK("支付成功");
+
+            }
+            return Result.error("支付失败");
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("支付失败");
+        }
+
+    }
+
+    //创建订单
+    @Override
+    public Result<?> createOrder2(String token, TeambuyOrderMember teambuyOrderMember, String payType, String leaderId, String goodss) {
+        //权限验证
+        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919589727643111426");
+
+        try{
+            //订单信息
+            String payNo = IdWorker.getIdStr();//生成订单号
+            teambuyOrderMember.setId(payNo);
+            teambuyOrderMember.setUserId(hanHaiMember.getId());
+
+            //订单信息编辑
+            teambuyOrderMember.setTitle("的订单");//订单名称
+            teambuyOrderMember.setUserId(hanHaiMember.getId());//订单拥有者
+            teambuyOrderMember.setOrderLeaderId("");//团餐订单编号
+
+            //查询团长信息
+            TeambuyTeamLeader teamLeader = teambuyTeamLeaderService.getById(leaderId);
+            if(null == teamLeader){
+                return Result.error("团长不存在，请查看团长id是否正确" + leaderId);
+            }
+
+            //查询团长正在团餐的订单，如果没有则创建团餐订单
+            TeambuyOrderLeader orderLeader = teambuyOrderLeaderService
+                    .lambdaQuery()
+                    .eq(TeambuyOrderLeader::getUserId, leaderId)
+                    .eq(TeambuyOrderLeader::getStatus, 0)
+                    .one();
+            if(null == orderLeader){
+                TeambuyOrderLeader orderLeader1 = new TeambuyOrderLeader();
+                orderLeader1.setTitle("团长的订单");
+                orderLeader1.setUserId(teamLeader.getId());
+                teambuyOrderLeaderService.save(orderLeader1);
+
+                //延迟2s
+                //Thread.sleep(2000);
+
+                TeambuyOrderLeader orderLeader2 = teambuyOrderLeaderService
+                        .lambdaQuery()
+                        .eq(TeambuyOrderLeader::getUserId, leaderId)
+                        .eq(TeambuyOrderLeader::getStatus, 0)
+                        .one();
+                teambuyOrderMember.setOrderLeaderId(orderLeader2.getId());
+            }else {
+                teambuyOrderMember.setOrderLeaderId(orderLeader.getId());
+            }
+
+            //创建团员订单
+            teambuyOrderMemberService.save(teambuyOrderMember);
+
+            //创建团员餐品信息
+            List<TeambuyOrderGoods> list = new ArrayList<>();
+            String[] goods = goodss.split(";");
+            for (int i = 0; i < goods.length; i++) {
+                String[] param = goods[i].split(",");
+                TeambuyOrderGoods goods1 = new TeambuyOrderGoods();
+                goods1.setOrderId(teambuyOrderMember.getId());//团员订单id
+                goods1.setGoodsId(param[0]);//商品id
+                goods1.setNum(Integer.valueOf(param[1]));//商品数量
+                goods1.setPrice(BigDecimal.valueOf(Long.parseLong(param[2])));//商品总价格
+                list.add(goods1);
+            }
+            teambuyOrderGoodsService.saveBatch(list);
+
+            //订单支付
+            switch (payType){
+                //微信支付
+                case "0":
+                    //吊起微信支付
+                    BigDecimal price = teambuyOrderMember.getPricePay();//价格
+                    String productName = teambuyOrderMember.getTitle();//服务名称
+
+                    String s = price.multiply(new BigDecimal(100)).toString();
+                    int i1 = Double.valueOf(s).intValue();
+                    Object appOrder = mpWxPayService.createOrder(
+                            "购买"+ productName ,
+                            "127.0.0.1",
+                            teambuyOrderMember.getId(),
+                            i1,
+                            teambuyOrderMember.getId(),
+                            hanHaiMember.getAppletOpenid(),
+                            teambuyOrderMember.toString());
+                    return Result.OK("支付成功",appOrder);
+
+                //余额支付
+                case "1":
+                    //用户余额
+                    BigDecimal balance = hanHaiMember.getPrice();
+                    //订单实付金额
+                    BigDecimal amount = teambuyOrderMember.getPricePay();
+
+                    if(balance.compareTo(amount) == 1 ){
+                        //等同于a>b
+                        balance = balance.subtract(amount);
+                    }else {
+                        return Result.error("余额不足");
+                    }
+                    //修改用户余额
+                    hanHaiMember.setPrice(balance);
+                    hanHaiMemberService.updateById(hanHaiMember);
+
+                    //修改订单信息
+                    teambuyOrderMember.setStatus("1");//订单状态
+                    teambuyOrderMember.setPayTime(CommonUtils.getCurrentTime());//订单支付时间
+                    teambuyOrderMemberService.updateById(teambuyOrderMember);
+                    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{
+            //订单信息
+            TeambuyOrderMember teambuyOrderMember = teambuyOrderMemberService.getById(orderId);
+
+            //订单支付
+            switch (payType){
+                //微信支付
+                case "0":
+                    //吊起微信支付
+                    BigDecimal price = teambuyOrderMember.getPricePay();//价格
+                    String productName = teambuyOrderMember.getTitle();//服务名称
+
+                    String s = price.multiply(new BigDecimal(100)).toString();
+                    int i1 = Double.valueOf(s).intValue();
+                    Object appOrder = mpWxPayService.createOrder(
+                            "购买"+ productName ,
+                            "127.0.0.1",
+                            teambuyOrderMember.getId(),
+                            i1,
+                            teambuyOrderMember.getId(),
+                            hanHaiMember.getAppletOpenid(),
+                            teambuyOrderMember.toString());
+                    return Result.OK("支付成功",appOrder);
+
+                //余额支付
+                case "1":
+                    //用户余额
+                    BigDecimal balance = hanHaiMember.getPrice();
+                    //订单实付金额
+                    BigDecimal amount = teambuyOrderMember.getPricePay();
+
+                    if(balance.compareTo(amount) == 1 ){
+                        //等同于a>b
+                        balance = balance.subtract(amount);
+                    }else {
+                        return Result.error("余额不足，支付失败");
+                    }
+                    //修改用户余额
+                    hanHaiMember.setPrice(balance);
+                    hanHaiMemberService.updateById(hanHaiMember);
+
+                    //修改订单信息
+                    teambuyOrderMember.setStatus("1");//订单状态
+                    teambuyOrderMember.setPayTime(CommonUtils.getCurrentTime());//订单支付时间
+                    teambuyOrderMemberService.updateById(teambuyOrderMember);
+                    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{
+            //查询订单信息
+            TeambuyOrderMember teambuyOrderMember = teambuyOrderMemberService.getById(outTradeNo);
+            //如果订单存在则修改订单状态
+            if (null != teambuyOrderMember){
+                if("0".equals(teambuyOrderMember.getStatus())){
+                    teambuyOrderMember.setStatus("1");//订单状态
+                    teambuyOrderMember.setPayTime(CommonUtils.getCurrentTime());//订单支付时间
+                    teambuyOrderMemberService.updateById(teambuyOrderMember);
+                }
+            }
+
+        }catch (Exception e){
+            log.info("支付回调失败，订单号码："+outTradeNo);
+            e.printStackTrace();
+        }
+        return null;
+    }
 }

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

@@ -49,7 +49,7 @@ public class RecommendServiceImpl implements RecommendService {
     private ITeambuyConfigService teambuyConfigService;
 
     private String appid = "wx94a640f07969d6c9";//小程序appid
-    private String secret = "";//小程序密钥
+    private String secret = "7553d1ab6f599524024df1a02e27d208";//小程序密钥
     @Value("${jeecg.oss.endpoint}")
     private String endpoint;
     @Value("${jeecg.oss.accessKey}")
@@ -241,7 +241,7 @@ public class RecommendServiceImpl implements RecommendService {
      * @return
      */
     private String uploadAliYunOss(MultipartFile mf) throws Exception {
-        String uploadFile = "massage";
+        String uploadFile = "teambuy";
         String fileName = new StringBuffer(mf.getOriginalFilename()).append(".jpg").toString();// 获取文件名
         String dbpath = uploadFile + File.separator + fileName;
         if (dbpath.contains("\\")) {

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

@@ -43,8 +43,8 @@ public class ShopcarServiceImpl implements ShopcarService {
     @Override
     public Result<?> queryShopcarList(String token, TeambuyBuycar teambuyBuycar, PageBean pageBean) {
         //权限验证
-        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        HanHaiMember hanHaiMember = hanHaiMemberService.getById("1898983659468853250");
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1898983659468853250");
         //返回信息
         String massege = "";
         //分页信息
@@ -85,4 +85,32 @@ public class ShopcarServiceImpl implements ShopcarService {
             return Result.error("购物车列表查询失败");
         }
     }
+
+    //添加购物车
+    @Override
+    public Result<?> addShopcar(String token, TeambuyBuycar teambuyBuycar) {
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1898983659468853250");
+        //返回信息
+        String massege = "";
+
+        try{
+            //执行新增操作(不传id进行新增，传了id则进行修改)
+            teambuyBuycar.setUserId(hanHaiMember.getId());
+            boolean result = teambuyBuycarService.saveOrUpdate(teambuyBuycar);
+
+            //判断是否新增成功
+            if(result){
+                return Result.OK("操作成功");
+            }else {
+                return Result.OK("操作失败");
+            }
+
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("操作失败");
+        }
+    }
+
 }

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

@@ -0,0 +1,97 @@
+package org.jeecg.modules.apiService.impl;
+
+import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.config.shiro.ShiroRealm;
+import org.jeecg.modules.apiService.UserInfoService;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+public class UserInfoServiceImpl implements UserInfoService {
+    /******************************************************************************************************************/
+    //权限验证
+    @Resource
+    private ShiroRealm shiroRealm;
+    //用户信息
+    @Resource
+    private IHanHaiMemberService hanHaiMemberService;
+    /******************************************************************************************************************/
+
+    //查询个人信息
+    @Override
+    public Result<?> queryUserInfo(String token){
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1898983659468853250");
+
+        try{
+            HanHaiMember byId = hanHaiMemberService.getById(hanHaiMember.getId());
+            return Result.OK(byId);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("用户信息获取失败", null);
+        }
+    }
+
+    //修改个人信息
+    @Override
+    public Result<?> updateUserInfo(String token, String nickName, String phone, String headImage){
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1898983659468853250");
+
+        try{
+            //用户昵称不能为空
+            if(StringUtils.isBlank(nickName)){
+                return Result.error("用户昵称不能为空");
+            }
+            if(StringUtils.isBlank(headImage)){
+                return Result.error("头像不能为空");
+            }
+
+            hanHaiMember.setNickName(nickName);
+            hanHaiMember.setPhone(phone);
+            hanHaiMember.setHeadImage(headImage);
+            hanHaiMemberService.updateById(hanHaiMember);
+
+            return Result.OK("修改成功");
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("修改失败");
+        }
+    }
+
+    //获取个人中心基础数据信息
+    @Override
+    public Result<?> getUserCenterData(String token){
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1898983659468853250");
+        //返回信息
+        Map map = new HashMap();
+
+        try{
+
+            //组装个人基础数据
+            map.put("member",hanHaiMember);//用户基础信息
+
+            map.put("score",hanHaiMember.getIntegerPrice());//积分
+            map.put("balance",hanHaiMember.getPrice());//余额
+
+            //推广佣金
+            //优惠券
+
+            return Result.OK("获取个人中心基础数据信息",map);
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("获取个人中心基础数据信息失败",map);
+        }
+    }
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiUtils/CommonUtils.java

@@ -0,0 +1,22 @@
+package org.jeecg.modules.apiUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class CommonUtils {
+
+    //获取当前时间
+    public static Date getCurrentTime(){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date now = new Date();
+        String formattedDate = sdf.format(now);
+//        System.out.println(now); // 输出格式化后的当前时间
+//        System.out.println(formattedDate); // 输出格式化后的当前时间
+        return now;
+    }
+
+    public static void main(String[] args) {
+        System.out.println(getCurrentTime());
+    }
+
+}

jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -196,7 +196,7 @@ jeecg :
     secretKey: iPBIWop0GOYKew65TJvEcKFOISlPUs
     endpoint: oss-cn-guangzhou.aliyuncs.com
     bucketName: gwrx666
-    staticDomain: https://img.gwrx666.com
+    staticDomain: https://img.gwrx666.com/
   # ElasticSearch 6设置
   elasticsearch:
     cluster-name: jeecg-ES