修复增加：送礼功能

module-common/src/main/java/org/jeecg/api/controller/AppletIndexController.java

@@ -184,8 +184,8 @@ public class AppletIndexController {
     //创建订单
     @ApiOperation(value="创建订单", notes="创建订单")
     @GetMapping(value = "/createOrder")
-    public Result<?> createOrder(@RequestHeader("X-Access-Token") String token, String shopId, Integer num,String addressId,Integer payType,String couponId) {
-        return apiRiceService.createOrder(token,shopId,num,addressId,payType,couponId);
+    public Result<?> createOrder(@RequestHeader("X-Access-Token") String token, String shopId, Integer num,String addressId,Integer payType,String couponId,Integer isGive,Integer memberNum,Integer giveNum) {
+        return apiRiceService.createOrder(token,shopId,num,addressId,payType,couponId,isGive,memberNum,giveNum);
     }
 
 
@@ -260,4 +260,51 @@ public class AppletIndexController {
 
 
 
+    //获取祝福背景图
+    @ApiOperation(value="获取祝福背景图", notes="获取祝福背景图")
+    @GetMapping(value = "/getRiceBlessing")
+    public Result<?> getRiceBlessingList(){
+        return apiRiceService.getRiceBlessingList();
+    }
+
+
+
+    //随机获取祝福语
+    @ApiOperation(value="随机获取祝福语", notes="随机获取祝福语")
+    @GetMapping(value = "/getRiceBlessingWords")
+    public Result<?> getRiceBlessingWords(){
+        return apiRiceService.getRiceBlessingWords();
+    }
+
+
+    //根据订单标识修改订单祝福语背景
+    @ApiOperation(value="根据订单标识修改订单祝福语背景", notes="根据订单标识修改订单祝福语背景")
+    @PostMapping(value = "/updateOrderBlessing")
+    public Result<?> updateOrderBlessing(@RequestHeader("X-Access-Token") String token,String orderId,String giveTitle,String giveImage){
+        return apiRiceService.updateOrderBlessing(token,orderId,giveTitle,giveImage);
+    }
+
+
+
+
+
+    //1.收礼流程 =》点击收礼
+    @ApiOperation(value="1.收礼流程 =》点击收礼", notes="1.收礼流程 =》点击收礼")
+    @GetMapping(value = "/getGiveShop")
+    public Result<?> getGiveShop(@RequestHeader("X-Access-Token") String token,String orderId,String name,String phone,String address,String addressDetails){
+        return apiRiceService.getGiveShop(token,orderId,name,phone,address,addressDetails);
+    }
+
+
+    //2.点击抽奖 =》抽奖
+    @ApiOperation(value="2.点击抽奖 =》抽奖", notes="2.点击抽奖 =》抽奖")
+    @GetMapping(value = "/getGiveShopLottery")
+    public Result<?> getGiveShopLottery(@RequestHeader("X-Access-Token") String token,String orderId,String name,String phone,String address,String addressDetails){
+        return apiRiceService.getGiveShopLottery(token,orderId,name,phone,address,addressDetails);
+    }
+
+
+
+
+
 }

module-common/src/main/java/org/jeecg/api/service/AppletIndexService.java

@@ -42,7 +42,7 @@ public interface AppletIndexService {
 
 
     //创建订单
-    Result<?> createOrder(String token,String shopId,Integer num,String addressId,Integer payType,String couponId);
+    Result<?> createOrder(String token,String shopId,Integer num,String addressId,Integer payType,String couponId,Integer isGive,Integer memberNum,Integer giveNum);
 
 
     //再次支付
@@ -155,4 +155,32 @@ public interface AppletIndexService {
 
     Result<?> addFeedback(String token, CommonFack feedback);
 
+
+
+    //获取祝福背景图
+    Result<?> getRiceBlessingList();
+
+    //随机获取祝福语
+    Result<?> getRiceBlessingWords();
+
+
+    //根据订单标识修改订单祝福语背景
+    Result<?> updateOrderBlessing(String token,String orderId,String blessingId,String blessingWords);
+
+
+    //1.收礼流程 =》点击收礼
+    Result<?> getGiveShop(String token,String orderId,String name,String phone,String address,String addressDetails);
+
+    //2.点击抽奖 =》抽奖
+    Result<?> getGiveShopLottery(String token,String orderId,String name,String phone,String address,String addressDetails);
+
+
+
+
+
+
+
+
+
+
 }

module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java

@@ -48,8 +48,12 @@ import org.jeecg.modules.commonNotice.entity.CommonNotice;
 import org.jeecg.modules.commonNotice.service.ICommonNoticeService;
 import org.jeecg.modules.commonOrder.entity.CommonOrder;
 import org.jeecg.modules.commonOrder.service.ICommonOrderService;
+import org.jeecg.modules.commonOrderImage.entity.CommonOrderImage;
+import org.jeecg.modules.commonOrderImage.service.ICommonOrderImageService;
 import org.jeecg.modules.commonOrderSku.entity.CommonOrderSku;
 import org.jeecg.modules.commonOrderSku.service.ICommonOrderSkuService;
+import org.jeecg.modules.commonOrderTitle.entity.CommonOrderTitle;
+import org.jeecg.modules.commonOrderTitle.service.ICommonOrderTitleService;
 import org.jeecg.modules.commonPidClass.entity.CommonPidClass;
 import org.jeecg.modules.commonPidClass.service.ICommonPidClassService;
 import org.jeecg.modules.commonShop.entity.CommonShop;
@@ -60,6 +64,8 @@ import org.jeecg.modules.commonVip.entity.CommonVip;
 import org.jeecg.modules.commonVip.service.ICommonVipService;
 import org.jeecg.modules.commonVipConfig.entity.CommonVipConfig;
 import org.jeecg.modules.commonVipConfig.service.ICommonVipConfigService;
+import org.jeecg.modules.commonordergive.entity.Commonordergive;
+import org.jeecg.modules.commonordergive.service.ICommonordergiveService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.jeecg.modules.pay.MpWxPayService;
@@ -148,7 +154,12 @@ public class AppletIndexServiceImpl implements AppletIndexService {
 
     @Resource
     private ICommonPidClassService commonPidClassService;
-
+    @Autowired
+    private ICommonOrderImageService commonOrderImageService;
+    @Autowired
+    private ICommonOrderTitleService commonOrderTitleService;
+    @Autowired
+    private ICommonordergiveService commonordergiveService;
 
 
 
@@ -403,11 +414,11 @@ public class AppletIndexServiceImpl implements AppletIndexService {
                     hanHaiMember.getAppletOpenid(),
                     commonOrder.toString());
 
-            return Result.OK("支付成功",appOrder);
+            return Result.OK(newOrderId,appOrder);
         }else{
             commonOrder.setState(1);
             commonOrderService.updateById(commonOrder);
-            return Result.error("支付成功");
+            return Result.OK(newOrderId);
         }
 
 
@@ -415,7 +426,7 @@ public class AppletIndexServiceImpl implements AppletIndexService {
 
     //创建订单
     @Override
-    public Result<?> createOrder(String token,String shopId,Integer num,String addressId,Integer payType,String couponId) {
+    public Result<?> createOrder(String token,String shopId,Integer num,String addressId,Integer payType,String couponId,Integer isGive,Integer memberNum,Integer giveNum) {
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         //支付方式不能为空
         if (payType==null){
@@ -500,6 +511,9 @@ public class AppletIndexServiceImpl implements AppletIndexService {
 
         //生成订单信息
         CommonOrder commonOrder = new CommonOrder();
+        commonOrder.setIsGive(isGive);
+        commonOrder.setMemberNum(memberNum);
+        commonOrder.setGiveNum(giveNum);
 
         commonOrder.setId(orderId);
         commonOrder.setTitle(commonShop.getTitle());
@@ -549,11 +563,11 @@ public class AppletIndexServiceImpl implements AppletIndexService {
                     hanHaiMember.getAppletOpenid(),
                     commonOrder.toString());
 
-            return Result.OK("支付成功",appOrder);
+            return Result.OK(orderId,appOrder);
         }else{
             commonOrder.setState(1);
             commonOrderService.updateById(commonOrder);
-            return Result.error("支付成功");
+            return Result.OK(orderId);
         }
 
     }
@@ -1907,4 +1921,154 @@ public class AppletIndexServiceImpl implements AppletIndexService {
     }
 
 
+
+    //获取祝福背景图
+    @Override
+    public Result<?> getRiceBlessingList(){
+        List<CommonOrderImage> list = commonOrderImageService.list();
+        return Result.OK(list);
+    }
+
+    //随机获取祝福语
+    @Override
+    public Result<?> getRiceBlessingWords(){
+        Map map = new HashMap();
+        //随机得到一条祝福语
+        List<CommonOrderTitle> list = commonOrderTitleService.list();
+        if(list.size()>0){
+            CommonOrderTitle commonOrderTitle = list.get(new Random().nextInt(list.size()));
+            map.put("words",commonOrderTitle.getTitle());
+        }else{
+            map.put("words","祝你生日快乐");
+        }
+        map.put("list",list);
+        return Result.OK("反馈成功");
+    }
+
+
+    //根据订单标识修改订单祝福语背景
+    @Override
+    public Result<?> updateOrderBlessing(String token,String orderId,String giveTitle,String giveImage){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        CommonOrder byId = commonOrderService.getById(orderId);
+        //订单不能为空
+        if(byId==null){
+            return Result.error("订单不存在");
+        }
+        //不能为空
+        if(giveImage==null||giveTitle==null){
+            return Result.error("参数错误");
+        }
+        byId.setGiveImage(giveImage);
+        byId.setGiveTitle(giveTitle);
+        commonOrderService.updateById(byId);
+        return Result.OK("修改成功");
+    }
+
+
+
+
+    //1.收礼流程 =》点击收礼
+    @Override
+    public Result<?> getGiveShop(String token,String orderId,String name,String phone,String address,String addressDetails){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //查询订单是否存在
+        CommonOrder commonOrder = commonOrderService.getById(orderId);
+        if (commonOrder==null){
+            return Result.error("订单不存在");
+        }
+        //得到送礼人数
+        int memberNum = commonOrder.getMemberNum();
+        //查询礼品订单是否领取完成
+        List<Commonordergive> list = commonordergiveService.lambdaQuery().eq(Commonordergive::getOrderId, orderId).list();
+        //送礼人数大于已领取人数
+        if (memberNum>list.size()){
+            //创建送收礼记录
+            Commonordergive commonordergive = new Commonordergive();
+            commonordergive.setOrderId(orderId);
+            commonordergive.setUserId(hanHaiMember.getId());
+            commonordergive.setTitle(commonOrder.getGiveTitle());
+            commonordergive.setImage(commonOrder.getGiveImage());
+            commonordergive.setName(commonOrder.getName());
+            commonordergive.setPhone(commonOrder.getPhone());
+            commonordergive.setAddress(commonOrder.getAddress());
+            commonordergive.setAddressDetails(commonOrder.getAddressDetails());
+            commonordergive.setType(1); //收礼
+            commonordergive.setState(1); //已领取
+            commonordergive.setCreateTime(new Date());
+            commonordergiveService.save(commonordergive);
+
+
+            //创建送礼记录
+            Commonordergive commonordergive1 = new Commonordergive();
+            commonordergive1.setOrderId(orderId);
+            commonordergive1.setUserId(commonOrder.getUserId());
+            commonordergive1.setTitle(commonOrder.getTitle());
+            commonordergive.setImage(commonOrder.getGiveImage());
+            commonordergive.setName(commonOrder.getName());
+            commonordergive.setPhone(commonOrder.getPhone());
+            commonordergive.setAddress(commonOrder.getAddress());
+            commonordergive.setAddressDetails(commonOrder.getAddressDetails());
+            commonordergive.setType(0); //送礼
+            commonordergive.setState(1); //已领取
+            commonordergive.setCreateTime(new Date());
+
+            commonordergiveService.save(commonordergive1);
+            return Result.OK("领取成功");
+        }else{
+            return Result.error("已领取完成");
+        }
+    }
+
+    //2.点击抽奖 =》抽奖
+    @Override
+    public Result<?> getGiveShopLottery(String token,String orderId,String name,String phone,String address,String addressDetails){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //查询订单是否存在
+        CommonOrder commonOrder = commonOrderService.getById(orderId);
+        if (commonOrder==null){
+            return Result.error("订单不存在");
+        }
+        //得到送礼人数
+        int memberNum = commonOrder.getMemberNum();
+        //查询礼品订单是否领取完成
+        List<Commonordergive> list = commonordergiveService.lambdaQuery().eq(Commonordergive::getOrderId, orderId).list();
+        //送礼人数大于已领取人数
+        if (memberNum>list.size()){
+            //创建送收礼记录
+            Commonordergive commonordergive = new Commonordergive();
+            commonordergive.setOrderId(orderId);
+            commonordergive.setUserId(hanHaiMember.getId());
+            commonordergive.setTitle(commonOrder.getGiveTitle());
+            commonordergive.setImage(commonOrder.getGiveImage());
+            commonordergive.setName(commonOrder.getName());
+            commonordergive.setPhone(commonOrder.getPhone());
+            commonordergive.setAddress(commonOrder.getAddress());
+            commonordergive.setAddressDetails(commonOrder.getAddressDetails());
+            commonordergive.setType(1); //收礼
+            commonordergive.setState(1); //已领取
+            commonordergive.setCreateTime(new Date());
+            commonordergiveService.save(commonordergive);
+
+
+            //创建送礼记录
+            Commonordergive commonordergive1 = new Commonordergive();
+            commonordergive1.setOrderId(orderId);
+            commonordergive1.setUserId(commonOrder.getUserId());
+            commonordergive1.setTitle(commonOrder.getTitle());
+            commonordergive.setImage(commonOrder.getGiveImage());
+            commonordergive.setName(commonOrder.getName());
+            commonordergive.setPhone(commonOrder.getPhone());
+            commonordergive.setAddress(commonOrder.getAddress());
+            commonordergive.setAddressDetails(commonOrder.getAddressDetails());
+            commonordergive.setType(0); //送礼
+            commonordergive.setState(1); //已领取
+            commonordergive.setCreateTime(new Date());
+
+            commonordergiveService.save(commonordergive1);
+            return Result.OK("领取成功");
+        }else{
+            return Result.error("很遗憾，您没有领取到");
+        }
+    }
 }

module-common/src/main/java/org/jeecg/modules/commonOrder/controller/CommonOrderController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 订单信息表
  * @Author: jeecg-boot
- * @Date:   2025-01-20
+ * @Date:   2025-02-23
  * @Version: V1.0
  */
 @Api(tags="订单信息表")

module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.catalina.LifecycleState;
 import org.jeecg.modules.commonOrderSku.entity.CommonOrderSku;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
@@ -24,7 +25,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 订单信息表
  * @Author: jeecg-boot
- * @Date:   2025-01-20
+ * @Date:   2025-02-23
  * @Version: V1.0
  */
 @Data
@@ -51,6 +52,11 @@ public class CommonOrder implements Serializable {
 	/**更新日期*/
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
+	/**送礼订单*/
+	@Excel(name = "送礼订单", width = 15, dicCode = "give_state")
+	@Dict(dicCode = "give_state")
+    @ApiModelProperty(value = "送礼订单")
+    private java.lang.Integer isGive;
 	/**标题*/
 	@Excel(name = "标题", width = 15)
     @ApiModelProperty(value = "标题")
@@ -152,6 +158,22 @@ public class CommonOrder implements Serializable {
 	@Excel(name = "优惠价格", width = 15)
     @ApiModelProperty(value = "优惠价格")
     private java.math.BigDecimal couponPrice;
+    /**送礼人数*/
+    @Excel(name = "送礼人数", width = 15)
+    @ApiModelProperty(value = "送礼人数")
+    private java.lang.Integer memberNum;
+    /**送礼背景*/
+    @Excel(name = "送礼背景", width = 15)
+    @ApiModelProperty(value = "送礼背景")
+    private java.lang.String giveImage;
+    /**送礼祝福语*/
+    @Excel(name = "送礼祝福语", width = 15)
+    @ApiModelProperty(value = "送礼祝福语")
+    private java.lang.String giveTitle;
+    /**抽奖总次数*/
+    @Excel(name = "抽奖总次数", width = 15)
+    @ApiModelProperty(value = "抽奖总次数")
+    private java.lang.Integer giveNum;
 
     @TableField(exist = false)
     private List<CommonOrderSku> commonOrderSkuList;

module-common/src/main/java/org/jeecg/modules/commonOrder/mapper/CommonOrderMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 订单信息表
  * @Author: jeecg-boot
- * @Date:   2025-01-20
+ * @Date:   2025-02-23
  * @Version: V1.0
  */
 public interface CommonOrderMapper extends BaseMapper<CommonOrder> {

module-common/src/main/java/org/jeecg/modules/commonOrder/service/ICommonOrderService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 订单信息表
  * @Author: jeecg-boot
- * @Date:   2025-01-20
+ * @Date:   2025-02-23
  * @Version: V1.0
  */
 public interface ICommonOrderService extends IService<CommonOrder> {

module-common/src/main/java/org/jeecg/modules/commonOrder/service/impl/CommonOrderServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 订单信息表
  * @Author: jeecg-boot
- * @Date:   2025-01-20
+ * @Date:   2025-02-23
  * @Version: V1.0
  */
 @Service

module-common/src/main/java/org/jeecg/modules/commonOrder/vue/CommonOrderList.vue

@@ -4,6 +4,11 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="送礼订单">
+              <j-dict-select-tag placeholder="请选择送礼订单" v-model="queryParam.isGive" dictCode="give_state"/>
+            </a-form-item>
+          </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="支付状态">
               <j-dict-select-tag placeholder="请选择支付状态" v-model="queryParam.state" dictCode="order_state"/>
@@ -143,6 +148,11 @@
             sorter: true,
             dataIndex: 'createTime'
           },
+          {
+            title:'送礼订单',
+            align:"center",
+            dataIndex: 'isGive_dictText'
+          },
           {
             title:'标题',
             align:"center",
@@ -263,6 +273,7 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
+        fieldList.push({type:'int',value:'isGive',text:'送礼订单',dictCode:'give_state'})
         fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
         fieldList.push({type:'int',value:'state',text:'支付状态',dictCode:'order_state'})
         fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''})

module-common/src/main/java/org/jeecg/modules/commonOrder/vue/modules/CommonOrderForm.vue

@@ -3,6 +3,11 @@
     <j-form-container :disabled="formDisabled">
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="送礼订单" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isGive">
+              <j-dict-select-tag type="list" v-model="model.isGive" dictCode="give_state" placeholder="请选择送礼订单" />
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
               <a-input v-model="model.title" placeholder="请输入标题"  ></a-input>

module-common/src/main/java/org/jeecg/modules/commonOrder/vue3/CommonOrder.data.ts

@@ -10,6 +10,11 @@ export const columns: BasicColumn[] = [
     sorter: true,
     dataIndex: 'createTime'
    },
+   {
+    title: '送礼订单',
+    align:"center",
+    dataIndex: 'isGive_dictText'
+   },
    {
     title: '标题',
     align:"center",
@@ -99,6 +104,15 @@ export const columns: BasicColumn[] = [
 //查询数据
 export const searchFormSchema: FormSchema[] = [
 	{
+      label: "送礼订单",
+      field: "isGive",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"give_state"
+      },
+      colProps: {span: 6},
+ 	},
+	{
       label: "支付状态",
       field: "state",
       component: 'JDictSelectTag',
@@ -110,6 +124,14 @@ export const searchFormSchema: FormSchema[] = [
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
+  {
+    label: '送礼订单',
+    field: 'isGive',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"give_state"
+     },
+  },
   {
     label: '标题',
     field: 'title',

module-common/src/main/java/org/jeecg/modules/commonOrderImage/controller/CommonOrderImageController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.commonOrderImage.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.commonOrderImage.entity.CommonOrderImage;
+import org.jeecg.modules.commonOrderImage.service.ICommonOrderImageService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 送礼背景设置
+ * @Author: jeecg-boot
+ * @Date:   2025-02-23
+ * @Version: V1.0
+ */
+@Api(tags="送礼背景设置")
+@RestController
+@RequestMapping("/commonOrderImage/commonOrderImage")
+@Slf4j
+public class CommonOrderImageController extends JeecgController<CommonOrderImage, ICommonOrderImageService> {
+	@Autowired
+	private ICommonOrderImageService commonOrderImageService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param commonOrderImage
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "送礼背景设置-分页列表查询")
+	@ApiOperation(value="送礼背景设置-分页列表查询", notes="送礼背景设置-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CommonOrderImage>> queryPageList(CommonOrderImage commonOrderImage,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CommonOrderImage> queryWrapper = QueryGenerator.initQueryWrapper(commonOrderImage, req.getParameterMap());
+		Page<CommonOrderImage> page = new Page<CommonOrderImage>(pageNo, pageSize);
+		IPage<CommonOrderImage> pageList = commonOrderImageService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param commonOrderImage
+	 * @return
+	 */
+	@AutoLog(value = "送礼背景设置-添加")
+	@ApiOperation(value="送礼背景设置-添加", notes="送礼背景设置-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CommonOrderImage commonOrderImage) {
+		commonOrderImageService.save(commonOrderImage);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param commonOrderImage
+	 * @return
+	 */
+	@AutoLog(value = "送礼背景设置-编辑")
+	@ApiOperation(value="送礼背景设置-编辑", notes="送礼背景设置-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CommonOrderImage commonOrderImage) {
+		commonOrderImageService.updateById(commonOrderImage);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "送礼背景设置-通过id删除")
+	@ApiOperation(value="送礼背景设置-通过id删除", notes="送礼背景设置-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		commonOrderImageService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "送礼背景设置-批量删除")
+	@ApiOperation(value="送礼背景设置-批量删除", notes="送礼背景设置-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.commonOrderImageService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "送礼背景设置-通过id查询")
+	@ApiOperation(value="送礼背景设置-通过id查询", notes="送礼背景设置-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<CommonOrderImage> queryById(@RequestParam(name="id",required=true) String id) {
+		CommonOrderImage commonOrderImage = commonOrderImageService.getById(id);
+		if(commonOrderImage==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(commonOrderImage);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param commonOrderImage
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CommonOrderImage commonOrderImage) {
+        return super.exportXls(request, commonOrderImage, CommonOrderImage.class, "送礼背景设置");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, CommonOrderImage.class);
+    }
+
+}

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/entity/PopularizeRecruitLog.java → module-common/src/main/java/org/jeecg/modules/commonOrderImage/entity/CommonOrderImage.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.popularizeRecruitLog.entity;
+package org.jeecg.modules.commonOrderImage.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
@@ -18,17 +18,17 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @Description: 招募报名日志
+ * @Description: 送礼背景设置
  * @Author: jeecg-boot
- * @Date:   2025-01-06
+ * @Date:   2025-02-23
  * @Version: V1.0
  */
 @Data
-@TableName("popularize_recruit_log")
+@TableName("common_order_image")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="popularize_recruit_log对象", description="招募报名日志")
-public class PopularizeRecruitLog implements Serializable {
+@ApiModel(value="common_order_image对象", description="送礼背景设置")
+public class CommonOrderImage implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键*/
@@ -47,20 +47,12 @@ public class PopularizeRecruitLog implements Serializable {
 	/**更新日期*/
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
-	/**用户信息*/
-	@Excel(name = "用户信息", width = 15)
-    @ApiModelProperty(value = "用户信息")
-    private java.lang.String userId;
-	/**姓名*/
-	@Excel(name = "姓名", width = 15)
-    @ApiModelProperty(value = "姓名")
-    private java.lang.String name;
-	/**电话*/
-	@Excel(name = "电话", width = 15)
-    @ApiModelProperty(value = "电话")
-    private java.lang.String phone;
-	/**头像*/
-	@Excel(name = "头像", width = 15)
-    @ApiModelProperty(value = "头像")
-    private java.lang.String headImage;
+	/**标题*/
+	@Excel(name = "标题", width = 15)
+    @ApiModelProperty(value = "标题")
+    private java.lang.String title;
+	/**图片*/
+	@Excel(name = "图片", width = 15)
+    @ApiModelProperty(value = "图片")
+    private java.lang.String image;
 }

module-common/src/main/java/org/jeecg/modules/commonOrderImage/mapper/CommonOrderImageMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.commonOrderImage.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.commonOrderImage.entity.CommonOrderImage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 送礼背景设置
+ * @Author: jeecg-boot
+ * @Date:   2025-02-23
+ * @Version: V1.0
+ */
+public interface CommonOrderImageMapper extends BaseMapper<CommonOrderImage> {
+
+}

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/mapper/xml/PopularizeRecruitLogMapper.xml → module-common/src/main/java/org/jeecg/modules/commonOrderImage/mapper/xml/CommonOrderImageMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.popularizeRecruitLog.mapper.PopularizeRecruitLogMapper">
+<mapper namespace="org.jeecg.modules.commonOrderImage.mapper.CommonOrderImageMapper">
 
 </mapper>

module-common/src/main/java/org/jeecg/modules/commonOrderImage/service/ICommonOrderImageService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.commonOrderImage.service;
+
+import org.jeecg.modules.commonOrderImage.entity.CommonOrderImage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 送礼背景设置
+ * @Author: jeecg-boot
+ * @Date:   2025-02-23
+ * @Version: V1.0
+ */
+public interface ICommonOrderImageService extends IService<CommonOrderImage> {
+
+}

module-common/src/main/java/org/jeecg/modules/commonOrderImage/service/impl/CommonOrderImageServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.commonOrderImage.service.impl;
+
+import org.jeecg.modules.commonOrderImage.entity.CommonOrderImage;
+import org.jeecg.modules.commonOrderImage.mapper.CommonOrderImageMapper;
+import org.jeecg.modules.commonOrderImage.service.ICommonOrderImageService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 送礼背景设置
+ * @Author: jeecg-boot
+ * @Date:   2025-02-23
+ * @Version: V1.0
+ */
+@Service
+public class CommonOrderImageServiceImpl extends ServiceImpl<CommonOrderImageMapper, CommonOrderImage> implements ICommonOrderImageService {
+
+}

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/PopularizeRecruitLogList.vue → module-common/src/main/java/org/jeecg/modules/commonOrderImage/vue/CommonOrderImageList.vue

@@ -12,7 +12,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('招募报名日志')">导出</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('送礼背景设置')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
@@ -89,7 +89,7 @@
       </a-table>
     </div>
 
-    <popularize-recruit-log-modal ref="modalForm" @ok="modalFormOk"></popularize-recruit-log-modal>
+    <common-order-image-modal ref="modalForm" @ok="modalFormOk"></common-order-image-modal>
   </a-card>
 </template>
 
@@ -98,17 +98,17 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import PopularizeRecruitLogModal from './modules/PopularizeRecruitLogModal'
+  import CommonOrderImageModal from './modules/CommonOrderImageModal'
 
   export default {
-    name: 'PopularizeRecruitLogList',
+    name: 'CommonOrderImageList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      PopularizeRecruitLogModal
+      CommonOrderImageModal
     },
     data () {
       return {
-        description: '招募报名日志管理页面',
+        description: '送礼背景设置管理页面',
         // 表头
         columns: [
           {
@@ -122,24 +122,15 @@
             }
           },
           {
-            title:'用户信息',
+            title:'标题',
             align:"center",
-            dataIndex: 'userId'
+            dataIndex: 'title'
           },
           {
-            title:'姓名',
+            title:'图片',
             align:"center",
-            dataIndex: 'name'
-          },
-          {
-            title:'电话',
-            align:"center",
-            dataIndex: 'phone'
-          },
-          {
-            title:'头像',
-            align:"center",
-            dataIndex: 'headImage'
+            dataIndex: 'image',
+            scopedSlots: {customRender: 'imgSlot'}
           },
           {
             title: '操作',
@@ -151,11 +142,11 @@
           }
         ],
         url: {
-          list: "/popularizeRecruitLog/popularizeRecruitLog/list",
-          delete: "/popularizeRecruitLog/popularizeRecruitLog/delete",
-          deleteBatch: "/popularizeRecruitLog/popularizeRecruitLog/deleteBatch",
-          exportXlsUrl: "/popularizeRecruitLog/popularizeRecruitLog/exportXls",
-          importExcelUrl: "popularizeRecruitLog/popularizeRecruitLog/importExcel",
+          list: "/commonOrderImage/commonOrderImage/list",
+          delete: "/commonOrderImage/commonOrderImage/delete",
+          deleteBatch: "/commonOrderImage/commonOrderImage/deleteBatch",
+          exportXlsUrl: "/commonOrderImage/commonOrderImage/exportXls",
+          importExcelUrl: "commonOrderImage/commonOrderImage/importExcel",
           
         },
         dictOptions:{},
@@ -175,10 +166,8 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'userId',text:'用户信息',dictCode:''})
-        fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''})
-        fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
-        fieldList.push({type:'Text',value:'headImage',text:'头像',dictCode:''})
+        fieldList.push({type:'Text',value:'title',text:'标题',dictCode:''})
+        fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''})
         this.superFieldList = fieldList
       }
     }

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/modules/PopularizeRecruitLogForm.vue → module-common/src/main/java/org/jeecg/modules/commonOrderImage/vue/modules/CommonOrderImageForm.vue

@@ -4,23 +4,13 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="用户信息" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-              <a-input v-model="model.userId" placeholder="请输入用户信息"  ></a-input>
+            <a-form-model-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
+              <a-input v-model="model.title" placeholder="请输入标题"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
-              <a-input v-model="model.name" placeholder="请输入姓名"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
-              <a-input v-model="model.phone" placeholder="请输入电话"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="headImage">
-              <a-input v-model="model.headImage" placeholder="请输入头像"  ></a-input>
+            <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
+              <j-image-upload isMultiple  v-model="model.image" ></j-image-upload>
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -35,7 +25,7 @@
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
-    name: 'PopularizeRecruitLogForm',
+    name: 'CommonOrderImageForm',
     components: {
     },
     props: {
@@ -62,9 +52,9 @@
         validatorRules: {
         },
         url: {
-          add: "/popularizeRecruitLog/popularizeRecruitLog/add",
-          edit: "/popularizeRecruitLog/popularizeRecruitLog/edit",
-          queryById: "/popularizeRecruitLog/popularizeRecruitLog/queryById"
+          add: "/commonOrderImage/commonOrderImage/add",
+          edit: "/commonOrderImage/commonOrderImage/edit",
+          queryById: "/commonOrderImage/commonOrderImage/queryById"
         }
       }
     },

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/modules/PopularizeRecruitLogModal.Style#Drawer.vue → module-common/src/main/java/org/jeecg/modules/commonOrderImage/vue/modules/CommonOrderImageModal.Style#Drawer.vue

@@ -7,7 +7,7 @@
     @close="close"
     destroyOnClose
     :visible="visible">
-    <popularize-recruit-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></popularize-recruit-log-form>
+    <common-order-image-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></common-order-image-form>
     <div class="drawer-footer">
       <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
       <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
@@ -17,12 +17,12 @@
 
 <script>
 
-  import PopularizeRecruitLogForm from './PopularizeRecruitLogForm'
+  import CommonOrderImageForm from './CommonOrderImageForm'
 
   export default {
-    name: 'PopularizeRecruitLogModal',
+    name: 'CommonOrderImageModal',
     components: {
-      PopularizeRecruitLogForm
+      CommonOrderImageForm
     },
     data () {
       return {

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue/modules/PopularizeRecruitLogModal.vue → module-common/src/main/java/org/jeecg/modules/commonOrderImage/vue/modules/CommonOrderImageModal.vue

@@ -8,17 +8,17 @@
     :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel"
     cancelText="关闭">
-    <popularize-recruit-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></popularize-recruit-log-form>
+    <common-order-image-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></common-order-image-form>
   </j-modal>
 </template>
 
 <script>
 
-  import PopularizeRecruitLogForm from './PopularizeRecruitLogForm'
+  import CommonOrderImageForm from './CommonOrderImageForm'
   export default {
-    name: 'PopularizeRecruitLogModal',
+    name: 'CommonOrderImageModal',
     components: {
-      PopularizeRecruitLogForm
+      CommonOrderImageForm
     },
     data () {
       return {

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue3/PopularizeRecruitLog.api.ts → module-common/src/main/java/org/jeecg/modules/commonOrderImage/vue3/CommonOrderImage.api.ts

@@ -2,13 +2,13 @@ import {defHttp} from '/@/utils/http/axios';
 import {Modal} from 'ant-design-vue';
 
 enum Api {
-  list = '/popularizeRecruitLog/popularizeRecruitLog/list',
-  save='/popularizeRecruitLog/popularizeRecruitLog/add',
-  edit='/popularizeRecruitLog/popularizeRecruitLog/edit',
-  deleteOne = '/popularizeRecruitLog/popularizeRecruitLog/delete',
-  deleteBatch = '/popularizeRecruitLog/popularizeRecruitLog/deleteBatch',
-  importExcel = '/popularizeRecruitLog/popularizeRecruitLog/importExcel',
-  exportXls = '/popularizeRecruitLog/popularizeRecruitLog/exportXls',
+  list = '/commonOrderImage/commonOrderImage/list',
+  save='/commonOrderImage/commonOrderImage/add',
+  edit='/commonOrderImage/commonOrderImage/edit',
+  deleteOne = '/commonOrderImage/commonOrderImage/delete',
+  deleteBatch = '/commonOrderImage/commonOrderImage/deleteBatch',
+  importExcel = '/commonOrderImage/commonOrderImage/importExcel',
+  exportXls = '/commonOrderImage/commonOrderImage/exportXls',
 }
 /**
  * 导出api

module-common/src/main/java/org/jeecg/modules/commonOrderImage/vue3/CommonOrderImage.data.ts

@@ -0,0 +1,36 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '标题',
+    align:"center",
+    dataIndex: 'title'
+   },
+   {
+    title: '图片',
+    align:"center",
+    dataIndex: 'image',
+    customRender:render.renderAvatar,
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '标题',
+    field: 'title',
+    component: 'Input',
+  },
+  {
+    label: '图片',
+    field: 'image',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+];

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue3/PopularizeRecruitLogList.vue → module-common/src/main/java/org/jeecg/modules/commonOrderImage/vue3/CommonOrderImageList.vue

@@ -35,25 +35,25 @@
       </template>
     </BasicTable>
     <!-- 表单区域 -->
-    <PopularizeRecruitLogModal @register="registerModal" @success="handleSuccess"></PopularizeRecruitLogModal>
+    <CommonOrderImageModal @register="registerModal" @success="handleSuccess"></CommonOrderImageModal>
   </div>
 </template>
 
-<script lang="ts" name="popularizeRecruitLog-popularizeRecruitLog" setup>
+<script lang="ts" name="commonOrderImage-commonOrderImage" setup>
   import {ref, computed, unref} from 'vue';
   import {BasicTable, useTable, TableAction} from '/@/components/Table';
   import {useModal} from '/@/components/Modal';
   import { useListPage } from '/@/hooks/system/useListPage'
-  import PopularizeRecruitLogModal from './components/PopularizeRecruitLogModal.vue'
-  import {columns, searchFormSchema} from './popularizeRecruitLog.data';
-  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './popularizeRecruitLog.api';
+  import CommonOrderImageModal from './components/CommonOrderImageModal.vue'
+  import {columns, searchFormSchema} from './commonOrderImage.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './commonOrderImage.api';
   const checkedKeys = ref<Array<string | number>>([]);
   //注册model
   const [registerModal, {openModal}] = useModal();
   //注册table数据
   const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
       tableProps:{
-           title: '招募报名日志',
+           title: '送礼背景设置',
            api: list,
            columns,
            canResize:false,
@@ -70,7 +70,7 @@
             },
       },
        exportConfig: {
-            name:"招募报名日志",
+            name:"送礼背景设置",
             url: getExportUrl,
           },
           importConfig: {

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue3/components/PopularizeRecruitLogModal.vue → module-common/src/main/java/org/jeecg/modules/commonOrderImage/vue3/components/CommonOrderImageModal.vue

@@ -8,8 +8,8 @@
     import {ref, computed, unref} from 'vue';
     import {BasicModal, useModalInner} from '/@/components/Modal';
     import {BasicForm, useForm} from '/@/components/Form/index';
-    import {formSchema} from '../popularizeRecruitLog.data';
-    import {saveOrUpdate} from '../popularizeRecruitLog.api';
+    import {formSchema} from '../commonOrderImage.data';
+    import {saveOrUpdate} from '../commonOrderImage.api';
     // Emits声明
     const emit = defineEmits(['register','success']);
     const isUpdate = ref(true);

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/controller/PopularizeRecruitLogController.java → module-common/src/main/java/org/jeecg/modules/commonOrderTitle/controller/CommonOrderTitleController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.popularizeRecruitLog.controller;
+package org.jeecg.modules.commonOrderTitle.controller;
 
 import java.util.Arrays;
 import java.util.List;
@@ -12,8 +12,8 @@ import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.popularizeRecruitLog.entity.PopularizeRecruitLog;
-import org.jeecg.modules.popularizeRecruitLog.service.IPopularizeRecruitLogService;
+import org.jeecg.modules.commonOrderTitle.entity.CommonOrderTitle;
+import org.jeecg.modules.commonOrderTitle.service.ICommonOrderTitleService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -37,66 +37,66 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 
  /**
- * @Description: 招募报名日志
+ * @Description: 祝福语设置
  * @Author: jeecg-boot
- * @Date:   2025-01-06
+ * @Date:   2025-02-23
  * @Version: V1.0
  */
-@Api(tags="招募报名日志")
+@Api(tags="祝福语设置")
 @RestController
-@RequestMapping("/popularizeRecruitLog/popularizeRecruitLog")
+@RequestMapping("/commonOrderTitle/commonOrderTitle")
 @Slf4j
-public class PopularizeRecruitLogController extends JeecgController<PopularizeRecruitLog, IPopularizeRecruitLogService> {
+public class CommonOrderTitleController extends JeecgController<CommonOrderTitle, ICommonOrderTitleService> {
 	@Autowired
-	private IPopularizeRecruitLogService popularizeRecruitLogService;
+	private ICommonOrderTitleService commonOrderTitleService;
 	
 	/**
 	 * 分页列表查询
 	 *
-	 * @param popularizeRecruitLog
+	 * @param commonOrderTitle
 	 * @param pageNo
 	 * @param pageSize
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "招募报名日志-分页列表查询")
-	@ApiOperation(value="招募报名日志-分页列表查询", notes="招募报名日志-分页列表查询")
+	//@AutoLog(value = "祝福语设置-分页列表查询")
+	@ApiOperation(value="祝福语设置-分页列表查询", notes="祝福语设置-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<PopularizeRecruitLog>> queryPageList(PopularizeRecruitLog popularizeRecruitLog,
+	public Result<IPage<CommonOrderTitle>> queryPageList(CommonOrderTitle commonOrderTitle,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<PopularizeRecruitLog> queryWrapper = QueryGenerator.initQueryWrapper(popularizeRecruitLog, req.getParameterMap());
-		Page<PopularizeRecruitLog> page = new Page<PopularizeRecruitLog>(pageNo, pageSize);
-		IPage<PopularizeRecruitLog> pageList = popularizeRecruitLogService.page(page, queryWrapper);
+		QueryWrapper<CommonOrderTitle> queryWrapper = QueryGenerator.initQueryWrapper(commonOrderTitle, req.getParameterMap());
+		Page<CommonOrderTitle> page = new Page<CommonOrderTitle>(pageNo, pageSize);
+		IPage<CommonOrderTitle> pageList = commonOrderTitleService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
 	
 	/**
 	 *   添加
 	 *
-	 * @param popularizeRecruitLog
+	 * @param commonOrderTitle
 	 * @return
 	 */
-	@AutoLog(value = "招募报名日志-添加")
-	@ApiOperation(value="招募报名日志-添加", notes="招募报名日志-添加")
+	@AutoLog(value = "祝福语设置-添加")
+	@ApiOperation(value="祝福语设置-添加", notes="祝福语设置-添加")
 	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody PopularizeRecruitLog popularizeRecruitLog) {
-		popularizeRecruitLogService.save(popularizeRecruitLog);
+	public Result<String> add(@RequestBody CommonOrderTitle commonOrderTitle) {
+		commonOrderTitleService.save(commonOrderTitle);
 		return Result.OK("添加成功！");
 	}
 	
 	/**
 	 *  编辑
 	 *
-	 * @param popularizeRecruitLog
+	 * @param commonOrderTitle
 	 * @return
 	 */
-	@AutoLog(value = "招募报名日志-编辑")
-	@ApiOperation(value="招募报名日志-编辑", notes="招募报名日志-编辑")
+	@AutoLog(value = "祝福语设置-编辑")
+	@ApiOperation(value="祝福语设置-编辑", notes="祝福语设置-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody PopularizeRecruitLog popularizeRecruitLog) {
-		popularizeRecruitLogService.updateById(popularizeRecruitLog);
+	public Result<String> edit(@RequestBody CommonOrderTitle commonOrderTitle) {
+		commonOrderTitleService.updateById(commonOrderTitle);
 		return Result.OK("编辑成功!");
 	}
 	
@@ -106,11 +106,11 @@ public class PopularizeRecruitLogController extends JeecgController<PopularizeRe
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "招募报名日志-通过id删除")
-	@ApiOperation(value="招募报名日志-通过id删除", notes="招募报名日志-通过id删除")
+	@AutoLog(value = "祝福语设置-通过id删除")
+	@ApiOperation(value="祝福语设置-通过id删除", notes="祝福语设置-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		popularizeRecruitLogService.removeById(id);
+		commonOrderTitleService.removeById(id);
 		return Result.OK("删除成功!");
 	}
 	
@@ -120,11 +120,11 @@ public class PopularizeRecruitLogController extends JeecgController<PopularizeRe
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "招募报名日志-批量删除")
-	@ApiOperation(value="招募报名日志-批量删除", notes="招募报名日志-批量删除")
+	@AutoLog(value = "祝福语设置-批量删除")
+	@ApiOperation(value="祝福语设置-批量删除", notes="祝福语设置-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.popularizeRecruitLogService.removeByIds(Arrays.asList(ids.split(",")));
+		this.commonOrderTitleService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
 	
@@ -134,26 +134,26 @@ public class PopularizeRecruitLogController extends JeecgController<PopularizeRe
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "招募报名日志-通过id查询")
-	@ApiOperation(value="招募报名日志-通过id查询", notes="招募报名日志-通过id查询")
+	//@AutoLog(value = "祝福语设置-通过id查询")
+	@ApiOperation(value="祝福语设置-通过id查询", notes="祝福语设置-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<PopularizeRecruitLog> queryById(@RequestParam(name="id",required=true) String id) {
-		PopularizeRecruitLog popularizeRecruitLog = popularizeRecruitLogService.getById(id);
-		if(popularizeRecruitLog==null) {
+	public Result<CommonOrderTitle> queryById(@RequestParam(name="id",required=true) String id) {
+		CommonOrderTitle commonOrderTitle = commonOrderTitleService.getById(id);
+		if(commonOrderTitle==null) {
 			return Result.error("未找到对应数据");
 		}
-		return Result.OK(popularizeRecruitLog);
+		return Result.OK(commonOrderTitle);
 	}
 
     /**
     * 导出excel
     *
     * @param request
-    * @param popularizeRecruitLog
+    * @param commonOrderTitle
     */
     @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, PopularizeRecruitLog popularizeRecruitLog) {
-        return super.exportXls(request, popularizeRecruitLog, PopularizeRecruitLog.class, "招募报名日志");
+    public ModelAndView exportXls(HttpServletRequest request, CommonOrderTitle commonOrderTitle) {
+        return super.exportXls(request, commonOrderTitle, CommonOrderTitle.class, "祝福语设置");
     }
 
     /**
@@ -165,7 +165,7 @@ public class PopularizeRecruitLogController extends JeecgController<PopularizeRe
     */
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, PopularizeRecruitLog.class);
+        return super.importExcel(request, response, CommonOrderTitle.class);
     }
 
 }

module-common/src/main/java/org/jeecg/modules/commonOrderTitle/entity/CommonOrderTitle.java

@@ -0,0 +1,54 @@
+package org.jeecg.modules.commonOrderTitle.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 祝福语设置
+ * @Author: jeecg-boot
+ * @Date:   2025-02-23
+ * @Version: V1.0
+ */
+@Data
+@TableName("common_order_title")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="common_order_title对象", description="祝福语设置")
+public class CommonOrderTitle implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**祝福语*/
+	@Excel(name = "祝福语", width = 15)
+    @ApiModelProperty(value = "祝福语")
+    private java.lang.String title;
+}

module-common/src/main/java/org/jeecg/modules/commonOrderTitle/mapper/CommonOrderTitleMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.commonOrderTitle.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.commonOrderTitle.entity.CommonOrderTitle;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 祝福语设置
+ * @Author: jeecg-boot
+ * @Date:   2025-02-23
+ * @Version: V1.0
+ */
+public interface CommonOrderTitleMapper extends BaseMapper<CommonOrderTitle> {
+
+}

module-common/src/main/java/org/jeecg/modules/commonOrderTitle/mapper/xml/CommonOrderTitleMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.commonOrderTitle.mapper.CommonOrderTitleMapper">
+
+</mapper>

module-common/src/main/java/org/jeecg/modules/commonOrderTitle/service/ICommonOrderTitleService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.commonOrderTitle.service;
+
+import org.jeecg.modules.commonOrderTitle.entity.CommonOrderTitle;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 祝福语设置
+ * @Author: jeecg-boot
+ * @Date:   2025-02-23
+ * @Version: V1.0
+ */
+public interface ICommonOrderTitleService extends IService<CommonOrderTitle> {
+
+}

module-common/src/main/java/org/jeecg/modules/commonOrderTitle/service/impl/CommonOrderTitleServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.commonOrderTitle.service.impl;
+
+import org.jeecg.modules.commonOrderTitle.entity.CommonOrderTitle;
+import org.jeecg.modules.commonOrderTitle.mapper.CommonOrderTitleMapper;
+import org.jeecg.modules.commonOrderTitle.service.ICommonOrderTitleService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 祝福语设置
+ * @Author: jeecg-boot
+ * @Date:   2025-02-23
+ * @Version: V1.0
+ */
+@Service
+public class CommonOrderTitleServiceImpl extends ServiceImpl<CommonOrderTitleMapper, CommonOrderTitle> implements ICommonOrderTitleService {
+
+}

module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue/CommonOrderTitleList.vue

@@ -0,0 +1,171 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('祝福语设置')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <common-order-title-modal ref="modalForm" @ok="modalFormOk"></common-order-title-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CommonOrderTitleModal from './modules/CommonOrderTitleModal'
+
+  export default {
+    name: 'CommonOrderTitleList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CommonOrderTitleModal
+    },
+    data () {
+      return {
+        description: '祝福语设置管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'祝福语',
+            align:"center",
+            dataIndex: 'title'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/commonOrderTitle/commonOrderTitle/list",
+          delete: "/commonOrderTitle/commonOrderTitle/delete",
+          deleteBatch: "/commonOrderTitle/commonOrderTitle/deleteBatch",
+          exportXlsUrl: "/commonOrderTitle/commonOrderTitle/exportXls",
+          importExcelUrl: "commonOrderTitle/commonOrderTitle/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'Text',value:'title',text:'祝福语',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue/modules/CommonOrderTitleForm.vue

@@ -0,0 +1,104 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="祝福语" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
+              <a-input v-model="model.title" placeholder="请输入祝福语"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'CommonOrderTitleForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/commonOrderTitle/commonOrderTitle/add",
+          edit: "/commonOrderTitle/commonOrderTitle/edit",
+          queryById: "/commonOrderTitle/commonOrderTitle/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue/modules/CommonOrderTitleModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <common-order-title-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></common-order-title-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import CommonOrderTitleForm from './CommonOrderTitleForm'
+
+  export default {
+    name: 'CommonOrderTitleModal',
+    components: {
+      CommonOrderTitleForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue/modules/CommonOrderTitleModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <common-order-title-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></common-order-title-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CommonOrderTitleForm from './CommonOrderTitleForm'
+  export default {
+    name: 'CommonOrderTitleModal',
+    components: {
+      CommonOrderTitleForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue3/CommonOrderTitle.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/commonOrderTitle/commonOrderTitle/list',
+  save='/commonOrderTitle/commonOrderTitle/add',
+  edit='/commonOrderTitle/commonOrderTitle/edit',
+  deleteOne = '/commonOrderTitle/commonOrderTitle/delete',
+  deleteBatch = '/commonOrderTitle/commonOrderTitle/deleteBatch',
+  importExcel = '/commonOrderTitle/commonOrderTitle/importExcel',
+  exportXls = '/commonOrderTitle/commonOrderTitle/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue3/CommonOrderTitle.data.ts

@@ -0,0 +1,23 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '祝福语',
+    align:"center",
+    dataIndex: 'title'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '祝福语',
+    field: 'title',
+    component: 'Input',
+  },
+];

module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue3/CommonOrderTitleList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <CommonOrderTitleModal @register="registerModal" @success="handleSuccess"></CommonOrderTitleModal>
+  </div>
+</template>
+
+<script lang="ts" name="commonOrderTitle-commonOrderTitle" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import CommonOrderTitleModal from './components/CommonOrderTitleModal.vue'
+  import {columns, searchFormSchema} from './commonOrderTitle.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './commonOrderTitle.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '祝福语设置',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"祝福语设置",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

module-common/src/main/java/org/jeecg/modules/commonOrderTitle/vue3/components/CommonOrderTitleModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../commonOrderTitle.data';
+    import {saveOrUpdate} from '../commonOrderTitle.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

module-common/src/main/java/org/jeecg/modules/commonordergive/controller/CommonordergiveController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.commonordergive.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.commonordergive.entity.Commonordergive;
+import org.jeecg.modules.commonordergive.service.ICommonordergiveService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 礼品订单
+ * @Author: jeecg-boot
+ * @Date:   2025-02-23
+ * @Version: V1.0
+ */
+@Api(tags="礼品订单")
+@RestController
+@RequestMapping("/commonordergive/commonordergive")
+@Slf4j
+public class CommonordergiveController extends JeecgController<Commonordergive, ICommonordergiveService> {
+	@Autowired
+	private ICommonordergiveService commonordergiveService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param commonordergive
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "礼品订单-分页列表查询")
+	@ApiOperation(value="礼品订单-分页列表查询", notes="礼品订单-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<Commonordergive>> queryPageList(Commonordergive commonordergive,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<Commonordergive> queryWrapper = QueryGenerator.initQueryWrapper(commonordergive, req.getParameterMap());
+		Page<Commonordergive> page = new Page<Commonordergive>(pageNo, pageSize);
+		IPage<Commonordergive> pageList = commonordergiveService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param commonordergive
+	 * @return
+	 */
+	@AutoLog(value = "礼品订单-添加")
+	@ApiOperation(value="礼品订单-添加", notes="礼品订单-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody Commonordergive commonordergive) {
+		commonordergiveService.save(commonordergive);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param commonordergive
+	 * @return
+	 */
+	@AutoLog(value = "礼品订单-编辑")
+	@ApiOperation(value="礼品订单-编辑", notes="礼品订单-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody Commonordergive commonordergive) {
+		commonordergiveService.updateById(commonordergive);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "礼品订单-通过id删除")
+	@ApiOperation(value="礼品订单-通过id删除", notes="礼品订单-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		commonordergiveService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "礼品订单-批量删除")
+	@ApiOperation(value="礼品订单-批量删除", notes="礼品订单-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.commonordergiveService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "礼品订单-通过id查询")
+	@ApiOperation(value="礼品订单-通过id查询", notes="礼品订单-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<Commonordergive> queryById(@RequestParam(name="id",required=true) String id) {
+		Commonordergive commonordergive = commonordergiveService.getById(id);
+		if(commonordergive==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(commonordergive);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param commonordergive
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, Commonordergive commonordergive) {
+        return super.exportXls(request, commonordergive, Commonordergive.class, "礼品订单");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, Commonordergive.class);
+    }
+
+}

module-common/src/main/java/org/jeecg/modules/commonordergive/entity/Commonordergive.java

@@ -0,0 +1,94 @@
+package org.jeecg.modules.commonordergive.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 礼品订单
+ * @Author: jeecg-boot
+ * @Date:   2025-02-23
+ * @Version: V1.0
+ */
+@Data
+@TableName("commonordergive")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="commonordergive对象", description="礼品订单")
+public class Commonordergive implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**类型*/
+	@Excel(name = "类型", width = 15)
+    @ApiModelProperty(value = "类型")
+    private java.lang.Integer type;
+	/**礼品类型*/
+	@Excel(name = "礼品类型", width = 15)
+    @ApiModelProperty(value = "礼品类型")
+    private java.lang.Integer isGive;
+	/**礼品标题*/
+	@Excel(name = "礼品标题", width = 15)
+    @ApiModelProperty(value = "礼品标题")
+    private java.lang.String title;
+	/**礼品图片*/
+	@Excel(name = "礼品图片", width = 15)
+    @ApiModelProperty(value = "礼品图片")
+    private java.lang.String image;
+	/**关联商品*/
+	@Excel(name = "关联商品", width = 15)
+    @ApiModelProperty(value = "关联商品")
+    private java.lang.String orderId;
+	/**收货人*/
+	@Excel(name = "收货人", width = 15)
+    @ApiModelProperty(value = "收货人")
+    private java.lang.String name;
+	/**联系电话*/
+	@Excel(name = "联系电话", width = 15)
+    @ApiModelProperty(value = "联系电话")
+    private java.lang.String phone;
+	/**所在地区*/
+	@Excel(name = "所在地区", width = 15)
+    @ApiModelProperty(value = "所在地区")
+    private java.lang.String address;
+	/**详细地址*/
+	@Excel(name = "详细地址", width = 15)
+    @ApiModelProperty(value = "详细地址")
+    private java.lang.String addressDetails;
+	/**领取状态*/
+	@Excel(name = "领取状态", width = 15)
+    @ApiModelProperty(value = "领取状态")
+    private java.lang.Integer state;
+	/**领取用户*/
+	@Excel(name = "领取用户", width = 15)
+    @ApiModelProperty(value = "领取用户")
+    private java.lang.String userId;
+}

module-common/src/main/java/org/jeecg/modules/commonordergive/mapper/CommonordergiveMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.commonordergive.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.commonordergive.entity.Commonordergive;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 礼品订单
+ * @Author: jeecg-boot
+ * @Date:   2025-02-23
+ * @Version: V1.0
+ */
+public interface CommonordergiveMapper extends BaseMapper<Commonordergive> {
+
+}

module-common/src/main/java/org/jeecg/modules/commonordergive/mapper/xml/CommonordergiveMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.commonordergive.mapper.CommonordergiveMapper">
+
+</mapper>

module-common/src/main/java/org/jeecg/modules/commonordergive/service/ICommonordergiveService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.commonordergive.service;
+
+import org.jeecg.modules.commonordergive.entity.Commonordergive;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 礼品订单
+ * @Author: jeecg-boot
+ * @Date:   2025-02-23
+ * @Version: V1.0
+ */
+public interface ICommonordergiveService extends IService<Commonordergive> {
+
+}

module-common/src/main/java/org/jeecg/modules/commonordergive/service/impl/CommonordergiveServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.commonordergive.service.impl;
+
+import org.jeecg.modules.commonordergive.entity.Commonordergive;
+import org.jeecg.modules.commonordergive.mapper.CommonordergiveMapper;
+import org.jeecg.modules.commonordergive.service.ICommonordergiveService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 礼品订单
+ * @Author: jeecg-boot
+ * @Date:   2025-02-23
+ * @Version: V1.0
+ */
+@Service
+public class CommonordergiveServiceImpl extends ServiceImpl<CommonordergiveMapper, Commonordergive> implements ICommonordergiveService {
+
+}

module-common/src/main/java/org/jeecg/modules/commonordergive/vue/CommonordergiveList.vue

@@ -0,0 +1,231 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('礼品订单')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <commonordergive-modal ref="modalForm" @ok="modalFormOk"></commonordergive-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CommonordergiveModal from './modules/CommonordergiveModal'
+
+  export default {
+    name: 'CommonordergiveList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CommonordergiveModal
+    },
+    data () {
+      return {
+        description: '礼品订单管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'类型',
+            align:"center",
+            dataIndex: 'type'
+          },
+          {
+            title:'礼品类型',
+            align:"center",
+            dataIndex: 'isGive'
+          },
+          {
+            title:'礼品标题',
+            align:"center",
+            dataIndex: 'title'
+          },
+          {
+            title:'礼品图片',
+            align:"center",
+            dataIndex: 'image'
+          },
+          {
+            title:'关联商品',
+            align:"center",
+            dataIndex: 'orderId'
+          },
+          {
+            title:'收货人',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'联系电话',
+            align:"center",
+            dataIndex: 'phone'
+          },
+          {
+            title:'所在地区',
+            align:"center",
+            dataIndex: 'address'
+          },
+          {
+            title:'详细地址',
+            align:"center",
+            dataIndex: 'addressDetails'
+          },
+          {
+            title:'领取状态',
+            align:"center",
+            dataIndex: 'state'
+          },
+          {
+            title:'领取用户',
+            align:"center",
+            dataIndex: 'userId'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/commonordergive/commonordergive/list",
+          delete: "/commonordergive/commonordergive/delete",
+          deleteBatch: "/commonordergive/commonordergive/deleteBatch",
+          exportXlsUrl: "/commonordergive/commonordergive/exportXls",
+          importExcelUrl: "commonordergive/commonordergive/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'int',value:'type',text:'类型',dictCode:''})
+        fieldList.push({type:'int',value:'isGive',text:'礼品类型',dictCode:''})
+        fieldList.push({type:'string',value:'title',text:'礼品标题',dictCode:''})
+        fieldList.push({type:'Text',value:'image',text:'礼品图片',dictCode:''})
+        fieldList.push({type:'Text',value:'orderId',text:'关联商品',dictCode:''})
+        fieldList.push({type:'string',value:'name',text:'收货人',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'联系电话',dictCode:''})
+        fieldList.push({type:'string',value:'address',text:'所在地区',dictCode:''})
+        fieldList.push({type:'Text',value:'addressDetails',text:'详细地址',dictCode:''})
+        fieldList.push({type:'int',value:'state',text:'领取状态',dictCode:''})
+        fieldList.push({type:'string',value:'userId',text:'领取用户',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

module-common/src/main/java/org/jeecg/modules/commonordergive/vue/modules/CommonordergiveForm.vue

@@ -0,0 +1,154 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
+              <a-input-number v-model="model.type" placeholder="请输入类型" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="礼品类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isGive">
+              <a-input-number v-model="model.isGive" placeholder="请输入礼品类型" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="礼品标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
+              <a-input v-model="model.title" placeholder="请输入礼品标题"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="礼品图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
+              <a-input v-model="model.image" placeholder="请输入礼品图片"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关联商品" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderId">
+              <a-input v-model="model.orderId" placeholder="请输入关联商品"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="收货人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入收货人"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="联系电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
+              <a-input v-model="model.phone" placeholder="请输入联系电话"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="所在地区" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
+              <a-input v-model="model.address" placeholder="请输入所在地区"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="详细地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addressDetails">
+              <a-input v-model="model.addressDetails" placeholder="请输入详细地址"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="领取状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
+              <a-input-number v-model="model.state" placeholder="请输入领取状态" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="领取用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <a-input v-model="model.userId" placeholder="请输入领取用户"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'CommonordergiveForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/commonordergive/commonordergive/add",
+          edit: "/commonordergive/commonordergive/edit",
+          queryById: "/commonordergive/commonordergive/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

module-common/src/main/java/org/jeecg/modules/commonordergive/vue/modules/CommonordergiveModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <commonordergive-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></commonordergive-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import CommonordergiveForm from './CommonordergiveForm'
+
+  export default {
+    name: 'CommonordergiveModal',
+    components: {
+      CommonordergiveForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

module-common/src/main/java/org/jeecg/modules/commonordergive/vue/modules/CommonordergiveModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <commonordergive-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></commonordergive-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CommonordergiveForm from './CommonordergiveForm'
+  export default {
+    name: 'CommonordergiveModal',
+    components: {
+      CommonordergiveForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

module-common/src/main/java/org/jeecg/modules/commonordergive/vue3/Commonordergive.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/commonordergive/commonordergive/list',
+  save='/commonordergive/commonordergive/add',
+  edit='/commonordergive/commonordergive/edit',
+  deleteOne = '/commonordergive/commonordergive/delete',
+  deleteBatch = '/commonordergive/commonordergive/deleteBatch',
+  importExcel = '/commonordergive/commonordergive/importExcel',
+  exportXls = '/commonordergive/commonordergive/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

module-common/src/main/java/org/jeecg/modules/commonordergive/vue3/Commonordergive.data.ts

@@ -0,0 +1,123 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '类型',
+    align:"center",
+    dataIndex: 'type'
+   },
+   {
+    title: '礼品类型',
+    align:"center",
+    dataIndex: 'isGive'
+   },
+   {
+    title: '礼品标题',
+    align:"center",
+    dataIndex: 'title'
+   },
+   {
+    title: '礼品图片',
+    align:"center",
+    dataIndex: 'image'
+   },
+   {
+    title: '关联商品',
+    align:"center",
+    dataIndex: 'orderId'
+   },
+   {
+    title: '收货人',
+    align:"center",
+    dataIndex: 'name'
+   },
+   {
+    title: '联系电话',
+    align:"center",
+    dataIndex: 'phone'
+   },
+   {
+    title: '所在地区',
+    align:"center",
+    dataIndex: 'address'
+   },
+   {
+    title: '详细地址',
+    align:"center",
+    dataIndex: 'addressDetails'
+   },
+   {
+    title: '领取状态',
+    align:"center",
+    dataIndex: 'state'
+   },
+   {
+    title: '领取用户',
+    align:"center",
+    dataIndex: 'userId'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '类型',
+    field: 'type',
+    component: 'InputNumber',
+  },
+  {
+    label: '礼品类型',
+    field: 'isGive',
+    component: 'InputNumber',
+  },
+  {
+    label: '礼品标题',
+    field: 'title',
+    component: 'Input',
+  },
+  {
+    label: '礼品图片',
+    field: 'image',
+    component: 'Input',
+  },
+  {
+    label: '关联商品',
+    field: 'orderId',
+    component: 'Input',
+  },
+  {
+    label: '收货人',
+    field: 'name',
+    component: 'Input',
+  },
+  {
+    label: '联系电话',
+    field: 'phone',
+    component: 'Input',
+  },
+  {
+    label: '所在地区',
+    field: 'address',
+    component: 'Input',
+  },
+  {
+    label: '详细地址',
+    field: 'addressDetails',
+    component: 'Input',
+  },
+  {
+    label: '领取状态',
+    field: 'state',
+    component: 'InputNumber',
+  },
+  {
+    label: '领取用户',
+    field: 'userId',
+    component: 'Input',
+  },
+];

module-common/src/main/java/org/jeecg/modules/commonordergive/vue3/CommonordergiveList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <CommonordergiveModal @register="registerModal" @success="handleSuccess"></CommonordergiveModal>
+  </div>
+</template>
+
+<script lang="ts" name="commonordergive-commonordergive" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import CommonordergiveModal from './components/CommonordergiveModal.vue'
+  import {columns, searchFormSchema} from './commonordergive.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './commonordergive.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '礼品订单',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"礼品订单",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

module-common/src/main/java/org/jeecg/modules/commonordergive/vue3/components/CommonordergiveModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../commonordergive.data';
+    import {saveOrUpdate} from '../commonordergive.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/mapper/PopularizeRecruitLogMapper.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.popularizeRecruitLog.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.popularizeRecruitLog.entity.PopularizeRecruitLog;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 招募报名日志
- * @Author: jeecg-boot
- * @Date:   2025-01-06
- * @Version: V1.0
- */
-public interface PopularizeRecruitLogMapper extends BaseMapper<PopularizeRecruitLog> {
-
-}

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/service/IPopularizeRecruitLogService.java

@@ -1,14 +0,0 @@
-package org.jeecg.modules.popularizeRecruitLog.service;
-
-import org.jeecg.modules.popularizeRecruitLog.entity.PopularizeRecruitLog;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 招募报名日志
- * @Author: jeecg-boot
- * @Date:   2025-01-06
- * @Version: V1.0
- */
-public interface IPopularizeRecruitLogService extends IService<PopularizeRecruitLog> {
-
-}

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/service/impl/PopularizeRecruitLogServiceImpl.java

@@ -1,19 +0,0 @@
-package org.jeecg.modules.popularizeRecruitLog.service.impl;
-
-import org.jeecg.modules.popularizeRecruitLog.entity.PopularizeRecruitLog;
-import org.jeecg.modules.popularizeRecruitLog.mapper.PopularizeRecruitLogMapper;
-import org.jeecg.modules.popularizeRecruitLog.service.IPopularizeRecruitLogService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 招募报名日志
- * @Author: jeecg-boot
- * @Date:   2025-01-06
- * @Version: V1.0
- */
-@Service
-public class PopularizeRecruitLogServiceImpl extends ServiceImpl<PopularizeRecruitLogMapper, PopularizeRecruitLog> implements IPopularizeRecruitLogService {
-
-}

module-common/src/main/java/org/jeecg/modules/popularizeRecruitLog/vue3/PopularizeRecruitLog.data.ts

@@ -1,53 +0,0 @@
-import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import { rules} from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-//列表数据
-export const columns: BasicColumn[] = [
-    {
-    title: '用户信息',
-    align:"center",
-    dataIndex: 'userId'
-   },
-   {
-    title: '姓名',
-    align:"center",
-    dataIndex: 'name'
-   },
-   {
-    title: '电话',
-    align:"center",
-    dataIndex: 'phone'
-   },
-   {
-    title: '头像',
-    align:"center",
-    dataIndex: 'headImage'
-   },
-];
-//查询数据
-export const searchFormSchema: FormSchema[] = [
-];
-//表单数据
-export const formSchema: FormSchema[] = [
-  {
-    label: '用户信息',
-    field: 'userId',
-    component: 'Input',
-  },
-  {
-    label: '姓名',
-    field: 'name',
-    component: 'Input',
-  },
-  {
-    label: '电话',
-    field: 'phone',
-    component: 'Input',
-  },
-  {
-    label: '头像',
-    field: 'headImage',
-    component: 'Input',
-  },
-];