no message

applet-rice-api/src/main/java/org/jeecg/api/controller/ApiRiceIndexController.java

@@ -117,8 +117,8 @@ public class ApiRiceIndexController {
 
 
 
-    //加入购物车 传入token productId num
-    @ApiOperation(value="加入购物车 传入token productId num", notes="加入购物车 传入token productId num")
+    //加入购物车 传入token shopId num
+    @ApiOperation(value="加入购物车 传入token shopId num", notes="加入购物车 传入token shopId num")
     @GetMapping(value = "/addCart")
     public Result<?> addCart(@RequestHeader("X-Access-Token") String token,String shopId,Integer num){
         return apiRiceService.addCart(token,shopId,num);
@@ -128,8 +128,8 @@ public class ApiRiceIndexController {
     //删除购物车信息
     @ApiOperation(value="删除购物车信息", notes="删除购物车信息")
     @DeleteMapping(value = "/deleteCart")
-    public Result<?> deleteCart(@RequestHeader("X-Access-Token") String token,String id){
-        return apiRiceService.deleteCart(token,id);
+    public Result<?> deleteCart(@RequestHeader("X-Access-Token") String token,String ids){
+        return apiRiceService.deleteCart(token,ids);
     }
 
 
@@ -159,8 +159,8 @@ public class ApiRiceIndexController {
     //创建订单
     @ApiOperation(value="创建订单", notes="创建订单")
     @GetMapping(value = "/createOrder")
-    public Result<?> createOrder(@RequestHeader("X-Access-Token") String token, String productId, Integer num,String addressId) {
-        return apiRiceService.createOrder(token,productId,num,addressId);
+    public Result<?> createOrder(@RequestHeader("X-Access-Token") String token, String shopId, Integer num,String addressId) {
+        return apiRiceService.createOrder(token,shopId,num,addressId);
     }
 
 
@@ -199,6 +199,15 @@ public class ApiRiceIndexController {
 
 
 
+    //确认收货
+    @ApiOperation(value="确认收货", notes="确认收货")
+    @GetMapping(value = "/confirmOrder")
+    public Result<?> confirmOrder(@RequestHeader("X-Access-Token") String token,String orderId) {
+        return apiRiceService.confirmOrder(token,orderId);
+    }
+
+
+
 
 
 

applet-rice-api/src/main/java/org/jeecg/api/service/ApiRiceService.java

@@ -46,7 +46,7 @@ public interface ApiRiceService {
 
 
     //创建订单
-    Result<?> createOrder(String token,String productId,Integer num,String addressId);
+    Result<?> createOrder(String token,String shopId,Integer num,String addressId);
 
 
     //再次支付
@@ -68,7 +68,7 @@ public interface ApiRiceService {
     Result<?> addCart(String token,String shopId,Integer num);
 
     //删除购物车信息
-    Result<?> deleteCart(String token,String id);
+    Result<?> deleteCart(String token,String ids);
 
     //修改购物车信息数量
     Result<?> updateCartNum(String token,String id,Integer num);
@@ -131,4 +131,8 @@ public interface ApiRiceService {
     //提现
     Result<?> withdraw(String token,BigDecimal money);
 
+
+    //确认收货
+    Result<?> confirmOrder(String token,String orderId);
+
 }

applet-rice-api/src/main/java/org/jeecg/api/service/impl/ApiRiceServiceImpl.java

@@ -46,6 +46,8 @@ import org.jeecg.modules.commonOrderSku.entity.CommonOrderSku;
 import org.jeecg.modules.commonOrderSku.service.ICommonOrderSkuService;
 import org.jeecg.modules.commonShop.entity.CommonShop;
 import org.jeecg.modules.commonShop.service.ICommonShopService;
+import org.jeecg.modules.commonVipConfig.entity.CommonVipConfig;
+import org.jeecg.modules.commonVipConfig.service.ICommonVipConfigService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.jeecg.modules.pay.MpWxPayService;
@@ -110,6 +112,8 @@ public class ApiRiceServiceImpl implements ApiRiceService {
     private IHanHaiMemberService hanHaiMemberService;
     @Resource
     private IRiceNewsService riceNewsService;
+    @Resource
+    private ICommonVipConfigService commonVipConfigService;
     //权限配置
     @Resource
     private ShiroRealm shiroRealm;
@@ -163,7 +167,9 @@ public class ApiRiceServiceImpl implements ApiRiceService {
     public Result<?> getRiceCommonProductList(){
         List<CommonShop> list = commonShopService
                 .lambdaQuery()
-                .eq(CommonShop::getType,1)
+                .eq(CommonShop::getType,2)
+                .eq(CommonShop::getIndexNo,"Y")
+                .orderByDesc(CommonShop::getCreateTime)
                 .list();
         return Result.OK(list);
     }
@@ -242,7 +248,7 @@ public class ApiRiceServiceImpl implements ApiRiceService {
             return Result.error("非首页订单");
         }
 
-//根据配置列表查询每人限制数量
+        //根据配置列表查询每人限制数量
         CommonConfig commonConfig = commonConfigService.lambdaQuery()
                 .eq(CommonConfig::getKeyName,"pay_num")
                 .one();
@@ -258,7 +264,10 @@ public class ApiRiceServiceImpl implements ApiRiceService {
                     .eq(CommonOrder::getState,1)
                     .list();
             if (byUserIdAndShopId.size()+1>payNum){
-                return Result.error("已超过体验商品购买次数限制！请勿重复购买");
+                Result result = new Result();
+                result.setMessage("已超过体验商品购买次数限制！请勿重复购买");
+                result.setCode(901);
+                return result;
             }
 
             //查询用户是否存在该订单
@@ -269,7 +278,10 @@ public class ApiRiceServiceImpl implements ApiRiceService {
                     .eq(CommonOrder::getState,0)
                     .list();
             if (payNumList.size()>1){
-                return Result.error("您有相同订单未付款！请先付款");
+                Result result = new Result();
+                result.setMessage("您有相同订单未付款！请先付款");
+                result.setCode(901);
+                return result;
             }
         }
 
@@ -281,7 +293,7 @@ public class ApiRiceServiceImpl implements ApiRiceService {
         //老的订单数据复制给新创建的订单对象
         CommonOrder commonOrder1 = new CommonOrder();
         commonOrder1.setId(newOrderId);
-        commonOrder1.setShopState(commonOrder.getShopState());
+        commonOrder1.setShopState(0);
         commonOrder1.setUserId(hanHaiMember.getId());
         commonOrder1.setTitle(commonOrder.getTitle());
         commonOrder1.setImage(commonOrder.getImage());
@@ -292,6 +304,7 @@ public class ApiRiceServiceImpl implements ApiRiceService {
         commonOrder1.setAddressId(commonOrder.getAddressId());
         commonOrder1.setAddressDetails(commonOrder.getAddressDetails());
         commonOrder1.setAddress(commonOrder.getAddress());
+        commonOrder1.setState(0);
         commonOrder1.setName(commonOrder.getName());
         commonOrder1.setPhone(commonOrder.getPhone());
         commonOrder1.setSku(commonOrder.getSku());
@@ -346,10 +359,10 @@ public class ApiRiceServiceImpl implements ApiRiceService {
 
     //创建订单
     @Override
-    public Result<?> createOrder(String token,String productId,Integer num,String addressId) {
+    public Result<?> createOrder(String token,String shopId,Integer num,String addressId) {
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         //商品标识不能为空
-        if (productId==null){
+        if (shopId==null){
             return Result.error("商品标识不能为空");
         }
         //数量不能为空
@@ -357,7 +370,7 @@ public class ApiRiceServiceImpl implements ApiRiceService {
             return Result.error("数量不能为空");
         }
         //查询商品信息
-        CommonShop commonShop = commonShopService.getById(productId);
+        CommonShop commonShop = commonShopService.getById(shopId);
         //商品不能为空
         if (commonShop==null){
             return Result.error("商品不存在");
@@ -384,23 +397,29 @@ public class ApiRiceServiceImpl implements ApiRiceService {
             //查询用户是否存在该订单
             List<CommonOrder> byUserIdAndShopId = commonOrderService.lambdaQuery()
                     .eq(CommonOrder::getUserId,hanHaiMember.getId())
-                    .eq(CommonOrder::getShopId,productId)
+                    .eq(CommonOrder::getShopId,shopId)
                     .eq(CommonOrder::getShopState,0)
                     .eq(CommonOrder::getState,1)
                     .list();
             if (byUserIdAndShopId.size()+1>payNum){
-                return Result.error("已超过体验商品购买次数限制！请勿重复购买");
+                Result result = new Result();
+                result.setMessage("已超过体验商品购买次数限制！请勿重复购买");
+                result.setCode(901);
+                return result;
             }
 
             //查询用户是否存在该订单
             List<CommonOrder> payNumList = commonOrderService.lambdaQuery()
                     .eq(CommonOrder::getUserId,hanHaiMember.getId())
-                    .eq(CommonOrder::getShopId,productId)
+                    .eq(CommonOrder::getShopId,shopId)
                     .eq(CommonOrder::getShopState,0)
                     .eq(CommonOrder::getState,0)
                     .list();
             if (payNumList.size()>0){
-                return Result.error("您有相同订单未付款！请先付款");
+                Result result = new Result();
+                result.setMessage("已超过体验商品购买次数限制！请勿重复购买");
+                result.setCode(901);
+                return result;
             }
         }
 
@@ -534,6 +553,7 @@ public class ApiRiceServiceImpl implements ApiRiceService {
             cityOrder.setAddressDetails(commonAddress.getAddressDetails());
             cityOrder.setAddressId(addressId);
             cityOrder.setName("店铺订单");
+            cityOrder.setTitle("组合订单");
             cityOrder.setPrice(totalPrice);
             cityOrder.setShopState(2);
 
@@ -547,7 +567,7 @@ public class ApiRiceServiceImpl implements ApiRiceService {
             String s = totalPrice.multiply(new BigDecimal(100)).toString();
             int i1 = Double.valueOf(s).intValue();
             Object appOrder = mpWxPayService.createOrder(
-                    "购买"+ "店铺订单" ,
+                    "购买"+ "组合订单" ,
                     "127.0.0.1",
                     orderId,
                     i1,
@@ -613,6 +633,7 @@ public class ApiRiceServiceImpl implements ApiRiceService {
         cityOrder.setAddressDetails(oldOrder.getAddressDetails());
         cityOrder.setAddressId(addressId);
         cityOrder.setName("店铺订单");
+        cityOrder.setTitle("组合订单");
 
         cityOrder.setPrice(oldOrder.getPrice());
 
@@ -630,7 +651,7 @@ public class ApiRiceServiceImpl implements ApiRiceService {
         String s = oldOrder.getPrice().multiply(new BigDecimal(100)).toString();
         int i1 = Double.valueOf(s).intValue();
         Object appOrder = mpWxPayService.createOrder(
-                "购买"+ "店铺订单" ,
+                "购买"+ "组合订单" ,
                 "127.0.0.1",
                 orderId,
                 i1,
@@ -654,23 +675,57 @@ public class ApiRiceServiceImpl implements ApiRiceService {
         //如果订单存在则修改订单状态
         if (commonOrder!=null){
             if(commonOrder.getState()==0){
+                //修改订单状态
+                if(commonOrder.getShopState()==0){
+                    commonOrder.setState(1);
+                    commonOrderService.updateById(commonOrder);
+                }
+
+                if(commonOrder.getShopState()==1){
+                    commonOrder.setState(1);
+                    commonOrderService.updateById(commonOrder);
+                }
+                //查询购买订单的用户信息
+                HanHaiMember hanHaiMember = hanHaiMemberService.getById(commonOrder.getUserId());
+                boolean flag = false;
+                //如果这个订单是普通订单
+                if (commonOrder.getShopState()==2){
+                    //获得这个订单的总价
+                    BigDecimal price = commonOrder.getPrice();
+
+
+                    //根据配置查询比例
+                    CommonConfig config = commonConfigService.lambdaQuery()
+                            .eq(CommonConfig::getKeyName,"vip_money")
+                            .one();
+
+                    //如果总价超过1000元则修改用户为会员
+                    if (price.compareTo(new BigDecimal(config.getKeyContent())) > -1){
+
+                        //查看这个用户是否有邀请者，如果有则进入返点
+                        //邀请者不能是会员
+                        if (hanHaiMember.getIsPay()==0){
+                            if (StringUtils.isNotBlank(hanHaiMember.getShareId())){
+                                //查询邀请者信息 //修改订单状态在方法内
+                                flag = this.getMoneyToUser(commonOrder.getId(), flag);
+                            }
+                        }
+
+                        //设置成为会员
+                        hanHaiMember.setIsPay(1);
+                    }
+                    //推荐奖励
+                    this.toUserPrice(commonOrder.getId(),flag);
+                }
+
+
                 commonOrder.setState(1);
                 commonOrderService.updateById(commonOrder);
-            }
 
 
-            //如果这个订单是普通订单
-            if (commonOrder.getShopState()==2){
-                //获得这个订单的总价
-                BigDecimal price = commonOrder.getPrice();
-                //如果总价超过1000元则修改用户为会员
-                if (price.compareTo(new BigDecimal(0.01))==1){
-                    //查询购买订单的用户信息
-                    HanHaiMember hanHaiMember = hanHaiMemberService.getById(commonOrder.getUserId());
-                    hanHaiMember.setIsPay(1);
-                    hanHaiMemberService.updateById(hanHaiMember);
-                }
+                hanHaiMemberService.updateById(hanHaiMember);
             }
+
         }
 
         return null;
@@ -685,24 +740,46 @@ public class ApiRiceServiceImpl implements ApiRiceService {
         if (commonShop==null){
             return Result.error("商品不存在");
         }
-        CommonCat commonCat = new CommonCat();
-        commonCat.setTitle(commonShop.getTitle());
-        commonCat.setShopId(commonShop.getId());
-        commonCat.setImage(commonShop.getImage());
-        commonCat.setSku(commonShop.getSku());
-        commonCat.setPrice(commonShop.getPrice());
-        commonCat.setUserId(hanHaiMember.getId());
-        commonCat.setNum(num);
-        commonCat.setCreateTime(new Date());
-        commonCatService.save(commonCat);
-        return Result.OK("加入成功");
+        //根据商品标识查询购物车是否存在该商品
+        CommonCat commonCart = commonCatService.lambdaQuery()
+                .eq(CommonCat::getUserId,hanHaiMember.getId())
+                .eq(CommonCat::getShopId,shopId)
+                .one();
+        //如果有则修改数量
+        if (commonCart!=null){
+            commonCart.setNum(commonCart.getNum()+num);
+            commonCatService.updateById(commonCart);
+            return Result.OK("修改成功");
+        }else{
+            CommonCat commonCat = new CommonCat();
+            commonCat.setTitle(commonShop.getTitle());
+            commonCat.setShopId(commonShop.getId());
+            commonCat.setImage(commonShop.getImage());
+            commonCat.setSku(commonShop.getSku());
+            commonCat.setPrice(commonShop.getPrice());
+            commonCat.setUserId(hanHaiMember.getId());
+            commonCat.setNum(num);
+            commonCat.setCreateTime(new Date());
+            commonCatService.save(commonCat);
+            return Result.OK("加入成功");
+        }
     }
 
     //删除购物车信息
     @Override
-    public Result<?> deleteCart(String token,String id){
+    public Result<?> deleteCart(String token,String ids){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        commonCatService.removeById(id);
+        //删除多个购物车数据
+        String[] split = ids.split(",");
+        //如果没有,则直接删除
+        if (split.length==1){
+            commonCatService.removeById(split[0]);
+            return Result.OK("删除成功");
+        }
+        //如果有则循环删除
+        for (String id : split) {
+            commonCatService.removeById(id);
+        }
         return Result.OK("删除成功");
     }
 
@@ -1110,15 +1187,16 @@ public class ApiRiceServiceImpl implements ApiRiceService {
     //查询个人信息相关
     @Override
     public Result<?> getRiceInfo(String token){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         Map map = new HashMap();
         //余额、可提现、收益明细
-        map.put("balance",10);
-        map.put("canWithdraw",20);
-        map.put("income",30);
+        map.put("balance",hanHaiMember.getPrice());
+        map.put("canWithdraw",hanHaiMember.getMoney());
+        map.put("income",0);
         //黄金会员
         map.put("goldenMember",0);
         //当前会员人数
-        map.put("memberNum",10);
+        map.put("memberNum",hanHaiMemberService.lambdaQuery().eq(HanHaiMember::getIsPay,1).list().size());
         return Result.OK(map);
     }
 
@@ -1141,9 +1219,300 @@ public class ApiRiceServiceImpl implements ApiRiceService {
     public Result<?> withdraw(String token,BigDecimal money){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         //查询当前用户余额
-        CommonMoney commonMoney = commonMoneyService.lambdaQuery()
-                .eq(CommonMoney::getUserId,hanHaiMember.getId())
+        BigDecimal userPrice = hanHaiMember.getMoney();
+        //提现金额不能大于用户额度
+        if (userPrice.compareTo(money) == -1){
+            //余额不足
+            return Result.error("余额不足");
+        }
+        //创建支付流水
+        CommonMoneyLog commonMoneyLog = new CommonMoneyLog();
+        commonMoneyLog.setTitle("用户提现");
+        commonMoneyLog.setMoney(money);
+        commonMoneyLog.setOldMoney(userPrice);
+        commonMoneyLog.setType(1);
+        commonMoneyLog.setState(0);
+        commonMoneyLog.setUserId(hanHaiMember.getId());
+        commonMoneyLogService.save(commonMoneyLog);
+
+        hanHaiMember.setMoney(userPrice.subtract(money));
+        hanHaiMemberService.updateById(hanHaiMember);
+        return Result.OK("提现申请成功,等待审核!");
+    }
+
+
+
+
+
+
+
+    //这里执行的方法是：会员推荐用户购买会员
+    //会员推荐朋友购买会员第一个返10%、第二个返20%、第三个返30%、第四个返40%，四四循环
+    public boolean getMoneyToUser(String orderId,boolean flag){
+        //根据订单标识查询订单信息
+        CommonOrder commonOrder = commonOrderService.getById(orderId);
+        if (commonOrder==null){
+            log.info("订单不存在：ID:"+orderId);
+            return flag;
+        }
+        //查询是否有推荐购买会员
+        HanHaiMember member = hanHaiMemberService.lambdaQuery()
+                .eq(HanHaiMember::getId,commonOrder.getUserId())
                 .one();
-       return Result.OK("提现成功");
+        String orderShareId = member.getShareId();
+        if (orderShareId==null || "".equals(orderShareId)){
+            log.info("订单没有推荐用户：ID:"+orderId);
+            return flag;
+        }
+
+
+        //根据推荐者标识查询推荐者用户信息
+        HanHaiMember shareMember = hanHaiMemberService.getById(orderShareId);
+        if (shareMember==null){
+            log.info("推荐用户不存在：ID:"+orderShareId);
+            return flag;
+        }
+        //推荐用户不是会员也不是渠道
+        if (shareMember.getIsPay()==0){
+            log.info("推荐用户不是会员也不是渠道：ID:"+orderShareId);
+            return flag;
+        }
+        //根据订单推荐者标识查询该推荐这推荐了几个订单
+        List<CommonOrder> list = commonOrderService.lambdaQuery()
+                .eq(CommonOrder::getShareId,orderShareId)
+                .orderByDesc(CommonOrder::getCreateTime)
+                //订单状态1：未付款、2：已付款、3：已发货、4：已收货、5：已完成、 大于0
+                .gt(CommonOrder::getState,0)
+                .list();
+        log.info("订单条数："+list.size());
+        //如果为空则跳出
+        Integer shareNum = 1;
+        if (list==null || list.size()==0){
+            shareNum = 1;
+        }else{
+            //查询有多少个返点配置
+            int confSize = commonVipConfigService.list().size();
+            if(list.size()+1>confSize){
+                //最新的一个订单是第几次循环
+                log.info("原订单："+list.get(0).getShareNum());
+                shareNum = list.get(0).getShareNum() + 1;
+                log.info("现在："+shareNum);
+                //根据配置查询vip配置比例
+                CommonVipConfig commonVipConfig = commonVipConfigService.lambdaQuery()
+                        .eq(CommonVipConfig::getSort,shareNum)
+                        .one();
+                //如果查出来没有数据
+                if (commonVipConfig==null){
+                    shareNum = 1;
+                }
+
+            }else{
+                shareNum = list.size()+1;
+                log.info("推荐用户购买会员第几次list.size()+1==："+shareNum);
+            }
+            log.info("推荐用户购买会员第几次："+shareNum);
+        }
+        //根据配置查询vip配置比例
+        CommonVipConfig commonVipConfig = commonVipConfigService.lambdaQuery()
+                .eq(CommonVipConfig::getSort,shareNum)
+                .one();
+        if (commonVipConfig==null){
+            log.info("没有配置该比例：shareNum:"+shareNum);
+            return flag;
+        }
+        //得到比例
+        BigDecimal price = commonVipConfig.getPrice();
+        //返点金额公式：返点金额 = 当前订单金额乘得到比例
+        BigDecimal money = commonOrder.getPrice().multiply(price);
+
+        //判断用户是否是会员
+        //增加推荐者流水
+        CommonMoneyLog moneyLog = new CommonMoneyLog();
+        if(shareMember.getIsPay() == 1){
+            if (member.getIsPay()==0){
+                moneyLog.setTitle("【会员】直推【普通】第"+shareNum+"次的推荐奖");
+                moneyLog.setMoney(money);
+                moneyLog.setOldMoney(shareMember.getPrice());
+                moneyLog.setType(0); //0收入 1支出
+                moneyLog.setState(0);
+                moneyLog.setUserId(orderShareId);
+                commonMoneyLogService.save(moneyLog);
+
+                flag = true;
+            }
+        }
+        if(shareMember.getIsPay() == 2){
+
+            //根据配置查询比例
+            CommonConfig config = commonConfigService.lambdaQuery()
+                    .eq(CommonConfig::getKeyName,"qu_price")
+                    .one();
+
+            if (member.getIsPay()==0){
+                money = new BigDecimal(config.getKeyContent());
+                moneyLog.setTitle("渠道推荐用户购买会员");
+                moneyLog.setMoney(money);
+                moneyLog.setOldMoney(shareMember.getPrice());
+                moneyLog.setType(0); //0收入 1支出
+                moneyLog.setState(0);
+                moneyLog.setUserId(orderShareId);
+                commonMoneyLogService.save(moneyLog);
+            }
+        }
+        //修改推荐者的钱
+        shareMember.setPrice(shareMember.getPrice().add(money));
+        hanHaiMemberService.updateById(shareMember);
+
+        //修改订单的推荐次数
+        commonOrder.setState(1);
+        commonOrder.setShareId(shareMember.getId());
+        commonOrder.setShareNum(shareNum);
+        commonOrderService.updateById(commonOrder);
+
+        return flag;
     }
+
+
+
+//    1：用户推荐奖
+//    凡购买1盒即5斤享有推荐资格
+//    直推奖励：所推荐朋友购买产品或者购买会员返10%佣金，及今后产生复购产品的均有10%佣金（体验价不计算在内）
+    public boolean toUserPrice(String orderId,boolean flag){
+        CommonOrder commonOrder = commonOrderService.getById(orderId);
+        if (commonOrder==null){
+            log.info("订单不存在：ID:"+orderId);
+            return flag;
+        }
+        //根据订单查询用户信息
+        HanHaiMember hanHaiMember = hanHaiMemberService.lambdaQuery()
+                .eq(HanHaiMember::getId,commonOrder.getUserId())
+                .one();
+        if (hanHaiMember==null){
+            log.info("用户不存在：ID:"+commonOrder.getUserId());
+            return flag;
+        }
+        //查询推荐人
+        HanHaiMember shareMember = hanHaiMemberService.lambdaQuery()
+                .eq(HanHaiMember::getId,hanHaiMember.getShareId())
+                .one();
+        if (shareMember==null){
+            log.info("推荐用户不存在：ID:"+hanHaiMember.getShareId());
+            return flag;
+        }
+        //查询推荐人是否购买了并且支付了订单
+        List<CommonOrder> list = commonOrderService.lambdaQuery()
+                .eq(CommonOrder::getUserId,shareMember.getId())
+                .gt(CommonOrder::getState,0)
+                .list();
+        if (list==null || list.size()==0){
+            log.info("推荐用户没有购买的订单无法进行返点：ID:"+shareMember.getId());
+            return flag;
+        }
+
+        //增加流水
+        CommonMoneyLog moneyLog = new CommonMoneyLog();
+
+        //查看用户是否是会员
+        if (shareMember.getIsPay()==0){
+            if(hanHaiMember.getIsPay()==0) {
+                moneyLog.setTitle("【用户】直推【用户】购买产品奖励");
+            }else{
+                moneyLog.setTitle("【用户】直推【会员】购买产品奖励");
+            }
+            //根据配置查询比例
+            CommonConfig config = commonConfigService.lambdaQuery()
+                    .eq(CommonConfig::getKeyName,"user_price_money")
+                    .one();
+
+            moneyLog.setMoney(commonOrder.getPrice().multiply(new BigDecimal(config.getKeyContent())));
+            moneyLog.setOldMoney(shareMember.getPrice());
+            moneyLog.setType(0);
+            moneyLog.setState(0);
+            moneyLog.setUserId(shareMember.getId());
+
+            //修改推荐者的钱
+            shareMember.setPrice(shareMember.getPrice().add(commonOrder.getPrice().multiply(new BigDecimal(config.getKeyContent()))));
+            commonMoneyLogService.save(moneyLog);
+        }else if (shareMember.getIsPay()==1){
+
+
+            //根据配置查询比例
+            CommonConfig config = commonConfigService.lambdaQuery()
+                    .eq(CommonConfig::getKeyName,"vip_price_money")
+                    .one();
+
+            if(hanHaiMember.getIsPay()==1){
+                moneyLog.setTitle("【会员】直推【会员】产品购买奖励");
+                moneyLog.setMoney(commonOrder.getPrice().multiply(new BigDecimal(config.getKeyContent())));
+                moneyLog.setOldMoney(shareMember.getPrice());
+                moneyLog.setType(0);
+                moneyLog.setState(0);
+                moneyLog.setUserId(shareMember.getId());
+
+                shareMember.getPrice().add(commonOrder.getPrice().multiply(new BigDecimal(config.getKeyContent())));
+                commonMoneyLogService.save(moneyLog);
+
+            }else{
+                if(flag == false){
+                    moneyLog.setTitle("【会员】直推【用户】产品购买奖励");
+                    moneyLog.setMoney(commonOrder.getPrice().multiply(new BigDecimal(config.getKeyContent())));
+                    moneyLog.setOldMoney(shareMember.getPrice());
+                    moneyLog.setType(0);
+                    moneyLog.setState(0);
+                    moneyLog.setUserId(shareMember.getId());
+
+                    shareMember.getPrice().add(commonOrder.getPrice().multiply(new BigDecimal(config.getKeyContent())));
+                    commonMoneyLogService.save(moneyLog);
+                }
+
+            }
+
+
+
+
+        }else{
+
+            //根据配置查询比例
+            CommonConfig config = commonConfigService.lambdaQuery()
+                    .eq(CommonConfig::getKeyName,"qu_price_money")
+                    .one();
+
+            if(hanHaiMember.getIsPay()==0) {
+                moneyLog.setTitle("【渠道】直推【用户】购买产品奖励");
+            }else{
+                moneyLog.setTitle("【渠道】直推【会员】购买产品奖励");
+            }
+            moneyLog.setMoney(commonOrder.getPrice().multiply(new BigDecimal(config.getKeyContent())));
+            moneyLog.setOldMoney(shareMember.getPrice());
+            moneyLog.setType(0);
+            moneyLog.setState(0);
+            moneyLog.setUserId(shareMember.getId());
+
+            //修改推荐者的钱
+            shareMember.setPrice(shareMember.getPrice().add(commonOrder.getPrice().multiply(new BigDecimal(config.getKeyContent()))));
+            commonMoneyLogService.save(moneyLog);
+        }
+
+
+        hanHaiMemberService.updateById(shareMember);
+
+        return flag;
+    }
+
+
+
+    //确认收货
+    @Override
+    public Result<?> confirmOrder(String token,String orderId){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
+        return Result.OK("确认收货");
+
+    }
+
+
+
+
+
+
 }

module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 用户账户表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-12
  * @Version: V1.0
  */
 @Api(tags="用户账户表")

module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 用户账户表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-12
  * @Version: V1.0
  */
 @Data
@@ -166,9 +166,10 @@ public class HanHaiMember implements Serializable {
 	@Excel(name = "邀请时间", width = 15)
     @ApiModelProperty(value = "邀请时间")
     private java.util.Date vtime;
-	/**会员*/
-	@Excel(name = "会员", width = 15)
-    @ApiModelProperty(value = "会员")
+	/**用户角色*/
+	@Excel(name = "用户角色", width = 15, dicCode = "member_role")
+	@Dict(dicCode = "member_role")
+    @ApiModelProperty(value = "用户角色")
     private java.lang.Integer isPay;
 	/**是否关注公众号*/
 	@Excel(name = "是否关注公众号", width = 15)
@@ -206,4 +207,8 @@ public class HanHaiMember implements Serializable {
 	@Excel(name = "地址", width = 15)
     @ApiModelProperty(value = "地址")
     private java.lang.String address;
+	/**可提现金额*/
+	@Excel(name = "可提现金额", width = 15)
+    @ApiModelProperty(value = "可提现金额")
+    private java.math.BigDecimal money;
 }

module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 用户账户表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-12
  * @Version: V1.0
  */
 public interface HanHaiMemberMapper extends BaseMapper<HanHaiMember> {

module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 用户账户表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-12
  * @Version: V1.0
  */
 public interface IHanHaiMemberService extends IService<HanHaiMember> {

module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 用户账户表
  * @Author: jeecg-boot
- * @Date:   2024-11-24
+ * @Date:   2024-12-12
  * @Version: V1.0
  */
 @Service

module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue

@@ -10,24 +10,14 @@
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="真实姓名">
-              <a-input placeholder="请输入真实姓名" v-model="queryParam.name"></a-input>
+            <a-form-item label="邀请人">
+              <j-search-select-tag placeholder="请选择邀请人" v-model="queryParam.shareId" dict="han_hai_member,nick_name,id"/>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="手机号码">
-                <a-input placeholder="请输入手机号码" v-model="queryParam.phone"></a-input>
-              </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.role" dictCode="member_role"/>
-              </a-form-item>
-            </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
-              <a-form-item label="邀请人">
-                <j-search-select-tag placeholder="请选择邀请人" v-model="queryParam.shareId" dict="han_hai_member,nick_name,id"/>
+              <a-form-item label="用户角色">
+                <j-dict-select-tag placeholder="请选择用户角色" v-model="queryParam.isPay" dictCode="member_role"/>
               </a-form-item>
             </a-col>
           </template>
@@ -175,6 +165,26 @@
             dataIndex: 'headImage',
             scopedSlots: {customRender: 'imgSlot'}
           },
+          {
+            title:'邀请人',
+            align:"center",
+            dataIndex: 'shareId_dictText'
+          },
+          {
+            title:'用户角色',
+            align:"center",
+            dataIndex: 'isPay_dictText'
+          },
+          {
+            title:'余额',
+            align:"center",
+            dataIndex: 'price'
+          },
+          {
+            title:'可提现金额',
+            align:"center",
+            dataIndex: 'money'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -212,10 +222,10 @@
         fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
         fieldList.push({type:'string',value:'nickName',text:'昵称',dictCode:''})
         fieldList.push({type:'string',value:'headImage',text:'用户头像',dictCode:''})
-        fieldList.push({type:'string',value:'name',text:'真实姓名',dictCode:''})
-        fieldList.push({type:'string',value:'phone',text:'手机号码',dictCode:''})
-        fieldList.push({type:'int',value:'role',text:'角色',dictCode:'member_role'})
         fieldList.push({type:'sel_search',value:'shareId',text:'邀请人',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
+        fieldList.push({type:'int',value:'isPay',text:'用户角色',dictCode:'member_role'})
+        fieldList.push({type:'BigDecimal',value:'price',text:'余额',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'money',text:'可提现金额',dictCode:''})
         this.superFieldList = fieldList
       }
     }

module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue

@@ -13,6 +13,26 @@
               <j-image-upload isMultiple  v-model="model.headImage" ></j-image-upload>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="邀请人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shareId">
+              <j-search-select-tag v-model="model.shareId" dict="han_hai_member,nick_name,id"  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用户角色" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isPay">
+              <j-dict-select-tag type="list" v-model="model.isPay" dictCode="member_role" placeholder="请选择用户角色" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="余额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
+              <a-input-number v-model="model.price" placeholder="请输入余额" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="可提现金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="money">
+              <a-input-number v-model="model.money" placeholder="请输入可提现金额" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts

@@ -20,6 +20,26 @@ export const columns: BasicColumn[] = [
     dataIndex: 'headImage',
     customRender:render.renderAvatar,
    },
+   {
+    title: '邀请人',
+    align:"center",
+    dataIndex: 'shareId_dictText'
+   },
+   {
+    title: '用户角色',
+    align:"center",
+    dataIndex: 'isPay_dictText'
+   },
+   {
+    title: '余额',
+    align:"center",
+    dataIndex: 'price'
+   },
+   {
+    title: '可提现金额',
+    align:"center",
+    dataIndex: 'money'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -30,32 +50,20 @@ export const searchFormSchema: FormSchema[] = [
       colProps: {span: 6},
  	},
 	{
-      label: "真实姓名",
-      field: "name",
-      component: 'Input',
-      colProps: {span: 6},
- 	},
-	{
-      label: "手机号码",
-      field: "phone",
-      component: 'Input',
-      colProps: {span: 6},
- 	},
-	{
-      label: "角色",
-      field: "role",
-      component: 'JDictSelectTag',
+      label: "邀请人",
+      field: "shareId",
+      component: 'JSearchSelect',
       componentProps:{
-          dictCode:"member_role"
+         dict:"han_hai_member,nick_name,id"
       },
       colProps: {span: 6},
  	},
 	{
-      label: "邀请人",
-      field: "shareId",
-      component: 'JSearchSelect',
+      label: "用户角色",
+      field: "isPay",
+      component: 'JDictSelectTag',
       componentProps:{
-         dict:"han_hai_member,nick_name,id"
+          dictCode:"member_role"
       },
       colProps: {span: 6},
  	},
@@ -74,4 +82,30 @@ export const formSchema: FormSchema[] = [
      componentProps:{
       },
   },
+  {
+    label: '邀请人',
+    field: 'shareId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"han_hai_member,nick_name,id"
+    },
+  },
+  {
+    label: '用户角色',
+    field: 'isPay',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"member_role"
+     },
+  },
+  {
+    label: '余额',
+    field: 'price',
+    component: 'InputNumber',
+  },
+  {
+    label: '可提现金额',
+    field: 'money',
+    component: 'InputNumber',
+  },
 ];

module-common/src/main/java/org/jeecg/modules/commonMoneyLog/controller/CommonMoneyLogController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 流水日志表
  * @Author: jeecg-boot
- * @Date:   2024-12-05
+ * @Date:   2024-12-11
  * @Version: V1.0
  */
 @Api(tags="流水日志表")

module-common/src/main/java/org/jeecg/modules/commonMoneyLog/entity/CommonMoneyLog.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 流水日志表
  * @Author: jeecg-boot
- * @Date:   2024-12-05
+ * @Date:   2024-12-11
  * @Version: V1.0
  */
 @Data
@@ -70,4 +70,8 @@ public class CommonMoneyLog implements Serializable {
 	@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/commonMoneyLog/mapper/CommonMoneyLogMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 流水日志表
  * @Author: jeecg-boot
- * @Date:   2024-12-05
+ * @Date:   2024-12-11
  * @Version: V1.0
  */
 public interface CommonMoneyLogMapper extends BaseMapper<CommonMoneyLog> {

module-common/src/main/java/org/jeecg/modules/commonMoneyLog/service/ICommonMoneyLogService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 流水日志表
  * @Author: jeecg-boot
- * @Date:   2024-12-05
+ * @Date:   2024-12-11
  * @Version: V1.0
  */
 public interface ICommonMoneyLogService extends IService<CommonMoneyLog> {

module-common/src/main/java/org/jeecg/modules/commonMoneyLog/service/impl/CommonMoneyLogServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 流水日志表
  * @Author: jeecg-boot
- * @Date:   2024-12-05
+ * @Date:   2024-12-11
  * @Version: V1.0
  */
 @Service

module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue/CommonMoneyLogList.vue

@@ -146,6 +146,11 @@
             align:"center",
             dataIndex: 'state'
           },
+          {
+            title:'用户标识',
+            align:"center",
+            dataIndex: 'userId'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -185,6 +190,7 @@
         fieldList.push({type:'BigDecimal',value:'oldMoney',text:'原金额',dictCode:''})
         fieldList.push({type:'int',value:'type',text:'类型',dictCode:''})
         fieldList.push({type:'int',value:'state',text:'状态',dictCode:''})
+        fieldList.push({type:'string',value:'userId',text:'用户标识',dictCode:''})
         this.superFieldList = fieldList
       }
     }

module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue/modules/CommonMoneyLogForm.vue

@@ -28,6 +28,11 @@
               <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>

module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/CommonMoneyLog.data.ts

@@ -29,6 +29,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'state'
    },
+   {
+    title: '用户标识',
+    align:"center",
+    dataIndex: 'userId'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -60,4 +65,9 @@ export const formSchema: FormSchema[] = [
     field: 'state',
     component: 'InputNumber',
   },
+  {
+    label: '用户标识',
+    field: 'userId',
+    component: 'Input',
+  },
 ];

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:   2024-12-06
+ * @Date:   2024-12-12
  * @Version: V1.0
  */
 @Api(tags="订单信息表")

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

@@ -24,7 +24,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 订单信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-06
+ * @Date:   2024-12-12
  * @Version: V1.0
  */
 @Data
@@ -112,8 +112,23 @@ public class CommonOrder implements Serializable {
 	@Dict(dicCode = "shop_type")
     @ApiModelProperty(value = "商品类型")
     private java.lang.Integer shopState;
+	/**推荐购买会员*/
+	@Excel(name = "推荐购买会员", width = 15)
+    @ApiModelProperty(value = "推荐购买会员")
+    private java.lang.String shareId;
+	/**第几次推荐购买*/
+	@Excel(name = "第几次推荐购买", width = 15)
+    @ApiModelProperty(value = "第几次推荐购买")
+    private java.lang.Integer shareNum;
+	/**快递公司*/
+	@Excel(name = "快递公司", width = 15)
+    @ApiModelProperty(value = "快递公司")
+    private java.lang.String kuai;
+	/**物流订单*/
+	@Excel(name = "物流订单", width = 15)
+    @ApiModelProperty(value = "物流订单")
+    private java.lang.String wuliu;
 
-
-    @TableField(exist = false)
+	@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:   2024-12-06
+ * @Date:   2024-12-12
  * @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:   2024-12-06
+ * @Date:   2024-12-12
  * @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:   2024-12-06
+ * @Date:   2024-12-12
  * @Version: V1.0
  */
 @Service

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

@@ -142,11 +142,6 @@
             align:"center",
             dataIndex: 'title'
           },
-          {
-            title:'图片',
-            align:"center",
-            dataIndex: 'image'
-          },
           {
             title:'支付状态',
             align:"center",
@@ -193,24 +188,34 @@
             dataIndex: 'userId'
           },
           {
-            title:'地址标识',
+            title:'商品标识',
             align:"center",
-            dataIndex: 'addressId'
+            dataIndex: 'shopId'
           },
           {
-            title:'商品标识',
+            title:'商品类型',
             align:"center",
-            dataIndex: 'shopId'
+            dataIndex: 'shopState_dictText'
           },
           {
-            title:'支付编号',
+            title:'推荐购买会员',
             align:"center",
-            dataIndex: 'payNo'
+            dataIndex: 'shareId'
           },
           {
-            title:'商品类型',
+            title:'第几次推荐购买',
             align:"center",
-            dataIndex: 'shopState_dictText'
+            dataIndex: 'shareNum'
+          },
+          {
+            title:'快递公司',
+            align:"center",
+            dataIndex: 'kuai'
+          },
+          {
+            title:'物流订单',
+            align:"center",
+            dataIndex: 'wuliu'
           },
           {
             title: '操作',
@@ -247,7 +252,6 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
-        fieldList.push({type:'Text',value:'image',text:'图片',dictCode:''})
         fieldList.push({type:'int',value:'state',text:'支付状态',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''})
         fieldList.push({type:'int',value:'num',text:'数量',dictCode:''})
@@ -257,10 +261,12 @@
         fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
         fieldList.push({type:'string',value:'addressDetails',text:'详细地址',dictCode:''})
         fieldList.push({type:'string',value:'userId',text:'用户',dictCode:''})
-        fieldList.push({type:'string',value:'addressId',text:'地址标识',dictCode:''})
         fieldList.push({type:'string',value:'shopId',text:'商品标识',dictCode:''})
-        fieldList.push({type:'string',value:'payNo',text:'支付编号',dictCode:''})
-        fieldList.push({type:'string',value:'shopState',text:'商品类型',dictCode:'shop_type'})
+        fieldList.push({type:'int',value:'shopState',text:'商品类型',dictCode:'shop_type'})
+        fieldList.push({type:'string',value:'shareId',text:'推荐购买会员',dictCode:''})
+        fieldList.push({type:'int',value:'shareNum',text:'第几次推荐购买',dictCode:''})
+        fieldList.push({type:'string',value:'kuai',text:'快递公司',dictCode:''})
+        fieldList.push({type:'string',value:'wuliu',text:'物流订单',dictCode:''})
         this.superFieldList = fieldList
       }
     }

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

@@ -8,11 +8,6 @@
               <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="state">
               <a-input-number v-model="model.state" placeholder="请输入支付状态" style="width: 100%" />
@@ -59,23 +54,33 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="地址标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addressId">
-              <a-input v-model="model.addressId" placeholder="请输入地址标识"  ></a-input>
+            <a-form-model-item label="商品标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopId">
+              <a-input v-model="model.shopId" placeholder="请输入商品标识"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="商品标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopId">
-              <a-input v-model="model.shopId" placeholder="请输入商品标识"  ></a-input>
+            <a-form-model-item label="商品类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopState">
+              <j-dict-select-tag type="list" v-model="model.shopState" dictCode="shop_type" placeholder="请选择商品类型" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="支付编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payNo">
-              <a-input v-model="model.payNo" placeholder="请输入支付编号"  ></a-input>
+            <a-form-model-item label="推荐购买会员" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shareId">
+              <a-input v-model="model.shareId" placeholder="请输入推荐购买会员"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="商品类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopState">
-              <j-dict-select-tag type="list" v-model="model.shopState" dictCode="shop_type" placeholder="请选择商品类型" />
+            <a-form-model-item label="第几次推荐购买" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shareNum">
+              <a-input-number v-model="model.shareNum" placeholder="请输入第几次推荐购买" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="快递公司" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="kuai">
+              <a-input v-model="model.kuai" placeholder="请输入快递公司"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="物流订单" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wuliu">
+              <a-input v-model="model.wuliu" placeholder="请输入物流订单"  ></a-input>
             </a-form-model-item>
           </a-col>
         </a-row>

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

@@ -9,11 +9,6 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'title'
    },
-   {
-    title: '图片',
-    align:"center",
-    dataIndex: 'image'
-   },
    {
     title: '支付状态',
     align:"center",
@@ -60,24 +55,34 @@ export const columns: BasicColumn[] = [
     dataIndex: 'userId'
    },
    {
-    title: '地址标识',
+    title: '商品标识',
     align:"center",
-    dataIndex: 'addressId'
+    dataIndex: 'shopId'
    },
    {
-    title: '商品标识',
+    title: '商品类型',
     align:"center",
-    dataIndex: 'shopId'
+    dataIndex: 'shopState_dictText'
    },
    {
-    title: '支付编号',
+    title: '推荐购买会员',
     align:"center",
-    dataIndex: 'payNo'
+    dataIndex: 'shareId'
    },
    {
-    title: '商品类型',
+    title: '第几次推荐购买',
     align:"center",
-    dataIndex: 'shopState_dictText'
+    dataIndex: 'shareNum'
+   },
+   {
+    title: '快递公司',
+    align:"center",
+    dataIndex: 'kuai'
+   },
+   {
+    title: '物流订单',
+    align:"center",
+    dataIndex: 'wuliu'
    },
 ];
 //查询数据
@@ -99,11 +104,6 @@ export const formSchema: FormSchema[] = [
     field: 'title',
     component: 'Input',
   },
-  {
-    label: '图片',
-    field: 'image',
-    component: 'Input',
-  },
   {
     label: '支付状态',
     field: 'state',
@@ -149,21 +149,11 @@ export const formSchema: FormSchema[] = [
     field: 'userId',
     component: 'Input',
   },
-  {
-    label: '地址标识',
-    field: 'addressId',
-    component: 'Input',
-  },
   {
     label: '商品标识',
     field: 'shopId',
     component: 'Input',
   },
-  {
-    label: '支付编号',
-    field: 'payNo',
-    component: 'Input',
-  },
   {
     label: '商品类型',
     field: 'shopState',
@@ -172,4 +162,24 @@ export const formSchema: FormSchema[] = [
         dictCode:"shop_type"
      },
   },
+  {
+    label: '推荐购买会员',
+    field: 'shareId',
+    component: 'Input',
+  },
+  {
+    label: '第几次推荐购买',
+    field: 'shareNum',
+    component: 'InputNumber',
+  },
+  {
+    label: '快递公司',
+    field: 'kuai',
+    component: 'Input',
+  },
+  {
+    label: '物流订单',
+    field: 'wuliu',
+    component: 'Input',
+  },
 ];

module-common/src/main/java/org/jeecg/modules/commonShop/controller/CommonShopController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 单商户商品信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-05
+ * @Date:   2024-12-12
  * @Version: V1.0
  */
 @Api(tags="单商户商品信息表")

module-common/src/main/java/org/jeecg/modules/commonShop/entity/CommonShop.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 单商户商品信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-05
+ * @Date:   2024-12-12
  * @Version: V1.0
  */
 @Data
@@ -72,6 +72,22 @@ public class CommonShop implements Serializable {
 	@Excel(name = "原价", width = 15)
     @ApiModelProperty(value = "原价")
     private java.math.BigDecimal oldPrice;
+	/**会员价格*/
+	@Excel(name = "会员价格", width = 15)
+    @ApiModelProperty(value = "会员价格")
+    private java.math.BigDecimal vipPrice;
+	/**多少盒*/
+	@Excel(name = "多少盒", width = 15)
+    @ApiModelProperty(value = "多少盒")
+    private java.lang.Integer box;
+	/**斤*/
+	@Excel(name = "斤", width = 15)
+    @ApiModelProperty(value = "斤")
+    private java.lang.Integer jin;
+	/**一盒多少罐*/
+	@Excel(name = "一盒多少罐", width = 15)
+    @ApiModelProperty(value = "一盒多少罐")
+    private java.lang.Integer tank;
 	/**限购数量*/
 	@Excel(name = "限购数量", width = 15)
     @ApiModelProperty(value = "限购数量")
@@ -89,8 +105,8 @@ public class CommonShop implements Serializable {
 	@Dict(dictTable = "common_class", dicText = "title", dicCode = "id")
     @ApiModelProperty(value = "分类标识")
     private java.lang.String classId;
-	/**会员价格*/
-	@Excel(name = "会员价格", width = 15)
-    @ApiModelProperty(value = "会员价格")
-    private java.math.BigDecimal vipPrice;
+	/**首页显示*/
+	@Excel(name = "首页显示", width = 15)
+    @ApiModelProperty(value = "首页显示")
+    private java.lang.String indexNo;
 }

module-common/src/main/java/org/jeecg/modules/commonShop/mapper/CommonShopMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 单商户商品信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-05
+ * @Date:   2024-12-12
  * @Version: V1.0
  */
 public interface CommonShopMapper extends BaseMapper<CommonShop> {

module-common/src/main/java/org/jeecg/modules/commonShop/service/ICommonShopService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 单商户商品信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-05
+ * @Date:   2024-12-12
  * @Version: V1.0
  */
 public interface ICommonShopService extends IService<CommonShop> {

module-common/src/main/java/org/jeecg/modules/commonShop/service/impl/CommonShopServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 单商户商品信息表
  * @Author: jeecg-boot
- * @Date:   2024-12-05
+ * @Date:   2024-12-12
  * @Version: V1.0
  */
 @Service

module-common/src/main/java/org/jeecg/modules/commonShop/vue/CommonShopList.vue

@@ -168,6 +168,26 @@
             align:"center",
             dataIndex: 'oldPrice'
           },
+          {
+            title:'会员价格',
+            align:"center",
+            dataIndex: 'vipPrice'
+          },
+          {
+            title:'多少盒',
+            align:"center",
+            dataIndex: 'box'
+          },
+          {
+            title:'斤',
+            align:"center",
+            dataIndex: 'jin'
+          },
+          {
+            title:'一盒多少罐',
+            align:"center",
+            dataIndex: 'tank'
+          },
           {
             title:'限购数量',
             align:"center",
@@ -184,9 +204,10 @@
             dataIndex: 'classId_dictText'
           },
           {
-            title:'会员价格',
+            title:'首页显示',
             align:"center",
-            dataIndex: 'vipPrice'
+            dataIndex: 'indexNo',
+            customRender: (text) => (text ? filterMultiDictText(this.dictOptions['indexNo'], text) : ''),
           },
           {
             title: '操作',
@@ -210,6 +231,7 @@
       }
     },
     created() {
+      this.$set(this.dictOptions, 'indexNo', [{text:'是',value:'Y'},{text:'否',value:'N'}])
     this.getSuperFieldList();
     },
     computed: {
@@ -228,11 +250,15 @@
         fieldList.push({type:'int',value:'type',text:'类型',dictCode:'shop_type'})
         fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'oldPrice',text:'原价',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'vipPrice',text:'会员价格',dictCode:''})
+        fieldList.push({type:'int',value:'box',text:'多少盒',dictCode:''})
+        fieldList.push({type:'int',value:'jin',text:'斤',dictCode:''})
+        fieldList.push({type:'int',value:'tank',text:'一盒多少罐',dictCode:''})
         fieldList.push({type:'int',value:'num',text:'限购数量',dictCode:''})
         fieldList.push({type:'string',value:'skuIcon',text:'标签',dictCode:''})
         fieldList.push({type:'Text',value:'details',text:'详情',dictCode:''})
         fieldList.push({type:'sel_search',value:'classId',text:'分类标识',dictTable:"common_class", dictText:'title', dictCode:'id'})
-        fieldList.push({type:'BigDecimal',value:'vipPrice',text:'会员价格',dictCode:''})
+        fieldList.push({type:'switch',value:'indexNo',text:'首页显示'})
         this.superFieldList = fieldList
       }
     }

module-common/src/main/java/org/jeecg/modules/commonShop/vue/modules/CommonShopForm.vue

@@ -33,6 +33,26 @@
               <a-input-number v-model="model.oldPrice" placeholder="请输入原价" style="width: 100%" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="会员价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="vipPrice">
+              <a-input-number v-model="model.vipPrice" placeholder="请输入会员价格" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="多少盒" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="box">
+              <a-input-number v-model="model.box" placeholder="请输入多少盒" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="斤" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="jin">
+              <a-input-number v-model="model.jin" placeholder="请输入斤" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="一盒多少罐" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tank">
+              <a-input-number v-model="model.tank" placeholder="请输入一盒多少罐" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="限购数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
               <a-input-number v-model="model.num" placeholder="请输入限购数量" style="width: 100%" />
@@ -54,8 +74,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="会员价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="vipPrice">
-              <a-input-number v-model="model.vipPrice" placeholder="请输入会员价格" style="width: 100%" />
+            <a-form-model-item label="首页显示" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="indexNo">
+              <j-switch v-model="model.indexNo"  ></j-switch>
             </a-form-model-item>
           </a-col>
         </a-row>

module-common/src/main/java/org/jeecg/modules/commonShop/vue3/CommonShop.data.ts

@@ -35,6 +35,26 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'oldPrice'
    },
+   {
+    title: '会员价格',
+    align:"center",
+    dataIndex: 'vipPrice'
+   },
+   {
+    title: '多少盒',
+    align:"center",
+    dataIndex: 'box'
+   },
+   {
+    title: '斤',
+    align:"center",
+    dataIndex: 'jin'
+   },
+   {
+    title: '一盒多少罐',
+    align:"center",
+    dataIndex: 'tank'
+   },
    {
     title: '限购数量',
     align:"center",
@@ -51,9 +71,12 @@ export const columns: BasicColumn[] = [
     dataIndex: 'classId_dictText'
    },
    {
-    title: '会员价格',
+    title: '首页显示',
     align:"center",
-    dataIndex: 'vipPrice'
+    dataIndex: 'indexNo',
+    customRender:({text}) => {
+       return  render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}])
+     },
    },
 ];
 //查询数据
@@ -105,6 +128,26 @@ export const formSchema: FormSchema[] = [
     field: 'oldPrice',
     component: 'InputNumber',
   },
+  {
+    label: '会员价格',
+    field: 'vipPrice',
+    component: 'InputNumber',
+  },
+  {
+    label: '多少盒',
+    field: 'box',
+    component: 'InputNumber',
+  },
+  {
+    label: '斤',
+    field: 'jin',
+    component: 'InputNumber',
+  },
+  {
+    label: '一盒多少罐',
+    field: 'tank',
+    component: 'InputNumber',
+  },
   {
     label: '限购数量',
     field: 'num',
@@ -129,8 +172,10 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    label: '会员价格',
-    field: 'vipPrice',
-    component: 'InputNumber',
+    label: '首页显示',
+    field: 'indexNo',
+     component: 'JSwitch',
+     componentProps:{
+     },
   },
 ];

module-common/src/main/java/org/jeecg/modules/commonVipConfig/controller/CommonVipConfigController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.commonVipConfig.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.commonVipConfig.entity.CommonVipConfig;
+import org.jeecg.modules.commonVipConfig.service.ICommonVipConfigService;
+
+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:   2024-12-11
+ * @Version: V1.0
+ */
+@Api(tags="会员配置")
+@RestController
+@RequestMapping("/commonVipConfig/commonVipConfig")
+@Slf4j
+public class CommonVipConfigController extends JeecgController<CommonVipConfig, ICommonVipConfigService> {
+	@Autowired
+	private ICommonVipConfigService commonVipConfigService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param commonVipConfig
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "会员配置-分页列表查询")
+	@ApiOperation(value="会员配置-分页列表查询", notes="会员配置-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CommonVipConfig>> queryPageList(CommonVipConfig commonVipConfig,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CommonVipConfig> queryWrapper = QueryGenerator.initQueryWrapper(commonVipConfig, req.getParameterMap());
+		Page<CommonVipConfig> page = new Page<CommonVipConfig>(pageNo, pageSize);
+		IPage<CommonVipConfig> pageList = commonVipConfigService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param commonVipConfig
+	 * @return
+	 */
+	@AutoLog(value = "会员配置-添加")
+	@ApiOperation(value="会员配置-添加", notes="会员配置-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CommonVipConfig commonVipConfig) {
+		commonVipConfigService.save(commonVipConfig);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param commonVipConfig
+	 * @return
+	 */
+	@AutoLog(value = "会员配置-编辑")
+	@ApiOperation(value="会员配置-编辑", notes="会员配置-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CommonVipConfig commonVipConfig) {
+		commonVipConfigService.updateById(commonVipConfig);
+		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) {
+		commonVipConfigService.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.commonVipConfigService.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<CommonVipConfig> queryById(@RequestParam(name="id",required=true) String id) {
+		CommonVipConfig commonVipConfig = commonVipConfigService.getById(id);
+		if(commonVipConfig==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(commonVipConfig);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param commonVipConfig
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CommonVipConfig commonVipConfig) {
+        return super.exportXls(request, commonVipConfig, CommonVipConfig.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, CommonVipConfig.class);
+    }
+
+}

module-common/src/main/java/org/jeecg/modules/commonVipConfig/entity/CommonVipConfig.java

@@ -0,0 +1,58 @@
+package org.jeecg.modules.commonVipConfig.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:   2024-12-11
+ * @Version: V1.0
+ */
+@Data
+@TableName("common_vip_config")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="common_vip_config对象", description="会员配置")
+public class CommonVipConfig 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 sort;
+	/**比例*/
+	@Excel(name = "比例", width = 15)
+    @ApiModelProperty(value = "比例")
+    private java.math.BigDecimal price;
+}

module-common/src/main/java/org/jeecg/modules/commonVipConfig/mapper/CommonVipConfigMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.commonVipConfig.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.commonVipConfig.entity.CommonVipConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 会员配置
+ * @Author: jeecg-boot
+ * @Date:   2024-12-11
+ * @Version: V1.0
+ */
+public interface CommonVipConfigMapper extends BaseMapper<CommonVipConfig> {
+
+}

module-common/src/main/java/org/jeecg/modules/commonVipConfig/mapper/xml/CommonVipConfigMapper.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.commonVipConfig.mapper.CommonVipConfigMapper">
+
+</mapper>

module-common/src/main/java/org/jeecg/modules/commonVipConfig/service/ICommonVipConfigService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.commonVipConfig.service;
+
+import org.jeecg.modules.commonVipConfig.entity.CommonVipConfig;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 会员配置
+ * @Author: jeecg-boot
+ * @Date:   2024-12-11
+ * @Version: V1.0
+ */
+public interface ICommonVipConfigService extends IService<CommonVipConfig> {
+
+}

module-common/src/main/java/org/jeecg/modules/commonVipConfig/service/impl/CommonVipConfigServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.commonVipConfig.service.impl;
+
+import org.jeecg.modules.commonVipConfig.entity.CommonVipConfig;
+import org.jeecg.modules.commonVipConfig.mapper.CommonVipConfigMapper;
+import org.jeecg.modules.commonVipConfig.service.ICommonVipConfigService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 会员配置
+ * @Author: jeecg-boot
+ * @Date:   2024-12-11
+ * @Version: V1.0
+ */
+@Service
+public class CommonVipConfigServiceImpl extends ServiceImpl<CommonVipConfigMapper, CommonVipConfig> implements ICommonVipConfigService {
+
+}

module-common/src/main/java/org/jeecg/modules/commonVipConfig/vue/CommonVipConfigList.vue

@@ -0,0 +1,177 @@
+<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-vip-config-modal ref="modalForm" @ok="modalFormOk"></common-vip-config-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CommonVipConfigModal from './modules/CommonVipConfigModal'
+
+  export default {
+    name: 'CommonVipConfigList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CommonVipConfigModal
+    },
+    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: 'sort'
+          },
+          {
+            title:'比例',
+            align:"center",
+            dataIndex: 'price'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/commonVipConfig/commonVipConfig/list",
+          delete: "/commonVipConfig/commonVipConfig/delete",
+          deleteBatch: "/commonVipConfig/commonVipConfig/deleteBatch",
+          exportXlsUrl: "/commonVipConfig/commonVipConfig/exportXls",
+          importExcelUrl: "commonVipConfig/commonVipConfig/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:'sort',text:'第几个',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'price',text:'比例',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

module-common/src/main/java/org/jeecg/modules/commonVipConfig/vue/modules/CommonVipConfigForm.vue

@@ -0,0 +1,109 @@
+<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="sort">
+              <a-input-number v-model="model.sort" placeholder="请输入第几个" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="比例" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
+              <a-input-number v-model="model.price" placeholder="请输入比例" style="width: 100%" />
+            </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: 'CommonVipConfigForm',
+    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: "/commonVipConfig/commonVipConfig/add",
+          edit: "/commonVipConfig/commonVipConfig/edit",
+          queryById: "/commonVipConfig/commonVipConfig/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/commonVipConfig/vue/modules/CommonVipConfigModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <common-vip-config-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></common-vip-config-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 CommonVipConfigForm from './CommonVipConfigForm'
+
+  export default {
+    name: 'CommonVipConfigModal',
+    components: {
+      CommonVipConfigForm
+    },
+    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/commonVipConfig/vue/modules/CommonVipConfigModal.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-vip-config-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></common-vip-config-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CommonVipConfigForm from './CommonVipConfigForm'
+  export default {
+    name: 'CommonVipConfigModal',
+    components: {
+      CommonVipConfigForm
+    },
+    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/commonVipConfig/vue3/CommonVipConfig.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/commonVipConfig/commonVipConfig/list',
+  save='/commonVipConfig/commonVipConfig/add',
+  edit='/commonVipConfig/commonVipConfig/edit',
+  deleteOne = '/commonVipConfig/commonVipConfig/delete',
+  deleteBatch = '/commonVipConfig/commonVipConfig/deleteBatch',
+  importExcel = '/commonVipConfig/commonVipConfig/importExcel',
+  exportXls = '/commonVipConfig/commonVipConfig/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/commonVipConfig/vue3/CommonVipConfig.data.ts

@@ -0,0 +1,33 @@
+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: 'sort'
+   },
+   {
+    title: '比例',
+    align:"center",
+    dataIndex: 'price'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '第几个',
+    field: 'sort',
+    component: 'InputNumber',
+  },
+  {
+    label: '比例',
+    field: 'price',
+    component: 'InputNumber',
+  },
+];

module-common/src/main/java/org/jeecg/modules/commonVipConfig/vue3/CommonVipConfigList.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>
+    <!-- 表单区域 -->
+    <CommonVipConfigModal @register="registerModal" @success="handleSuccess"></CommonVipConfigModal>
+  </div>
+</template>
+
+<script lang="ts" name="commonVipConfig-commonVipConfig" 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 CommonVipConfigModal from './components/CommonVipConfigModal.vue'
+  import {columns, searchFormSchema} from './commonVipConfig.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './commonVipConfig.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/commonVipConfig/vue3/components/CommonVipConfigModal.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 '../commonVipConfig.data';
+    import {saveOrUpdate} from '../commonVipConfig.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-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java

@@ -96,12 +96,12 @@ public class MpWxPayService {
         request.setDetail(productName);       //商品详情
         request.setTotalFee(price);           //总金额|分计
         request.setSpbillCreateIp(clientIp);  //终端IP
-        request.setNotifyUrl(wxPay.notifyUrl);//设置回调路径
+        request.setNotifyUrl(wxPay.notifyOneUrl);//设置回调路径
         request.setProductId(productId);      //商品id
         request.setOpenid(openId);            //JSAPI OPENID
         if (dev){
             request.setTotalFee(price);
-            request.setNotifyUrl(wxPay.notifyUrlDev);
+            request.setNotifyUrl(wxPay.notifyUrlOneDev);
         }
         try {
             Object order = wxPayService.createOrder(request);

module-pay/src/main/java/org/jeecg/modules/pay/config/WxPay.java

@@ -36,6 +36,17 @@ public class WxPay {
      */
     public String notifyUrlDev;
 
+
+    /**
+     * 回调地址
+     */
+    public String notifyOneUrl;
+
+    /**
+     * 回调地址dev
+     */
+    public String notifyUrlOneDev;
+
     /**
      * 签名类型
      */

module-system/src/main/resources/pay_weixin.properties

@@ -4,5 +4,7 @@ pay.mchKey=9bde2770a74c2a460592de2d451ce05f
 pay.keyPath=classpath:apiclient_cert.pem
 pay.notifyUrl=https://admin.szqwdgidm.com/rice-admin/rice_index/payNotify
 pay.notifyUrlDev=https://admin.szqwdgidm.com/rice-admin/rice_index/payNotify
+pay.notifyOneUrl=https://admin.szqwdgidm.com/rice-admin/rice_index/payNotify
+pay.notifyUrlOneDev=https://admin.szqwdgidm.com/rice-admin/rice_index/payNotify