1、团长模块

2、订单模块

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

@@ -39,16 +39,16 @@ public class OrderController {
         return orderService.queryMemberOrderList(token, teambuyOrderMember, pageBean);
     }
 
+//    //创建订单
+//    @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="订单-创建订单", 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){
+    public Result<?> createOrder(@RequestHeader("X-Access-Token") String token, TeambuyOrderMember teambuyOrderMember, String payType, String leaderId, String goodss){
         return orderService.createOrder2(token, teambuyOrderMember, payType, leaderId, goodss);
     }
 

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

@@ -46,6 +46,26 @@ public class LeaderServiceImpl implements LeaderService {
         String massege = "";
 
         try{
+            //判断是否已经存在审核已通过状态团长信息
+            TeambuyTeamLeader leader1 = teambuyTeamLeaderService
+                    .lambdaQuery()
+                    .eq(TeambuyTeamLeader::getUserId, hanHaiMember.getId())
+                    .eq(TeambuyTeamLeader::getStatus, 1)
+                    .one();
+            if(null != leader1){
+                teamLeader.setId(leader1.getId());
+            }
+
+            //判断是否已经存在审核未通过状态团长信息
+            TeambuyTeamLeader leader2 = teambuyTeamLeaderService
+                    .lambdaQuery()
+                    .eq(TeambuyTeamLeader::getUserId, hanHaiMember.getId())
+                    .in(TeambuyTeamLeader::getStatus, 0,2)
+                    .one();
+            if(null != leader2){
+                teamLeader.setId(leader2.getId());
+            }
+
             //执行新增操作(不传id进行新增，传了id则进行修改)
             teamLeader.setUserId(hanHaiMember.getId());
             boolean result = teambuyTeamLeaderService.saveOrUpdate(teamLeader);

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

@@ -65,8 +65,8 @@ public class OrderServiceImpl implements OrderService {
     @Override
     public Result<?> queryLeaderOrderList(String token, TeambuyOrderLeader teambuyOrderLeader, PageBean pageBean) {
         //权限验证
-        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919589727643111426");
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919589727643111426");
         //返回信息
         String massege = "";
         //分页信息
@@ -158,8 +158,8 @@ public class OrderServiceImpl implements OrderService {
     @Override
     public Result<?> queryMemberOrderList(String token, TeambuyOrderMember teambuyOrderMember, PageBean pageBean) {
         //权限验证
-        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919589727643111426");
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919589727643111426");
         //返回信息
         String massege = "";
         //分页信息
@@ -298,8 +298,8 @@ public class OrderServiceImpl implements OrderService {
     @Override
     public Result<?> createOrder2(String token, TeambuyOrderMember teambuyOrderMember, String payType, String leaderId, String goodss) {
         //权限验证
-        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919589727643111426");
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919589727643111426");
 
         try{
             //订单信息
@@ -308,7 +308,7 @@ public class OrderServiceImpl implements OrderService {
             teambuyOrderMember.setUserId(hanHaiMember.getId());
 
             //订单信息编辑
-            teambuyOrderMember.setTitle("的订单");//订单名称
+            teambuyOrderMember.setTitle("团员的订单");//订单名称
             teambuyOrderMember.setUserId(hanHaiMember.getId());//订单拥有者
             teambuyOrderMember.setOrderLeaderId("");//团餐订单编号
 
@@ -326,7 +326,7 @@ public class OrderServiceImpl implements OrderService {
                     .one();
             if(null == orderLeader){
                 TeambuyOrderLeader orderLeader1 = new TeambuyOrderLeader();
-                orderLeader1.setTitle("团长的订单");
+                orderLeader1.setTitle(teamLeader.getName() +"团长的订单");
                 orderLeader1.setUserId(teamLeader.getId());
                 teambuyOrderLeaderService.save(orderLeader1);
 
@@ -355,7 +355,8 @@ public class OrderServiceImpl implements OrderService {
                 goods1.setOrderId(teambuyOrderMember.getId());//团员订单id
                 goods1.setGoodsId(param[0]);//商品id
                 goods1.setNum(Integer.valueOf(param[1]));//商品数量
-                goods1.setPrice(BigDecimal.valueOf(Long.parseLong(param[2])));//商品总价格
+                goods1.setPrice(new BigDecimal(param[2]));//商品总价格
+                //goods1.setPrice(BigDecimal.valueOf(10));//商品总价格
                 list.add(goods1);
             }
             teambuyOrderGoodsService.saveBatch(list);