1、功能修复

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-05-08
+ * @Date:   2025-05-14
  * @Version: V1.0
  */
 @Api(tags="团员订单表")

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

@@ -26,7 +26,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 团员订单表
  * @Author: jeecg-boot
- * @Date:   2025-05-08
+ * @Date:   2025-05-14
  * @Version: V1.0
  */
 @Data
@@ -92,6 +92,10 @@ public class TeambuyOrderMember implements Serializable {
 	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "关联用户id")
     private java.lang.String userId;
+	/**是否删除*/
+	@Excel(name = "是否删除", width = 15)
+    @ApiModelProperty(value = "是否删除")
+    private java.lang.String isDel;
 
     //商品列表信息
     @TableField(exist = false)

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-05-08
+ * @Date:   2025-05-14
  * @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-05-08
+ * @Date:   2025-05-14
  * @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-05-08
+ * @Date:   2025-05-14
  * @Version: V1.0
  */
 @Service

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

@@ -167,6 +167,11 @@
             align:"center",
             dataIndex: 'userId_dictText'
           },
+          {
+            title:'是否删除',
+            align:"center",
+            dataIndex: 'isDel'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -210,6 +215,7 @@
         fieldList.push({type:'string',value:'orderLeaderId',text:'关联团餐订单id',dictCode:"teambuy_order_leader,title,id"})
         fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
         fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"})
+        fieldList.push({type:'string',value:'isDel',text:'是否删除',dictCode:'teambuy_status_del'})
         this.superFieldList = fieldList
       }
     }

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

@@ -48,6 +48,11 @@
               <j-dict-select-tag type="list" v-model="model.userId" 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="isDel">
+              <a-input v-model="model.isDel" placeholder="请输入是否删除"  ></a-input>
+            </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/teambuyOrderMember/vue3/TeambuyOrderMember.data.ts

@@ -49,6 +49,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'userId_dictText'
    },
+   {
+    title: '是否删除',
+    align:"center",
+    dataIndex: 'isDel'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -109,4 +114,9 @@ export const formSchema: FormSchema[] = [
         dictCode:"han_hai_member,nick_name,id"
      },
   },
+  {
+    label: '是否删除',
+    field: 'isDel',
+    component: 'Input',
+  },
 ];

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

@@ -40,8 +40,6 @@ public class OrderController {
 
     //查看团员订单列表
     @ApiOperation(value="订单-查看团员订单列表/详情", notes="status：0-待支付 1-待出餐 2-送餐中 3-待取餐 4-已完成")
-
-
     @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);
@@ -89,6 +87,13 @@ public class OrderController {
         return orderService.updateMemberOrderById(token, teambuyOrderMember);
     }
 
+    //团员完成取餐
+    @ApiOperation(value="订单-团员完成取餐", notes="订单-团员完成取餐")
+    @RequestMapping(value = "/finishMemberOrderById", method = {RequestMethod.POST})
+    public Result<?> finishMemberOrderById(@RequestHeader("X-Access-Token") String token, String memberOrderId){
+        return orderService.finishMemberOrderById(token, memberOrderId);
+    }
+
 //    //创建订单
 //    @ApiOperation(value="订单-创建订单", notes="支付方式(payType)：0-微信支付 1-余额支付")
 //    @RequestMapping(value = "/createOrder", method = {RequestMethod.POST})
@@ -102,6 +107,13 @@ public class OrderController {
         return orderService.createOrder2(token, teambuyOrderMember, payType, leaderId, goodss);
     }
 
+    //修改团员订单状态
+    @ApiOperation(value="订单-取消团员订单", notes="订单-修改团员订单")
+    @RequestMapping(value = "/deleteMemberOrderById", method = {RequestMethod.POST})
+    public Result<?> deleteMemberOrderById(@RequestHeader("X-Access-Token") String token, String memberOrderId){
+        return orderService.deleteMemberOrderById(token, memberOrderId);
+    }
+
     //支付订单
     @ApiOperation(value="订单-支付订单", notes="支付方式(payType)：0-微信支付 1-余额支付")
     @RequestMapping(value = "/payOrder", method = {RequestMethod.POST})

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

@@ -40,4 +40,11 @@ public class ShopcarContrller {
         return shopcarService.addShopcar(token, teambuyBuycar);
     }
 
+    //取消购物车
+    @ApiOperation(value="购物车-取消购物车", notes="购物车-取消购物车")
+    @RequestMapping(value = "/deleteShopcar", method = {RequestMethod.POST})
+    public Result<?> deleteShopcar(@RequestHeader("X-Access-Token") String token, String shopcarId){
+        return shopcarService.deleteShopcar(token, shopcarId);
+    }
+
 }

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

@@ -31,10 +31,14 @@ public interface OrderService {
     public Result<?> updateLeaderOrderById(String token, TeambuyOrderLeader teambuyOrderLeader);
     //修改团员订单状态
     public Result<?> updateMemberOrderById(String token, TeambuyOrderMember teambuyOrderMember);
+    //团员完成取餐
+    public Result<?> finishMemberOrderById(String token, String memberOrderId);
     //创建订单
     public Result<?> createOrder(String token, TeambuyOrderMember teambuyOrderMember, String payType);
     //创建订单
     public Result<?> createOrder2(String token, TeambuyOrderMember teambuyOrderMember, String payType, String leaderId, String goodsList);
+    //取消团员订单
+    public Result<?> deleteMemberOrderById(String token, String memberOrderId);
     //支付订单
     public Result<?> payOrder(String token, String orderId, String payType);
 

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

@@ -14,4 +14,7 @@ public interface ShopcarService {
 
     //添加购物车
     public Result<?> addShopcar(String token, TeambuyBuycar teambuyBuycar);
+
+    //取消购物车
+    public Result<?> deleteShopcar(String token, String shopcarId);
 }

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

@@ -92,9 +92,10 @@ public class LeaderServiceImpl implements LeaderService {
         String massege = "";
 
         try{
+            //判断传入的id是否是自己的
             //执行新增操作(不传id进行新增，传了id则进行修改)
             teamLeader.setUserId(hanHaiMember.getId());
-            boolean result = teambuyTeamLeaderService.saveOrUpdate(teamLeader);
+            boolean result = teambuyTeamLeaderService.updateById(teamLeader);
 
             //判断是否新增成功
             if(result){

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

@@ -121,8 +121,8 @@ public class OrderServiceImpl implements OrderService {
     @Override
     public Result<?> queryLeaderOrderListById(String token, String teambuyOrderId, PageBean pageBean) {
         //权限验证
-        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919587097244078081");
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919589727643111426");
         //返回信息
         String massege = "";
 
@@ -144,6 +144,7 @@ public class OrderServiceImpl implements OrderService {
             List<TeambuyOrderMember> orderList = teambuyOrderMemberService
                     .lambdaQuery()
                     .eq(TeambuyOrderMember::getOrderLeaderId, orderLeaderId)
+                    .eq(TeambuyOrderMember::getIsDel, "0")
                     .list();
 
             //查询团员订单商品信息列表列表
@@ -204,7 +205,9 @@ public class OrderServiceImpl implements OrderService {
                 //订单状态
                 query.eq(TeambuyOrderMember::getStatus, teambuyOrderMember.getStatus());
             }
-            //团餐订单所属
+            //未取消订单
+            query.eq(TeambuyOrderMember::getIsDel, "0");
+            //团员订单所属
             query.eq(TeambuyOrderMember::getUserId, hanHaiMember.getId());
             //按照创建时间降序排列
             query.orderByDesc(TeambuyOrderMember::getCreateTime);
@@ -449,6 +452,42 @@ public class OrderServiceImpl implements OrderService {
         }
     }
 
+    //团员完成取餐
+    @Override
+    public Result<?> finishMemberOrderById(String token, String memberOrderId) {
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1898983659468853250");
+        //返回信息
+        String massege = "";
+
+        try{
+            //查看团员订单
+            TeambuyOrderMember teambuyOrderMember = teambuyOrderMemberService
+                    .lambdaQuery()
+                    .eq(TeambuyOrderMember::getId, memberOrderId)
+                    .eq(TeambuyOrderMember::getUserId, hanHaiMember.getId())
+                    .one();
+            if(null == teambuyOrderMember){
+                return Result.error("该用户没有该订单，请检查订单编号："+memberOrderId);
+            }
+            //执行修改操作
+            teambuyOrderMember.setStatus("4");
+            boolean result = teambuyOrderMemberService.updateById(teambuyOrderMember);
+
+            //判断是否新增成功
+            if(result){
+                return Result.OK("操作成功");
+            }else {
+                return Result.error("操作失败");
+            }
+
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("操作失败");
+        }
+    }
+
     //创建订单
     @Override
     public Result<?> createOrder(String token, TeambuyOrderMember teambuyOrderMember, String payType) {
@@ -538,7 +577,7 @@ public class OrderServiceImpl implements OrderService {
             teambuyOrderMember.setUserId(hanHaiMember.getId());
 
             //订单信息编辑
-            teambuyOrderMember.setTitle("团员的订单");//订单名称
+            teambuyOrderMember.setTitle("团员订单"+CommonUtils.getCurrentTimeFormat());//订单名称
             teambuyOrderMember.setUserId(hanHaiMember.getId());//订单拥有者
             teambuyOrderMember.setOrderLeaderId("");//团餐订单编号
 
@@ -556,7 +595,7 @@ public class OrderServiceImpl implements OrderService {
                     .one();
             if(null == orderLeader){
                 TeambuyOrderLeader orderLeader1 = new TeambuyOrderLeader();
-                orderLeader1.setTitle(teamLeader.getName() +"团长的订单");
+                orderLeader1.setTitle("团长订单"+CommonUtils.getCurrentTimeFormat());
                 orderLeader1.setUserId(teamLeader.getId());
                 teambuyOrderLeaderService.save(orderLeader1);
 
@@ -643,6 +682,52 @@ public class OrderServiceImpl implements OrderService {
 
     }
 
+    //取消团员订单
+    @Override
+    public Result<?> deleteMemberOrderById(String token, String memberOrderId) {
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919589727643111426");
+        //返回信息
+        String massege = "";
+
+        try{
+            //查询订单是否存在
+            TeambuyOrderMember teambuyOrderMember = teambuyOrderMemberService
+                    .lambdaQuery()
+                    .eq(TeambuyOrderMember::getId, memberOrderId)
+                    .eq(TeambuyOrderMember::getUserId, hanHaiMember.getId())
+                    .one();
+            if(null == teambuyOrderMember){
+                return Result.error("该用户没有该订单，请检查订单编号："+memberOrderId);
+            }
+
+            //执行取消操作
+            teambuyOrderMember.setIsDel("1");
+            boolean result = teambuyOrderMemberService.updateById(teambuyOrderMember);
+
+//            //删除订单菜品关联信息
+//            List<TeambuyOrderGoods> goodsList = teambuyOrderGoodsService
+//                    .lambdaQuery()
+//                    .eq(Te)
+
+            //删除团员订单信息
+
+            //删除团长订单关联信息
+
+            //判断是否新增成功
+            if(result){
+                return Result.OK("操作成功");
+            }else {
+                return Result.error("操作失败");
+            }
+
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error("操作失败");
+        }
+    }
+
     //支付订单
     @Override
     public Result<?> payOrder(String token, String orderId, String payType) {

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

@@ -21,6 +21,7 @@ import org.jeecg.modules.teambuyOrderMember.service.ITeambuyOrderMemberService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Arrays;
 import java.util.List;
 
 @Service
@@ -125,4 +126,45 @@ public class ShopcarServiceImpl implements ShopcarService {
         }
     }
 
+    //取消购物车
+    @Override
+    public Result<?> deleteShopcar(String token, String shopcarId) {
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //返回信息
+        String massege = "";
+
+        try{
+
+            String[] shopcarIds = shopcarId.split(";");
+
+            for (String id : shopcarIds) {
+                //判断该用户购物车商品是否存在
+                TeambuyBuycar buycar = teambuyBuycarService
+                        .lambdaQuery()
+                        .eq(TeambuyBuycar::getUserId, hanHaiMember.getId())
+                        .eq(TeambuyBuycar::getId, id)
+                        .one();
+                if(null == buycar){
+                    return Result.error("该用户购物车没有该商品信息，请检查购物车id"+id);
+                }
+            }
+
+            //执行新增操作(不传id进行新增，传了id则进行修改)
+            //boolean result = teambuyBuycarService.removeById(shopcarId);
+            boolean result = teambuyBuycarService.removeByIds(Arrays.asList(shopcarIds));
+
+            //判断是否新增成功
+            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/apiUtils/CommonUtils.java

@@ -15,8 +15,18 @@ public class CommonUtils {
         return now;
     }
 
+    //获取当前时间
+    public static String getCurrentTimeFormat(){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+        Date now = new Date();
+        String formattedDate = sdf.format(now);
+//        System.out.println(now); // 输出格式化后的当前时间
+//        System.out.println(formattedDate); // 输出格式化后的当前时间
+        return formattedDate;
+    }
+
     public static void main(String[] args) {
-        System.out.println(getCurrentTime());
+        System.out.println(getCurrentTimeFormat());
     }
 
 }