完善数据库和框架

jiangqs

2023-05-25 3183d1a910d72eefb96d4cb72f556a54a5d2f874

完善数据库和框架

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/AppErrorConstant.java

@@ -126,4 +126,6 @@

    String BEYOND_SURP_NUM = "超过剩余次数";

    String NO_POSITION = "商品信息需要获取定位";

}

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/member/Member.java

@@ -30,21 +30,20 @@
    private static final long serialVersionUID = 1L;

    /**
     * 会员id
     */
    @TableId("member_id")
    private String memberId;
    /**
     * 用户id
     */
    @TableId("user_id")
    @TableField("user_id")
    private Long userId;

    /**
     * 删除标记
     */
    @TableField("del_flag")
    private Integer delFlag;
    /**
     * 会员id
     */
    @TableField("member_id")
    private String memberId;
    /**
     * 会员编号
     */

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AppMemberCouponVo.java

File was renamed from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AppUserCouponVo.java
@@ -10,15 +10,15 @@
/**
 * @author jqs34
 * @version 1.0
 * @classname AppUserCouponVo
 * @classname AppMemberCouponVo
 * @description: TODO
 * @date 2023 2023/5/2 21:53
 */
@Data
public class AppUserCouponVo {
public class AppMemberCouponVo {

    @ApiModelProperty(value = "优惠券id")
    private Long userCouponId;
    private Long memberCouponId;


    @ApiModelProperty(value = "商品id")

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteMemberFallbackFactory.java

@@ -7,7 +7,7 @@
import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
import com.ruoyi.system.api.domain.dto.AppMemberGoodsTypeDto;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.vo.AppUserCouponVo;
import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import org.slf4j.Logger;
@@ -51,7 +51,7 @@
                

            @Override
            public R<List<AppUserCouponVo>> listVoUserCouponByUserId(Long userId) {
            public R<List<AppMemberCouponVo>> listVoMemberCouponByUserId(Long userId) {
                return R.fail("获取用户优惠券失败:" + throwable.getMessage());
            }


 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteMemberService.java

@@ -7,7 +7,7 @@
import com.ruoyi.system.api.domain.dto.AppMiniRegisterDto;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.vo.AppMiniRegisterVo;
import com.ruoyi.system.api.domain.vo.AppUserCouponVo;
import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
import com.ruoyi.system.api.factory.RemoteMemberFallbackFactory;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
@@ -44,8 +44,8 @@
     * @param userId
     * @return
     */
    @PostMapping("/member/listVoUserCouponByUserId")
    public R<List<AppUserCouponVo>> listVoUserCouponByUserId(@RequestBody Long userId);
    @PostMapping("/member/listVoMemberCouponByUserId")
    public R<List<AppMemberCouponVo>> listVoMemberCouponByUserId(@RequestBody Long userId);

    /**
     * 更新绑定

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppGoodsController.java

@@ -5,6 +5,7 @@
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.goods.domain.vo.AppShoppingCartVo;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.AppBaseBathDto;
import com.ruoyi.goods.domain.dto.AppGoodsInfoGetDto;
import com.ruoyi.goods.domain.dto.AppShoppingCartAddDto;
@@ -54,9 +55,12 @@
            if(member!=null&&member.getRelationShopId()!=null){
                appGoodsInfoGetDto.setShopId(member.getRelationShopId());
            }else{
                throw new ServiceException("请先获取附近商户定位");
                appGoodsInfoGetDto.setShopId(appGoodsInfoGetDto.getPositionShopId());
            }
        }
        if(appGoodsInfoGetDto.getShopId()==null){
            throw new ServiceException(AppErrorConstant.NO_POSITION);
        }
        AppGoodsInfoVo appGoodsInfoVo = goodsService.getGoodsInfo(appGoodsInfoGetDto);
        return R.ok(appGoodsInfoVo);
    }

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java

@@ -2,8 +2,11 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.goods.domain.dto.AppRecommendGoodsPageDto;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.AppPageDto;
import com.ruoyi.goods.domain.dto.AppSearchGoodsPageDto;
import com.ruoyi.goods.domain.dto.AppShopGoodsPageDto;
@@ -45,25 +48,24 @@

    @RequestMapping(value = "/pageRecommendGoods", method = RequestMethod.POST)
    @ApiOperation(value = "推荐商品")
    public R<Page<AppSimpleGoodsVo>> pageRecommendGoods(@RequestBody AppPageDto appPageDto) {
    public R<Page<AppSimpleGoodsVo>> pageRecommendGoods(@RequestBody AppRecommendGoodsPageDto appRecommendGoodsPageDto) {
        Long userId = SecurityUtils.getUserId();
        logger.info("userId-----"+userId.toString());
        Long shopId = null;
        if(userId!=null){
            Member member = memberService.getMember(userId).getData();
            if(member!=null&&member.getRelationShopId()!=null){
                shopId = member.getRelationShopId();
            }
        }else{
            shopId = appRecommendGoodsPageDto.getPositionShopId();
        }
        if(shopId==null){
            shopId = 1L;
            throw new ServiceException(AppErrorConstant.NO_POSITION);
        }
        Page<AppSimpleGoodsVo> page = new Page<>();
        page.setSize(appPageDto.getPageSize());
        page.setCurrent(appPageDto.getPageNum());
        //logger.info("shopId"+shopId.toString());
        page.setSize(appRecommendGoodsPageDto.getPageSize());
        page.setCurrent(appRecommendGoodsPageDto.getPageNum());
        List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsService.pageRecommendGoods(page,shopId);
        //logger.info("appSimpleGoodsVoList"+appSimpleGoodsVoList.toString());
        return R.ok(page.setRecords(appSimpleGoodsVoList));
    }

@@ -76,8 +78,11 @@
            if(member!=null&&member.getRelationShopId()!=null){
                appShopGoodsPageDto.setShopId(member.getRelationShopId());
            }else{
                appShopGoodsPageDto.setShopId(1L);
                appShopGoodsPageDto.setShopId(appShopGoodsPageDto.getPositionShopId());
            }
        }
        if(appShopGoodsPageDto.getShopId()==null){
            throw new ServiceException(AppErrorConstant.NO_POSITION);
        }
        Page<AppSimpleGoodsVo> page = new Page<>();
        page.setSize(appShopGoodsPageDto.getPageSize());
@@ -95,8 +100,11 @@
            if(member!=null&&member.getRelationShopId()!=null){
                appSearchGoodsPageDto.setShopId(member.getRelationShopId());
            }else{
                appSearchGoodsPageDto.setShopId(1L);
                appSearchGoodsPageDto.setShopId(appSearchGoodsPageDto.getPositionShopId());
            }
        }
        if(appSearchGoodsPageDto.getShopId()==null){
            throw new ServiceException(AppErrorConstant.NO_POSITION);
        }
        Page<AppSimpleGoodsVo> page = new Page<>();
        page.setSize(appSearchGoodsPageDto.getPageSize());
@@ -114,9 +122,12 @@
            if(member!=null&&member.getRelationShopId()!=null){
                appSearchGoodsPageDto.setShopId(member.getRelationShopId());
            }else{
                appSearchGoodsPageDto.setShopId(1L);
                appSearchGoodsPageDto.setShopId(appSearchGoodsPageDto.getPositionShopId());
            }
        }
        if(appSearchGoodsPageDto.getShopId()==null){
            throw new ServiceException(AppErrorConstant.NO_POSITION);
        }
        Page<AppSimpleActivityGoodsVo> page = new Page<>();
        page.setSize(appSearchGoodsPageDto.getPageSize());
        page.setCurrent(appSearchGoodsPageDto.getPageNum());

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppBuyGoodsDto.java

@@ -23,6 +23,6 @@
    private Integer buyNum;

    @ApiModelProperty(value = "用户优惠券id")
    private Long userCouponId;
    private Long memberCouponId;

}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppGoodsInfoGetDto.java

@@ -19,4 +19,7 @@

    @ApiModelProperty(value = "商户id",hidden = true)
    private Long shopId;

    @ApiModelProperty(value = "定位获取商户id")
    private Long positionShopId;
}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppRecommendGoodsPageDto.java

New file
@@ -0,0 +1,19 @@
package com.ruoyi.goods.domain.dto;

import com.ruoyi.system.api.domain.dto.AppPageDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author jqs34
 * @ClassName AppRecommandGoodsPageDto
 * @description: TODO
 * @date 2023年05月24日
 * @version: 1.0
 */
@Data
public class AppRecommendGoodsPageDto extends AppPageDto {

    @ApiModelProperty(value = "定位获取商户id")
    private Long positionShopId;
}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppSearchGoodsPageDto.java

@@ -20,4 +20,6 @@
    @ApiModelProperty(value = "搜索关键词")
    private String keyword;

    @ApiModelProperty(value = "定位获取商户id")
    private Long positionShopId;
}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/AppShopGoodsPageDto.java

@@ -28,4 +28,7 @@

    @ApiModelProperty(value = "排序方式1.全部2.价格正序3.价格倒序4.销量正序5.销量倒序")
    private Integer sort;

    @ApiModelProperty(value = "定位获取商户id")
    private Long positionShopId;
}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/activity/Activity.java

New file
@@ -0,0 +1,122 @@
package com.ruoyi.goods.domain.pojo.activity;

import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

/**
 * <p>
 * 活动
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_activity")
public class Activity extends Model<Activity> {

    private static final long serialVersionUID = 1L;

    /**
     * 活动id
     */
    @TableId("activity_id")
    private String activityId;
    /**
     * 删除标记
     */
    @TableField("del_flag")
    private Integer delFlag;
    /**
     * 活动状态-1删除0未开始1进行中2已结束
     */
    @TableField("activity_status")
    private Integer activityStatus;
    /**
     * 活动名称
     */
    @TableField("activity_name")
    private String activityName;
    /**
     * 活动开始时间
     */
    @TableField("activity_start_time")
    private Date activityStartTime;
    /**
     * 活动结束时间
     */
    @TableField("activity_end_time")
    private Date activityEndTime;
    /**
     * 成团人数
     */
    @TableField("group_buy_number")
    private Integer groupBuyNumber;
    /**
     * 限购标记0否1是
     */
    @TableField("purchase_limitation_flag")
    private Integer purchaseLimitationFlag;
    /**
     * 限购数量
     */
    @TableField("propaganda_poster")
    private String propagandaPoster;
    /**
     * 适用地区标记1全部2指定
     */
    @TableField("area_flag")
    private Integer areaFlag;
    /**
     * 适用地区code集合
     */
    @TableField("designated_area")
    private String designatedArea;
    /**
     * 适用店铺标记1全部2指定
     */
    @TableField("shop_flag")
    private Integer shopFlag;
    /**
     * 适用店铺
     */
    @TableField("applicable_shop")
    private String applicableShop;
    /**
     * 创建用户id
     */
    @TableField("create_user_id")
    private Integer createUserId;
    /**
     * 创建时间
     */
    @TableField("create_time")
    private Date createTime;
    /**
     * 更新用户id
     */
    @TableField("update_user_id")
    private Integer updateUserId;
    /**
     * 更新时间
     */
    @TableField("update_time")
    private Date updateTime;


    @Override
    protected Serializable pkVal() {
        return this.activityId;
    }

}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/activity/ActivityRecord.java

New file
@@ -0,0 +1,73 @@
package com.ruoyi.goods.domain.pojo.activity;

import com.baomidou.mybatisplus.annotation.IdType;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

/**
 * <p>
 * 活动记录
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_activity_record")
public class ActivityRecord extends Model<ActivityRecord> {

    private static final long serialVersionUID = 1L;

    /**
     * 记录id
     */
    @TableId(value = "record_id", type = IdType.AUTO)
    private Long recordId;
    /**
     * 删除标记
     */
    @TableField("del_flag")
    private Integer delFlag;
    /**
     * 活动id
     */
    @TableField("activity_id")
    private String activityId;
    /**
     * 用户id
     */
    @TableField("user_id")
    private Integer userId;
    /**
     * 下单时间
     */
    @TableField("order_time")
    private String orderTime;
    /**
     * 下单金额
     */
    @TableField("order_money")
    private BigDecimal orderMoney;
    /**
     * 关联订单id
     */
    @TableField("order_id")
    private String orderId;


    @Override
    protected Serializable pkVal() {
        return this.recordId;
    }

}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/vo/AppSureOrderGoodsVo.java

@@ -1,6 +1,6 @@
package com.ruoyi.goods.domain.vo;

import com.ruoyi.system.api.domain.vo.AppUserCouponVo;
import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -36,7 +36,7 @@
    private Integer buyNum;

    @ApiModelProperty(value = "优惠券id")
    private Long userCouponId;
    private Long memberCouponId;

    @ApiModelProperty(value = "商品售价")
    private BigDecimal goodsPrice;
@@ -57,6 +57,6 @@
    private BigDecimal goodsRealPrice;

    @ApiModelProperty(value = "优惠券列表")
    private List<AppUserCouponVo> appUserCouponVoList;
    private List<AppMemberCouponVo> appMemberCouponVoList;

}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityMapper.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.goods.mapper.activity;

import com.ruoyi.goods.domain.pojo.activity.Activity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 * 活动 Mapper 接口
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
public interface ActivityMapper extends BaseMapper<Activity> {

}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityRecordMapper.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.goods.mapper.activity;

import com.ruoyi.goods.domain.pojo.activity.ActivityRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 * 活动记录 Mapper 接口
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
public interface ActivityRecordMapper extends BaseMapper<ActivityRecord> {

}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/activity/ActivityRecordService.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.goods.service.activity;

import com.ruoyi.goods.domain.pojo.activity.ActivityRecord;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * 活动记录 服务类
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
public interface ActivityRecordService extends IService<ActivityRecord> {

}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/activity/ActivityService.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.goods.service.activity;

import com.ruoyi.goods.domain.pojo.activity.Activity;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * 活动 服务类
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
public interface ActivityService extends IService<Activity> {

}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityRecordServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.goods.service.impl.activity;

import com.ruoyi.goods.domain.pojo.activity.ActivityRecord;
import com.ruoyi.goods.mapper.activity.ActivityRecordMapper;
import com.ruoyi.goods.service.activity.ActivityRecordService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 活动记录 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
@Service
public class ActivityRecordServiceImpl extends ServiceImpl<ActivityRecordMapper, ActivityRecord> implements ActivityRecordService {

}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.goods.service.impl.activity;

import com.ruoyi.goods.domain.pojo.activity.Activity;
import com.ruoyi.goods.mapper.activity.ActivityMapper;
import com.ruoyi.goods.service.activity.ActivityService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 活动 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
@Service
public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> implements ActivityService {

}

 ruoyi-modules/ruoyi-goods/src/main/resources/mapper/activity/ActivityMapper.xml

New file
@@ -0,0 +1,7 @@
<?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="com.ruoyi.goods.mapper.activity.ActivityMapper">



</mapper>

 ruoyi-modules/ruoyi-goods/src/main/resources/mapper/activity/ActivityRecordMapper.xml

New file
@@ -0,0 +1,6 @@
<?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="com.ruoyi.goods.mapper.activity.ActivityRecordMapper">


</mapper>

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java

@@ -6,11 +6,11 @@
import com.ruoyi.system.api.domain.dto.AppMiniRegisterDto;
import com.ruoyi.system.api.domain.vo.AppMiniRegisterVo;
import com.ruoyi.member.service.member.MemberService;
import com.ruoyi.member.service.member.UserCouponService;
import com.ruoyi.member.service.member.MemberCouponService;
import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
import com.ruoyi.system.api.domain.dto.AppMemberGoodsTypeDto;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.vo.AppUserCouponVo;
import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import io.swagger.annotations.ApiOperation;
@@ -27,7 +27,7 @@
    private MemberService memberService;

    @Autowired
    private UserCouponService userCouponService;
    private MemberCouponService memberCouponService;

    /**
    * @description: getMember
@@ -77,10 +77,10 @@
    * @date 2023/5/3 1:45
    * @version 1.0
    */
    @PostMapping("/listVoUserCouponByUserId")
    public R<List<AppUserCouponVo>> listVoUserCouponByUserId(@RequestBody Long userId){
        List<AppUserCouponVo> appUserCouponVoList = userCouponService.listVoUserCouponByUserId(userId);
        return R.ok(appUserCouponVoList);
    @PostMapping("/listVoMemberCouponByUserId")
    public R<List<AppMemberCouponVo>> listVoMemberCouponByUserId(@RequestBody Long userId){
        List<AppMemberCouponVo> appMemberCouponVoList = memberCouponService.listVoMemberCouponByUserId(userId);
        return R.ok(appMemberCouponVoList);
    }

    /**

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/coupon/Coupon.java

File was renamed from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/coupon/Coupon.java
@@ -1,4 +1,4 @@
package com.ruoyi.system.domain.pojo.coupon;
package com.ruoyi.member.domain.pojo.coupon;

import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableField;

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/coupon/CouponRelGoods.java

File was renamed from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/coupon/CouponRelGoods.java
@@ -1,4 +1,4 @@
package com.ruoyi.system.domain.pojo.coupon;
package com.ruoyi.member.domain.pojo.coupon;

import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotation.IdType;

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/coupon/CouponRelUser.java

File was renamed from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/coupon/CouponRelUser.java
@@ -1,4 +1,4 @@
package com.ruoyi.system.domain.pojo.coupon;
package com.ruoyi.member.domain.pojo.coupon;

import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotation.IdType;

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/coupon/CouponTotal.java

File was renamed from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/coupon/CouponTotal.java
@@ -1,4 +1,4 @@
package com.ruoyi.system.domain.pojo.coupon;
package com.ruoyi.member.domain.pojo.coupon;

import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableField;

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/BrowseRecord.java

New file
@@ -0,0 +1,78 @@
package com.ruoyi.member.domain.pojo.member;

import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

/**
 * <p>
 * 
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_browse_record")
public class BrowseRecord extends Model<BrowseRecord> {

    private static final long serialVersionUID = 1L;

    /**
     * 记录id
     */
    @TableId(value = "record_id", type = IdType.AUTO)
    private Integer recordId;
    /**
     * 删除标记
     */
    @TableField("del_flag")
    private String delFlag;
    /**
     * 用户id
     */
    @TableField("user_id")
    private Integer userId;
    /**
     * 浏览类型
     */
    @TableField("browse_type")
    private Integer browseType;
    /**
     * 浏览id
     */
    @TableField("browse_id")
    private String browseId;
    /**
     * 浏览时间
     */
    @TableField("browse_time")
    private String browseTime;
    /**
     * 创建时间
     */
    @TableField("create_time")
    private Date createTime;
    /**
     * 退出时间
     */
    @TableField("quit_time")
    private Date quitTime;


    @Override
    protected Serializable pkVal() {
        return this.recordId;
    }

}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/IntegralRecord.java

New file
@@ -0,0 +1,83 @@
package com.ruoyi.member.domain.pojo.member;

import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

/**
 * <p>
 * 
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_integral_record")
public class IntegralRecord extends Model<IntegralRecord> {

    private static final long serialVersionUID = 1L;

    /**
     * 记录id
     */
    @TableId(value = "record_id", type = IdType.AUTO)
    private Integer recordId;
    /**
     * 删除标记
     */
    @TableField("del_flag")
    private Integer delFlag;
    /**
     * 变动类型
     */
    @TableField("change_type")
    private Integer changeType;
    /**
     * 变动积分
     */
    @TableField("change_integral")
    private Integer changeIntegral;
    /**
     * 剩余积分
     */
    @TableField("surp_integral")
    private Integer surpIntegral;
    /**
     * 变动时间
     */
    @TableField("create_time")
    private Date createTime;
    /**
     * 订单id
     */
    @TableField("order_id")
    private String orderId;
    /**
     * 订单号
     */
    @TableField("order_no")
    private String orderNo;
    /**
     * 变动理由
     */
    @TableField("change_reason")
    private String changeReason;


    @Override
    protected Serializable pkVal() {
        return this.recordId;
    }

}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberCoupon.java

File was renamed from ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/UserCoupon.java
@@ -25,7 +25,7 @@
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_user_coupon")
public class UserCoupon extends Model<UserCoupon> {
public class MemberCoupon extends Model<MemberCoupon> {

    private static final long serialVersionUID = 1L;


 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberShopTotal.java

New file
@@ -0,0 +1,188 @@
package com.ruoyi.member.domain.pojo.member;

import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

/**
 * <p>
 * 会员商户统计
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_member_shop_total")
public class MemberShopTotal extends Model<MemberShopTotal> {

    private static final long serialVersionUID = 1L;

    /**
     * 会员id
     */
    @TableId("member_id")
    private String memberId;
    /**
     * 删除标记
     */
    @TableField("del_flag")
    private Integer delFlag;
    /**
     * 商户id
     */
    @TableField("shop_id")
    private Integer shopId;
    /**
     * 总积分
     */
    @TableField("total_integral")
    private Integer totalIntegral;
    /**
     * 使用积分
     */
    @TableField("used_integral")
    private Integer usedIntegral;
    /**
     * 可用积分
     */
    @TableField("useable_integral")
    private Integer useableIntegral;
    /**
     * 总消费金额
     */
    @TableField("total_pay_money")
    private BigDecimal totalPayMoney;
    /**
     * 总消费次数
     */
    @TableField("total_pay_count")
    private Integer totalPayCount;
    /**
     * 最后消费金额
     */
    @TableField("last_pay_money")
    private BigDecimal lastPayMoney;
    /**
     * 最后消费时间
     */
    @TableField("last_pay_time")
    private Date lastPayTime;
    /**
     * 最后服务时间
     */
    @TableField("last_service_time")
    private Date lastServiceTime;
    /**
     * 下次跟进时间
     */
    @TableField("next_task_time")
    private Date nextTaskTime;
    /**
     * 总服务次数
     */
    @TableField("total_service_count")
    private Integer totalServiceCount;
    /**
     * 使用服务次数
     */
    @TableField("used_service_count")
    private Integer usedServiceCount;
    /**
     * 可用服务次数
     */
    @TableField("useable_service_count")
    private Integer useableServiceCount;
    /**
     * 总活动次数
     */
    @TableField("total_activity_count")
    private String totalActivityCount;
    /**
     * 最后活动时间
     */
    @TableField("last_activity_time")
    private Date lastActivityTime;
    /**
     * 总周期订单数
     */
    @TableField("total_cycle_order")
    private Integer totalCycleOrder;
    /**
     * 总体验订单数
     */
    @TableField("tolta_experience_order")
    private Integer toltaExperienceOrder;
    /**
     * 总服务订单数
     */
    @TableField("total_service_order")
    private Integer totalServiceOrder;
    /**
     * 总单品订单数
     */
    @TableField("total_goods_order")
    private Integer totalGoodsOrder;
    /**
     * 总周期服务次数
     */
    @TableField("total_cycle_service")
    private Integer totalCycleService;
    /**
     * 已用周期服务次数
     */
    @TableField("used_cycle_service")
    private Integer usedCycleService;
    /**
     * 可用周期服务次数
     */
    @TableField("useable_cycle_service")
    private Integer useableCycleService;
    /**
     * 总体验服务次数
     */
    @TableField("total_experience_service")
    private Integer totalExperienceService;
    /**
     * 已用体验服务次数
     */
    @TableField("used_experience_service")
    private Integer usedExperienceService;
    /**
     * 可用体验服务次数
     */
    @TableField("useable_experience_service")
    private Integer useableExperienceService;
    /**
     * 总服务服务次数
     */
    @TableField("total_service_service")
    private Integer totalServiceService;
    /**
     * 已用服务服务次数
     */
    @TableField("used_service_service")
    private Integer usedServiceService;
    /**
     * 可用服务服务次数
     */
    @TableField("useablel_service_service")
    private Integer useablelServiceService;


    @Override
    protected Serializable pkVal() {
        return this.memberId;
    }

}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberSuggest.java

@@ -8,7 +8,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;

import com.baomidou.mybatisplus.annotations.Version;
import com.baomidou.mybatisplus.annotation.Version;

import lombok.Data;
import lombok.EqualsAndHashCode;

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberTotal.java

New file
@@ -0,0 +1,138 @@
package com.ruoyi.member.domain.pojo.member;

import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

/**
 * <p>
 * 
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_member_total")
public class MemberTotal extends Model<MemberTotal> {

    private static final long serialVersionUID = 1L;

    /**
     * 会员id
     */
    @TableId("member_id")
    private String memberId;
    /**
     * 删除标记
     */
    @TableField("del_flag")
    private Integer delFlag;
    /**
     * 总积分
     */
    @TableField("total_integral")
    private Integer totalIntegral;
    /**
     * 使用积分
     */
    @TableField("used_integral")
    private Integer usedIntegral;
    /**
     * 可用积分
     */
    @TableField("useable_integral")
    private Integer useableIntegral;
    /**
     * 总消费金额
     */
    @TableField("total_pay_money")
    private BigDecimal totalPayMoney;
    /**
     * 总消费次数
     */
    @TableField("total_pay_count")
    private Integer totalPayCount;
    /**
     * 最后消费金额
     */
    @TableField("last_pay_money")
    private BigDecimal lastPayMoney;
    /**
     * 最后消费时间
     */
    @TableField("last_pay_time")
    private Date lastPayTime;
    /**
     * 最后服务时间
     */
    @TableField("last_service_time")
    private Date lastServiceTime;
    /**
     * 下次跟进时间
     */
    @TableField("next_task_time")
    private Date nextTaskTime;
    /**
     * 总服务次数
     */
    @TableField("total_service_count")
    private Integer totalServiceCount;
    /**
     * 使用服务次数
     */
    @TableField("used_service_count")
    private Integer usedServiceCount;
    /**
     * 可用服务次数
     */
    @TableField("useable_service_count")
    private Integer useableServiceCount;
    /**
     * 总活动次数
     */
    @TableField("total_activity_count")
    private String totalActivityCount;
    /**
     * 最后活动时间
     */
    @TableField("last_activity_time")
    private Date lastActivityTime;
    /**
     * 总周期订单数
     */
    @TableField("total_cycle_order")
    private Integer totalCycleOrder;
    /**
     * 总体验订单数
     */
    @TableField("tolta_experience_order")
    private Integer toltaExperienceOrder;
    /**
     * 总服务订单数
     */
    @TableField("total_service_order")
    private Integer totalServiceOrder;
    /**
     * 总单品订单数
     */
    @TableField("total_goods_order")
    private Integer totalGoodsOrder;


    @Override
    protected Serializable pkVal() {
        return this.memberId;
    }

}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/coupon/CouponMapper.java

File was renamed from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/coupon/CouponMapper.java
@@ -1,6 +1,6 @@
package com.ruoyi.system.mapper.coupon;
package com.ruoyi.member.mapper.coupon;

import com.ruoyi.system.domain.pojo.coupon.Coupon;
import com.ruoyi.member.domain.pojo.coupon.Coupon;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/coupon/CouponRelGoodsMapper.java

File was renamed from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/coupon/CouponRelGoodsMapper.java
@@ -1,6 +1,6 @@
package com.ruoyi.system.mapper.coupon;
package com.ruoyi.member.mapper.coupon;

import com.ruoyi.system.domain.pojo.coupon.CouponRelGoods;
import com.ruoyi.member.domain.pojo.coupon.CouponRelGoods;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/coupon/CouponRelUserMapper.java

File was renamed from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/coupon/CouponRelUserMapper.java
@@ -1,6 +1,6 @@
package com.ruoyi.system.mapper.coupon;
package com.ruoyi.member.mapper.coupon;

import com.ruoyi.system.domain.pojo.coupon.CouponRelUser;
import com.ruoyi.member.domain.pojo.coupon.CouponRelUser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/coupon/CouponTotalMapper.java

File was renamed from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/coupon/CouponTotalMapper.java
@@ -1,6 +1,6 @@
package com.ruoyi.system.mapper.coupon;
package com.ruoyi.member.mapper.coupon;

import com.ruoyi.system.domain.pojo.coupon.CouponTotal;
import com.ruoyi.member.domain.pojo.coupon.CouponTotal;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/BrowseRecordMapper.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.member.mapper.member;

import com.ruoyi.member.domain.pojo.member.BrowseRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
public interface BrowseRecordMapper extends BaseMapper<BrowseRecord> {

}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/IntegralRecordMapper.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.member.mapper.member;

import com.ruoyi.member.domain.pojo.member.IntegralRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
public interface IntegralRecordMapper extends BaseMapper<IntegralRecord> {

}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberCouponMapper.java

New file
@@ -0,0 +1,26 @@
package com.ruoyi.member.mapper.member;

import com.ruoyi.member.domain.pojo.member.MemberCoupon;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;

import java.util.List;

/**
 * <p>
 * 用户关联优惠券 Mapper 接口
 * </p>
 *
 * @author jqs
 * @since 2023-04-25
 */
public interface MemberCouponMapper extends BaseMapper<MemberCoupon> {

    /**
     * @description: TODO
     * @author jqs34
     * @date 2023/5/3 1:47
     * @version 1.0
     */
    List<AppMemberCouponVo> listVoMemberCouponByUserId(Long userId);
}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberShopTotalMapper.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.member.mapper.member;

import com.ruoyi.member.domain.pojo.member.MemberShopTotal;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 * 会员商户统计 Mapper 接口
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
public interface MemberShopTotalMapper extends BaseMapper<MemberShopTotal> {

}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/MemberTotalMapper.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.member.mapper.member;

import com.ruoyi.member.domain.pojo.member.MemberTotal;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
public interface MemberTotalMapper extends BaseMapper<MemberTotal> {

}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/member/UserCouponMapper.java

File was deleted

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponRelGoodsService.java

File was renamed from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/coupon/CouponRelGoodsService.java
@@ -1,6 +1,6 @@
package com.ruoyi.system.service.coupon;
package com.ruoyi.member.service.coupon;

import com.ruoyi.system.domain.pojo.coupon.CouponRelGoods;
import com.ruoyi.member.domain.pojo.coupon.CouponRelGoods;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponRelUserService.java

File was renamed from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/coupon/CouponRelUserService.java
@@ -1,6 +1,6 @@
package com.ruoyi.system.service.coupon;
package com.ruoyi.member.service.coupon;

import com.ruoyi.system.domain.pojo.coupon.CouponRelUser;
import com.ruoyi.member.domain.pojo.coupon.CouponRelUser;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponService.java

File was renamed from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/coupon/CouponService.java
@@ -1,6 +1,6 @@
package com.ruoyi.system.service.coupon;
package com.ruoyi.member.service.coupon;

import com.ruoyi.system.domain.pojo.coupon.Coupon;
import com.ruoyi.member.domain.pojo.coupon.Coupon;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponTotalService.java

File was renamed from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/coupon/CouponTotalService.java
@@ -1,6 +1,6 @@
package com.ruoyi.system.service.coupon;
package com.ruoyi.member.service.coupon;

import com.ruoyi.system.domain.pojo.coupon.CouponTotal;
import com.ruoyi.member.domain.pojo.coupon.CouponTotal;
import com.baomidou.mybatisplus.extension.service.IService;

/**

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponRelGoodsServiceImpl.java

File was renamed from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/coupon/CouponRelGoodsServiceImpl.java
@@ -1,8 +1,8 @@
package com.ruoyi.system.service.impl.coupon;
package com.ruoyi.member.service.impl.coupon;

import com.ruoyi.system.domain.pojo.coupon.CouponRelGoods;
import com.ruoyi.system.mapper.coupon.CouponRelGoodsMapper;
import com.ruoyi.system.service.coupon.CouponRelGoodsService;
import com.ruoyi.member.domain.pojo.coupon.CouponRelGoods;
import com.ruoyi.member.mapper.coupon.CouponRelGoodsMapper;
import com.ruoyi.member.service.coupon.CouponRelGoodsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;


 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponRelUserServiceImpl.java

File was renamed from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/coupon/CouponRelUserServiceImpl.java
@@ -1,8 +1,8 @@
package com.ruoyi.system.service.impl.coupon;
package com.ruoyi.member.service.impl.coupon;

import com.ruoyi.system.domain.pojo.coupon.CouponRelUser;
import com.ruoyi.system.mapper.coupon.CouponRelUserMapper;
import com.ruoyi.system.service.coupon.CouponRelUserService;
import com.ruoyi.member.domain.pojo.coupon.CouponRelUser;
import com.ruoyi.member.mapper.coupon.CouponRelUserMapper;
import com.ruoyi.member.service.coupon.CouponRelUserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;


 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java

File was renamed from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/coupon/CouponServiceImpl.java
@@ -1,8 +1,8 @@
package com.ruoyi.system.service.impl.coupon;
package com.ruoyi.member.service.impl.coupon;

import com.ruoyi.system.domain.pojo.coupon.Coupon;
import com.ruoyi.system.mapper.coupon.CouponMapper;
import com.ruoyi.system.service.coupon.CouponService;
import com.ruoyi.member.domain.pojo.coupon.Coupon;
import com.ruoyi.member.mapper.coupon.CouponMapper;
import com.ruoyi.member.service.coupon.CouponService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;


 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponTotalServiceImpl.java

File was renamed from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/coupon/CouponTotalServiceImpl.java
@@ -1,8 +1,8 @@
package com.ruoyi.system.service.impl.coupon;
package com.ruoyi.member.service.impl.coupon;

import com.ruoyi.system.domain.pojo.coupon.CouponTotal;
import com.ruoyi.system.mapper.coupon.CouponTotalMapper;
import com.ruoyi.system.service.coupon.CouponTotalService;
import com.ruoyi.member.domain.pojo.coupon.CouponTotal;
import com.ruoyi.member.mapper.coupon.CouponTotalMapper;
import com.ruoyi.member.service.coupon.CouponTotalService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;


 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/BrowseRecordServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.member.service.impl.member;

import com.ruoyi.member.domain.pojo.member.BrowseRecord;
import com.ruoyi.member.mapper.member.BrowseRecordMapper;
import com.ruoyi.member.service.member.BrowseRecordService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
@Service
public class BrowseRecordServiceImpl extends ServiceImpl<BrowseRecordMapper, BrowseRecord> implements BrowseRecordService {

}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/IntegralRecordServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.member.service.impl.member;

import com.ruoyi.member.domain.pojo.member.IntegralRecord;
import com.ruoyi.member.mapper.member.IntegralRecordMapper;
import com.ruoyi.member.service.member.IntegralRecordService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
@Service
public class IntegralRecordServiceImpl extends ServiceImpl<IntegralRecordMapper, IntegralRecord> implements IntegralRecordService {

}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java

New file
@@ -0,0 +1,38 @@
package com.ruoyi.member.service.impl.member;

import com.ruoyi.member.domain.pojo.member.MemberCoupon;
import com.ruoyi.member.mapper.member.MemberCouponMapper;
import com.ruoyi.member.service.member.MemberCouponService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
 * 用户关联优惠券 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-04-25
 */
@Service
public class MemberCouponServiceImpl extends ServiceImpl<MemberCouponMapper, MemberCoupon> implements MemberCouponService {

    @Resource
    private MemberCouponMapper memberCouponMapper;

    /**
     * @description: TODO
     * @author jqs34
     * @date 2023/5/3 1:47
     * @version 1.0
     */
    @Override
    public List<AppMemberCouponVo> listVoMemberCouponByUserId(Long userId){
        List<AppMemberCouponVo> appMemberCouponVoList = memberCouponMapper.listVoMemberCouponByUserId(userId);
        return appMemberCouponVoList;
    }
}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java

@@ -79,9 +79,6 @@
    private MemberMapper memberMapper;

    @Resource
    private StringRedisTemplate stringRedisTemplate;

    @Resource
    private RemoteShopService shopService;

    @Resource
@@ -149,7 +146,7 @@
    }

    /**
     * 获取授权信息
     * 小程序注册
     * @param appUserRegisterDto
     * @return
     */
@@ -220,7 +217,6 @@
            member.setNickName("鸿瑞堂用户");
            member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
            member.setMemberId(memberId);
            member.setRelationShopId(1L);
            member.setBindingFlag(0);
            member.setCreateTime(new Date());
        }else{
@@ -469,7 +465,7 @@
        SysUser sysUser = sysUserService.getSysUserByMobile(phonenumber).getData();
        if(sysUser==null){
            sysUser = new SysUser();
            sysUser.setUserName(phonenumber);
            sysUser.setUserName(phonenumber+"-3");
            sysUser.setUserType("03");
            sysUser.setNickName(merMemberAddDto.getNickName());
            sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
@@ -477,27 +473,29 @@
            sysUser.setPassword(SecurityUtils.encryptPassword(password));
            log.debug("sysUser"+sysUser.toString());
            sysUser = sysUserService.registerUser(sysUser).getData();
            String memberId = IdUtils.simpleUUID();
            Member member = new Member();
            member.setMemberId(memberId);
            member.setUserId(sysUser.getUserId());
            member.setDelFlag(0);
            member.setNickName(merMemberAddDto.getNickName());
            member.setRealName(merMemberAddDto.getNickName());
            member.setGender(merMemberAddDto.getGender());
            member.setMobile(phonenumber);
            member.setReferrer(merMemberAddDto.getReferrer());
            member.setBirthday(merMemberAddDto.getBirthday());
            member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
            member.setRelationShopId(merMemberAddDto.getShopId());
            member.setWxUnionid(null);
            member.setMiniOpenid(null);
            member.setBindingFlag(1);
            member.setRelationShopId(merMemberAddDto.getShopId());
            member.setCreateTime(new Date());
            log.info("member-----------------"+member.toString());
            this.saveOrUpdate(member);
        }
        log.info("sysUser1-----------------"+sysUser.toString());
        String memberId = IdUtils.simpleUUID();
        Member member = new Member();
        member.setUserId(sysUser.getUserId());
        member.setDelFlag(0);
        member.setNickName(merMemberAddDto.getNickName());
        member.setGender(merMemberAddDto.getGender());
        member.setMobile(phonenumber);
        member.setReferrer(merMemberAddDto.getReferrer());
        member.setBirthday(merMemberAddDto.getBirthday());
        member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
        member.setMemberId(memberId);
        member.setRelationShopId(1L);
        member.setWxUnionid(null);
        member.setMiniOpenid(null);
        member.setBindingFlag(1);
        member.setRelationShopId(merMemberAddDto.getShopId());
        member.setCreateTime(new Date());
        log.info("member-----------------"+member.toString());
        this.saveOrUpdate(member);


    }

    /**

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberShopTotalServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.member.service.impl.member;

import com.ruoyi.member.domain.pojo.member.MemberShopTotal;
import com.ruoyi.member.mapper.member.MemberShopTotalMapper;
import com.ruoyi.member.service.member.MemberShopTotalService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 会员商户统计 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
@Service
public class MemberShopTotalServiceImpl extends ServiceImpl<MemberShopTotalMapper, MemberShopTotal> implements MemberShopTotalService {

}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberTotalServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.member.service.impl.member;

import com.ruoyi.member.domain.pojo.member.MemberTotal;
import com.ruoyi.member.mapper.member.MemberTotalMapper;
import com.ruoyi.member.service.member.MemberTotalService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
@Service
public class MemberTotalServiceImpl extends ServiceImpl<MemberTotalMapper, MemberTotal> implements MemberTotalService {

}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/UserCouponServiceImpl.java

File was deleted

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/BrowseRecordService.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.member.service.member;

import com.ruoyi.member.domain.pojo.member.BrowseRecord;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
public interface BrowseRecordService extends IService<BrowseRecord> {

}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/IntegralRecordService.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.member.service.member;

import com.ruoyi.member.domain.pojo.member.IntegralRecord;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
public interface IntegralRecordService extends IService<IntegralRecord> {

}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberCouponService.java

New file
@@ -0,0 +1,26 @@
package com.ruoyi.member.service.member;

import com.ruoyi.member.domain.pojo.member.MemberCoupon;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;

import java.util.List;

/**
 * <p>
 * 用户关联优惠券 服务类
 * </p>
 *
 * @author jqs
 * @since 2023-04-25
 */
public interface MemberCouponService extends IService<MemberCoupon> {

    /**
    * @description: TODO
    * @author jqs34
    * @date 2023/5/3 1:47
    * @version 1.0
    */
    List<AppMemberCouponVo> listVoMemberCouponByUserId(Long userId);
}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberShopTotalService.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.member.service.member;

import com.ruoyi.member.domain.pojo.member.MemberShopTotal;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * 会员商户统计 服务类
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
public interface MemberShopTotalService extends IService<MemberShopTotal> {

}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberTotalService.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.member.service.member;

import com.ruoyi.member.domain.pojo.member.MemberTotal;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
public interface MemberTotalService extends IService<MemberTotal> {

}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/UserCouponService.java

File was deleted

 ruoyi-modules/ruoyi-member/src/main/resources/mapper/coupon/CouponMapper.xml

File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/coupon/CouponMapper.xml
@@ -1,6 +1,6 @@
<?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="com.ruoyi.system.mapper.coupon.CouponMapper">
<mapper namespace="com.ruoyi.member.mapper.coupon.CouponMapper">

    <resultMap type="Coupon" id="CouponResult">
        <result property="couponId"    column="coupon_id"    />

 ruoyi-modules/ruoyi-member/src/main/resources/mapper/coupon/CouponRelGoodsMapper.xml

File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/coupon/CouponRelGoodsMapper.xml
@@ -1,6 +1,6 @@
<?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="com.ruoyi.system.mapper.coupon.CouponRelGoodsMapper">
<mapper namespace="com.ruoyi.member.mapper.coupon.CouponRelGoodsMapper">

    <resultMap type="CouponRelGoods" id="CouponRelGoodsResult">
        <result property="id"    column="id"    />

 ruoyi-modules/ruoyi-member/src/main/resources/mapper/coupon/CouponRelUserMapper.xml

File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/coupon/CouponRelUserMapper.xml
@@ -1,6 +1,6 @@
<?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="com.ruoyi.system.mapper.coupon.CouponRelUserMapper">
<mapper namespace="com.ruoyi.member.mapper.coupon.CouponRelUserMapper">

    <resultMap type="CouponRelUser" id="CouponRelUserResult">
        <result property="id"    column="id"    />

 ruoyi-modules/ruoyi-member/src/main/resources/mapper/coupon/CouponTotalMapper.xml

File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/coupon/CouponTotalMapper.xml
@@ -1,6 +1,6 @@
<?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="com.ruoyi.system.mapper.CouponTotalMapper">
<mapper namespace="com.ruoyi.member.mapper.coupon.CouponTotalMapper">

    <resultMap type="CouponTotal" id="CouponTotalResult">
        <result property="couponId"    column="coupon_id"    />

 ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/BrowseRecordMapper.xml

New file
@@ -0,0 +1,7 @@
<?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="com.ruoyi.member.mapper.member.BrowseRecordMapper">



</mapper>

 ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/IntegralRecordMapper.xml

New file
@@ -0,0 +1,7 @@
<?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="com.ruoyi.member.mapper.member.IntegralRecordMapper">



</mapper>

 ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberCouponMapper.xml

File was renamed from ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/UserCouponMapper.xml
@@ -1,8 +1,8 @@
<?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="com.ruoyi.member.mapper.member.UserCouponMapper">
<mapper namespace="com.ruoyi.member.mapper.member.MemberCouponMapper">

    <resultMap type="UserCoupon" id="UserCouponResult">
    <resultMap type="MemberCoupon" id="MemberCouponResult">
        <result property="id"    column="id"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="couponId"    column="coupon_id"    />
@@ -27,12 +27,12 @@
        <result property="relGoodsIds"    column="rel_goods_ids"    />
    </resultMap>

    <sql id="selectUserCouponVo">
        select id, del_flag, coupon_id, user_id, coupon_type, coupon_status, coupon_name, send_type, send_time_type, send_time, money_threshold, discount_money, discount_percent, use_scope, valid_time_type, valid_start_time, valid_end_time, valid_day, receive_time, user_time, deadline_time, rel_goods_ids from t_user_coupon
    <sql id="selectMemberCouponVo">
        select id, del_flag, coupon_id, user_id, coupon_type, coupon_status, coupon_name, send_type, send_time_type, send_time, money_threshold, discount_money, discount_percent, use_scope, valid_time_type, valid_start_time, valid_end_time, valid_day, receive_time, user_time, deadline_time, rel_goods_ids from t_member_coupon
    </sql>

    <select id="selectUserCouponList" parameterType="UserCoupon" resultMap="UserCouponResult">
        <include refid="selectUserCouponVo"/>
    <select id="selectMemberCouponList" parameterType="MemberCoupon" resultMap="MemberCouponResult">
        <include refid="selectMemberCouponVo"/>
        <where>
            <if test="couponId != null  and couponId != ''"> and coupon_id = #{couponId}</if>
            <if test="userId != null "> and user_id = #{userId}</if>
@@ -57,13 +57,13 @@
        </where>
    </select>

    <select id="selectUserCouponById" parameterType="Long" resultMap="UserCouponResult">
        <include refid="selectUserCouponVo"/>
    <select id="selectMemberCouponById" parameterType="Long" resultMap="MemberCouponResult">
        <include refid="selectMemberCouponVo"/>
        where id = #{id}
    </select>

    <insert id="insertUserCoupon" parameterType="UserCoupon" useGeneratedKeys="true" keyProperty="id">
        insert into t_user_coupon
    <insert id="insertMemberCoupon" parameterType="MemberCoupon" useGeneratedKeys="true" keyProperty="id">
        insert into t_member_coupon
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
            <if test="couponId != null">coupon_id,</if>
@@ -112,8 +112,8 @@
        </trim>
    </insert>

    <update id="updateUserCoupon" parameterType="UserCoupon">
        update t_user_coupon
    <update id="updateMemberCoupon" parameterType="MemberCoupon">
        update t_member_coupon
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
            <if test="couponId != null">coupon_id = #{couponId},</if>
@@ -140,20 +140,20 @@
        where id = #{id}
    </update>

    <delete id="deleteUserCouponById" parameterType="Long">
        delete from t_user_coupon where id = #{id}
    <delete id="deleteMemberCouponById" parameterType="Long">
        delete from t_member_coupon where id = #{id}
    </delete>

    <delete id="deleteUserCouponByIds" parameterType="String">
        delete from t_user_coupon where id in
    <delete id="deleteMemberCouponByIds" parameterType="String">
        delete from t_member_coupon where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>

    <select id="listVoUserCouponByUserId" resultType="com.ruoyi.system.api.domain.vo.AppUserCouponVo">
    <select id="listVoMemberCouponByUserId" resultType="com.ruoyi.system.api.domain.vo.AppMemberCouponVo">
        SELECT
        tuc.id userCouponId,
        tuc.id memberCouponId,
        tuc.coupon_type couponType,
        tuc.coupon_name couponName,
        tuc.money_threshold moneyThreshold,
@@ -162,7 +162,7 @@
        tuc.valid_start_time validStartTime,
        tuc.deadline_time deadlineTime,
        tuc.rel_goods_ids relGoodsIds
        FROM t_user_coupon tuc
        FROM t_member_coupon tuc
        WHERE tuc.del_flag = 1 AND tuc.coupon_status = 1 AND tuc.coupon_type IN (1,2,3)
        ORDER BY tuc.receive_time
    </select>

 ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberShopTotalMapper.xml

New file
@@ -0,0 +1,7 @@
<?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="com.ruoyi.member.mapper.member.MemberShopTotalMapper">



</mapper>

 ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberTotalMapper.xml

New file
@@ -0,0 +1,7 @@
<?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="com.ruoyi.member.mapper.member.MemberTotalMapper">



</mapper>

 ruoyi-modules/ruoyi-order/pom.xml

@@ -106,7 +106,11 @@
            <artifactId>mybatis-plus-generate</artifactId>
            <version>2.3</version>
        </dependency>

        <dependency>
            <groupId>com.github.wechatpay-apiv3</groupId>
            <artifactId>wechatpay-java</artifactId>
            <version>0.2.7</version>
        </dependency>


    </dependencies>

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java

@@ -40,7 +40,7 @@



    /*@RequestMapping(value = "/verifyCode", method = RequestMethod.POST)
    @RequestMapping(value = "/verifyCode", method = RequestMethod.POST)
    @ApiOperation(value = "核销code")
    public R<MerVerifyCodeVo> verifyCode(@RequestBody MerVerifyCodeDto merVerifyCodeDto) {
        Long userId = SecurityUtils.getUserId();
@@ -136,5 +136,5 @@
        log.info("merMemberNoClearOrderDto----"+merMemberNoClearOrderDto.toString());
        List<MerMemberNoClearOrderVo> merMemberNoClearOrderVoList = orderService.pageMerMemberOrder(page,merMemberNoClearOrderDto);
        return R.ok(page.setRecords(merMemberNoClearOrderVoList));
    }*/
    }
}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppBuyGoodsDto.java

@@ -23,6 +23,6 @@
    private Integer buyNum;

    @ApiModelProperty(value = "用户优惠券id")
    private Long userCouponId;
    private Long memberCouponId;

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderGoodsVo.java

@@ -1,6 +1,6 @@
package com.ruoyi.order.domain.vo;

import com.ruoyi.system.api.domain.vo.AppUserCouponVo;
import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -36,7 +36,7 @@
    private Integer buyNum;

    @ApiModelProperty(value = "优惠券id")
    private Long userCouponId;
    private Long memberCouponId;

    @ApiModelProperty(value = "商品售价")
    private BigDecimal goodsPrice;
@@ -57,6 +57,6 @@
    private BigDecimal goodsRealPrice;

    @ApiModelProperty(value = "优惠券列表")
    private List<AppUserCouponVo> appUserCouponVoList;
    private List<AppMemberCouponVo> appMemberCouponVoList;

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java

@@ -27,7 +27,7 @@
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.domain.vo.AppOrderTotalVo;
import com.ruoyi.system.api.domain.vo.AppUserCouponVo;
import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
import com.ruoyi.order.mapper.order.OrderMapper;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
@@ -92,15 +92,15 @@
        String goodsId;
        Integer buyNum;
        BigDecimal buyNumBig;
        Long userCouponId;
        Long memberCouponId;
        Goods goods;
        BigDecimal goodsPrice;
        BigDecimal goodsTotalPrice;
        BigDecimal goodsRealPrice;
        List<AppUserCouponVo> appUserCouponVoList = remoteMemberService.listVoUserCouponByUserId(userId).getData();
        List<AppUserCouponVo> appGoodsUserCouponVoList;
        Map<Long,AppUserCouponVo> appUserCouponVoMap = appUserCouponVoList.stream().collect(Collectors.toMap(AppUserCouponVo::getUserCouponId, Function.identity()));
        AppUserCouponVo appUserCouponVo;
        List<AppMemberCouponVo> appMemberCouponVoList = remoteMemberService.listVoMemberCouponByUserId(userId).getData();
        List<AppMemberCouponVo> appGoodsMemberCouponVoList;
        Map<Long,AppMemberCouponVo> appMemberCouponVoMap = appMemberCouponVoList.stream().collect(Collectors.toMap(AppMemberCouponVo::getMemberCouponId, Function.identity()));
        AppMemberCouponVo appMemberCouponVo;
        Integer couponType;
        BigDecimal moneyThreshold;
        BigDecimal discountMoney = new BigDecimal("0.00");
@@ -117,7 +117,7 @@
            useCoupon = 0;
            goodsId = appBuyGoodsDto.getGoodsId();
            buyNum = appBuyGoodsDto.getBuyNum();
            userCouponId = appBuyGoodsDto.getUserCouponId();
            memberCouponId = appBuyGoodsDto.getMemberCouponId();
            goods = remoteGoodsService.getGoods(goodsId).getData();
            appSureOrderGoodsVo.setGoodsId(goodsId);
            appSureOrderGoodsVo.setGoodsName(goods.getGoodsName());
@@ -141,24 +141,24 @@
            buyNumBig = BigDecimal.valueOf(buyNum);
            goodsTotalPrice = goodsPrice.multiply(buyNumBig);
            goodsRealPrice = goodsTotalPrice;
            if(userCouponId!=null){
                appUserCouponVo = appUserCouponVoMap.get(userCouponId);
                if(StringUtils.isBlank(appUserCouponVo.getRelGoodsIds()) || appUserCouponVo.getRelGoodsIds().contains(goodsId)){
                    couponType = appUserCouponVo.getCouponType();
                    if(couponType == 1 && appUserCouponVo.getMoneyThreshold()!=null && appUserCouponVo.getDiscountMoney()!=null){
                        moneyThreshold = appUserCouponVo.getMoneyThreshold();
            if(memberCouponId!=null){
                appMemberCouponVo = appMemberCouponVoMap.get(memberCouponId);
                if(StringUtils.isBlank(appMemberCouponVo.getRelGoodsIds()) || appMemberCouponVo.getRelGoodsIds().contains(goodsId)){
                    couponType = appMemberCouponVo.getCouponType();
                    if(couponType == 1 && appMemberCouponVo.getMoneyThreshold()!=null && appMemberCouponVo.getDiscountMoney()!=null){
                        moneyThreshold = appMemberCouponVo.getMoneyThreshold();
                        if(goodsTotalPrice.compareTo(moneyThreshold)>=0){
                            discountMoney = appUserCouponVo.getDiscountMoney();
                            discountMoney = appMemberCouponVo.getDiscountMoney();
                            goodsRealPrice = goodsTotalPrice.subtract(discountMoney);
                            useCoupon = 1;
                        }
                    }else if(couponType == 2 && appUserCouponVo.getDiscountPercent()!=null){
                        discountPercent = appUserCouponVo.getDiscountPercent();
                    }else if(couponType == 2 && appMemberCouponVo.getDiscountPercent()!=null){
                        discountPercent = appMemberCouponVo.getDiscountPercent();
                        goodsRealPrice = goodsTotalPrice.multiply(discountPercent).divide(BigDecimal.TEN).setScale(2,BigDecimal.ROUND_HALF_UP);
                        discountMoney = goodsRealPrice.subtract(goodsTotalPrice);
                        useCoupon = 1;
                    }else if(couponType == 3 && appUserCouponVo.getDiscountMoney()!=null){
                        discountMoney = appUserCouponVo.getDiscountMoney();
                    }else if(couponType == 3 && appMemberCouponVo.getDiscountMoney()!=null){
                        discountMoney = appMemberCouponVo.getDiscountMoney();
                        goodsRealPrice = goodsTotalPrice.subtract(discountMoney);
                        useCoupon = 1;
                    }
@@ -178,16 +178,16 @@
            orderPayDeposit = orderPayDeposit.add(goodsDeposit);
            orderPayMoney = orderPayMoney.add(goodsRealPrice);
            //商品关联优惠券
            appGoodsUserCouponVoList = new ArrayList<>();
            if(appUserCouponVoList!=null && !appUserCouponVoList.isEmpty()){
                for(AppUserCouponVo entity : appUserCouponVoList){
            appGoodsMemberCouponVoList = new ArrayList<>();
            if(appMemberCouponVoList!=null && !appMemberCouponVoList.isEmpty()){
                for(AppMemberCouponVo entity : appMemberCouponVoList){
                    if(StringUtils.isBlank(entity.getRelGoodsIds())){
                        appGoodsUserCouponVoList.add(entity);
                        appGoodsMemberCouponVoList.add(entity);
                    }else if(entity.getRelGoodsIds().contains(goodsId)){
                        appGoodsUserCouponVoList.add(entity);
                        appGoodsMemberCouponVoList.add(entity);
                    }
                }
                appSureOrderGoodsVo.setAppUserCouponVoList(appGoodsUserCouponVoList);
                appSureOrderGoodsVo.setAppMemberCouponVoList(appGoodsMemberCouponVoList);
            }
            appSureOrderGoodsVoList.add(appSureOrderGoodsVo);
        }
@@ -216,14 +216,14 @@
        BigDecimal buyNumBig;
        Integer serviceNum;
        Integer goodsNum = 0;
        Long userCouponId;
        Long memberCouponId;
        Goods goods;
        BigDecimal goodsPrice;
        BigDecimal goodsTotalPrice;
        BigDecimal goodsRealPrice;
        List<AppUserCouponVo> appUserCouponVoList = remoteMemberService.listVoUserCouponByUserId(userId).getData();
        Map<Long,AppUserCouponVo> appUserCouponVoMap = appUserCouponVoList.stream().collect(Collectors.toMap(AppUserCouponVo::getUserCouponId, Function.identity()));
        AppUserCouponVo appUserCouponVo;
        List<AppMemberCouponVo> appMemberCouponVoList = remoteMemberService.listVoMemberCouponByUserId(userId).getData();
        Map<Long,AppMemberCouponVo> appMemberCouponVoMap = appMemberCouponVoList.stream().collect(Collectors.toMap(AppMemberCouponVo::getMemberCouponId, Function.identity()));
        AppMemberCouponVo appMemberCouponVo;
        Integer couponType;
        BigDecimal moneyThreshold;
        BigDecimal discountMoney = new BigDecimal("0.00");
@@ -244,7 +244,7 @@
            appSureOrderGoodsVo = new AppSureOrderGoodsVo();
            useCoupon = 0;
            goodsId = appBuyGoodsDto.getGoodsId();
            userCouponId = appBuyGoodsDto.getUserCouponId();
            memberCouponId = appBuyGoodsDto.getMemberCouponId();
            goods = remoteGoodsService.getGoods(goodsId).getData();
            appSureOrderGoodsVo.setGoodsId(goodsId);
            appSureOrderGoodsVo.setGoodsName(goods.getGoodsName());
@@ -270,24 +270,24 @@
            buyNumBig = BigDecimal.valueOf(buyNum);
            goodsTotalPrice = goodsPrice.multiply(buyNumBig);
            goodsRealPrice = goodsTotalPrice;
            if(userCouponId!=null){
                appUserCouponVo = appUserCouponVoMap.get(userCouponId);
                if(StringUtils.isBlank(appUserCouponVo.getRelGoodsIds()) || appUserCouponVo.getRelGoodsIds().contains(goodsId)){
                    couponType = appUserCouponVo.getCouponType();
                    if(couponType == 1 && appUserCouponVo.getMoneyThreshold()!=null && appUserCouponVo.getDiscountMoney()!=null){
                        moneyThreshold = appUserCouponVo.getMoneyThreshold();
            if(memberCouponId!=null){
                appMemberCouponVo = appMemberCouponVoMap.get(memberCouponId);
                if(StringUtils.isBlank(appMemberCouponVo.getRelGoodsIds()) || appMemberCouponVo.getRelGoodsIds().contains(goodsId)){
                    couponType = appMemberCouponVo.getCouponType();
                    if(couponType == 1 && appMemberCouponVo.getMoneyThreshold()!=null && appMemberCouponVo.getDiscountMoney()!=null){
                        moneyThreshold = appMemberCouponVo.getMoneyThreshold();
                        if(goodsTotalPrice.compareTo(moneyThreshold)>=0){
                            discountMoney = appUserCouponVo.getDiscountMoney();
                            discountMoney = appMemberCouponVo.getDiscountMoney();
                            goodsRealPrice = goodsTotalPrice.subtract(discountMoney);
                            useCoupon = 1;
                        }
                    }else if(couponType == 2 && appUserCouponVo.getDiscountPercent()!=null){
                        discountPercent = appUserCouponVo.getDiscountPercent();
                    }else if(couponType == 2 && appMemberCouponVo.getDiscountPercent()!=null){
                        discountPercent = appMemberCouponVo.getDiscountPercent();
                        goodsRealPrice = goodsTotalPrice.multiply(discountPercent).divide(BigDecimal.TEN).setScale(2,BigDecimal.ROUND_HALF_UP);
                        discountMoney = goodsRealPrice.subtract(goodsTotalPrice);
                        useCoupon = 1;
                    }else if(couponType == 3 && appUserCouponVo.getDiscountMoney()!=null){
                        discountMoney = appUserCouponVo.getDiscountMoney();
                    }else if(couponType == 3 && appMemberCouponVo.getDiscountMoney()!=null){
                        discountMoney = appMemberCouponVo.getDiscountMoney();
                        goodsRealPrice = goodsTotalPrice.subtract(discountMoney);
                        useCoupon = 1;
                    }
@@ -315,8 +315,8 @@
            orderGoods.setOrderId(orderId);
            orderGoods.setGoodsId(goodsId);
            orderGoods.setBuyNum(buyNum);
            if(userCouponId!=null){
                orderGoods.setCouponId(userCouponId.toString());
            if(memberCouponId!=null){
                orderGoods.setCouponId(memberCouponId.toString());
            }
            orderGoods.setGoodsPrice(goodsPrice);
            orderGoods.setGoodsTotalMoney(orderGoodsMoney);
@@ -680,18 +680,18 @@
        BigDecimal buyNumBig;
        Integer serviceNum;
        Integer goodsNum = 0;
        Long userCouponId;
        Long memberCouponId;
        Goods goods;
        BigDecimal goodsPrice;
        BigDecimal goodsTotalPrice;
        BigDecimal goodsRealPrice;
        List<AppUserCouponVo> appUserCouponVoList = remoteMemberService.listVoUserCouponByUserId(userId).getData();
        Map<Long,AppUserCouponVo> appUserCouponVoMap = new HashMap<>();
        if(null != appUserCouponVoList){
            appUserCouponVoMap = appUserCouponVoList.stream().collect(Collectors.toMap(AppUserCouponVo::getUserCouponId, Function.identity()));
        List<AppMemberCouponVo> appMemberCouponVoList = remoteMemberService.listVoMemberCouponByUserId(userId).getData();
        Map<Long,AppMemberCouponVo> appMemberCouponVoMap = new HashMap<>();
        if(null != appMemberCouponVoList){
            appMemberCouponVoMap = appMemberCouponVoList.stream().collect(Collectors.toMap(AppMemberCouponVo::getMemberCouponId, Function.identity()));
        }

        AppUserCouponVo appUserCouponVo;
        AppMemberCouponVo appMemberCouponVo;
        Integer couponType;
        BigDecimal moneyThreshold;
        BigDecimal discountMoney = new BigDecimal("0.00");
@@ -707,7 +707,7 @@
        String orderGoodsId;
        for(AppBuyGoodsDto appBuyGoodsDto : appBuyGoodsDtoList){
            goodsId = appBuyGoodsDto.getGoodsId();
            userCouponId = appBuyGoodsDto.getUserCouponId();
            memberCouponId = appBuyGoodsDto.getMemberCouponId();
            goods = remoteGoodsService.getGoods(goodsId).getData();
            buyNum = appBuyGoodsDto.getBuyNum();
            goodsPrice = goods.getSalesPrice();
@@ -724,22 +724,22 @@
            buyNumBig = BigDecimal.valueOf(buyNum);
            goodsTotalPrice = goodsPrice.multiply(buyNumBig);
            goodsRealPrice = goodsTotalPrice;
            if(userCouponId!=null){
                appUserCouponVo = appUserCouponVoMap.get(userCouponId);
                if(null != appUserCouponVo && (StringUtils.isBlank(appUserCouponVo.getRelGoodsIds()) || appUserCouponVo.getRelGoodsIds().contains(goodsId))){
                    couponType = appUserCouponVo.getCouponType();
                    if(couponType == 1 && appUserCouponVo.getMoneyThreshold()!=null && appUserCouponVo.getDiscountMoney()!=null){
                        moneyThreshold = appUserCouponVo.getMoneyThreshold();
            if(memberCouponId!=null){
                appMemberCouponVo = appMemberCouponVoMap.get(memberCouponId);
                if(null != appMemberCouponVo && (StringUtils.isBlank(appMemberCouponVo.getRelGoodsIds()) || appMemberCouponVo.getRelGoodsIds().contains(goodsId))){
                    couponType = appMemberCouponVo.getCouponType();
                    if(couponType == 1 && appMemberCouponVo.getMoneyThreshold()!=null && appMemberCouponVo.getDiscountMoney()!=null){
                        moneyThreshold = appMemberCouponVo.getMoneyThreshold();
                        if(goodsTotalPrice.compareTo(moneyThreshold)>=0){
                            discountMoney = appUserCouponVo.getDiscountMoney();
                            discountMoney = appMemberCouponVo.getDiscountMoney();
                            goodsRealPrice = goodsTotalPrice.subtract(discountMoney);
                        }
                    }else if(couponType == 2 && appUserCouponVo.getDiscountPercent()!=null){
                        discountPercent = appUserCouponVo.getDiscountPercent();
                    }else if(couponType == 2 && appMemberCouponVo.getDiscountPercent()!=null){
                        discountPercent = appMemberCouponVo.getDiscountPercent();
                        goodsRealPrice = goodsTotalPrice.multiply(discountPercent).divide(BigDecimal.TEN).setScale(2,BigDecimal.ROUND_HALF_UP);
                        discountMoney = goodsRealPrice.subtract(goodsTotalPrice);
                    }else if(couponType == 3 && appUserCouponVo.getDiscountMoney()!=null){
                        discountMoney = appUserCouponVo.getDiscountMoney();
                    }else if(couponType == 3 && appMemberCouponVo.getDiscountMoney()!=null){
                        discountMoney = appMemberCouponVo.getDiscountMoney();
                        goodsRealPrice = goodsTotalPrice.subtract(discountMoney);
                    }
                }
@@ -762,8 +762,8 @@
            orderGoods.setOrderId(orderId);
            orderGoods.setGoodsId(goodsId);
            orderGoods.setBuyNum(buyNum);
            if(null != userCouponId){
                orderGoods.setCouponId(userCouponId.toString());
            if(null != memberCouponId){
                orderGoods.setCouponId(memberCouponId.toString());
            }
            orderGoods.setGoodsPrice(goodsPrice);
            orderGoods.setGoodsTotalMoney(orderGoodsMoney);

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java

@@ -41,8 +41,7 @@
    @Autowired
    private ShopStaffService shopStaffService;

    @Autowired
    private RecommendCooperationService recommendCooperationService;


    @Autowired
    private ShopSuggestService shopSuggestService;
@@ -113,26 +112,7 @@
        return R.ok();
    }

    @RequestMapping(value = "/pageMerShopRecommend", method = RequestMethod.POST)
    @ApiOperation(value = "分页获取商户推荐列表")
    public R<Page<MerShopRecommendPageVo>> pageMerShopRecommend(@RequestBody MerShopRecommendPageDto merShopRecommendPageDto) {
        Long userId = SecurityUtils.getUserId();
        merShopRecommendPageDto.setUserId(userId);
        Page<MerShopRecommendPageVo> page = new Page<>();
        page.setSize(merShopRecommendPageDto.getPageSize());
        page.setCurrent(merShopRecommendPageDto.getPageNum());
        List<MerShopRecommendPageVo> merShopRecommendPageVoList = recommendCooperationService.pageMerShopRecommend(page,merShopRecommendPageDto);
        return R.ok(page.setRecords(merShopRecommendPageVoList));
    }

    @RequestMapping(value = "/recommendCooperation", method = RequestMethod.POST)
    @ApiOperation(value = "推荐合作")
    public R recommendCooperation(@RequestBody MerRecommendCooperationDto merRecommendCooperationDto) {
        Long userId = SecurityUtils.getUserId();
        merRecommendCooperationDto.setUserId(userId);
        recommendCooperationService.recommendCooperation(merRecommendCooperationDto);
        return R.ok();
    }

    @RequestMapping(value = "/pageMerShopSuggest", method = RequestMethod.POST)
    @ApiOperation(value = "分页获取商户建议")

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopFundRecord.java

New file
@@ -0,0 +1,88 @@
package com.ruoyi.shop.domain.pojo.shop;

import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

/**
 * <p>
 * 商户资金记录
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_shop_fund_record")
public class ShopFundRecord extends Model<ShopFundRecord> {

    private static final long serialVersionUID = 1L;

    /**
     * 记录id
     */
    @TableId(value = "record_id", type = IdType.AUTO)
    private Integer recordId;
    /**
     * 删除标记
     */
    @TableField("del_flag")
    private Integer delFlag;
    /**
     * 商户id
     */
    @TableField("shop_id")
    private Integer shopId;
    /**
     * 记录类型1订单支付2取消订单3
     */
    @TableField("record_type")
    private String recordType;
    /**
     * 变动类型1收入2支出
     */
    @TableField("change_type")
    private String changeType;
    /**
     * 变动前金额
     */
    @TableField("last_money")
    private String lastMoney;
    /**
     * 变动后金额
     */
    @TableField("current_money")
    private String currentMoney;
    /**
     * 创建时间
     */
    @TableField("create_time")
    private Date createTime;
    /**
     * 关联用户id
     */
    @TableField("relation_user_id")
    private Integer relationUserId;
    /**
     * 关联订单id
     */
    @TableField("relation_order_id")
    private String relationOrderId;


    @Override
    protected Serializable pkVal() {
        return this.recordId;
    }

}

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopProportion.java

New file
@@ -0,0 +1,73 @@
package com.ruoyi.shop.domain.pojo.shop;

import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

/**
 * <p>
 * 商户分成
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_shop_proportion")
public class ShopProportion extends Model<ShopProportion> {

    private static final long serialVersionUID = 1L;

    /**
     * 分成id
     */
    @TableId("proportion_id")
    private Integer proportionId;
    /**
     * 删除标记
     */
    @TableField("del_flag")
    private Integer delFlag;
    /**
     * 商户id
     */
    @TableField("shop_id")
    private Integer shopId;
    /**
     * 商户类型
     */
    @TableField("shop_type")
    private Integer shopType;
    /**
     * 分成比例
     */
    @TableField("proportion_percent")
    private BigDecimal proportionPercent;
    /**
     * 更新时间
     */
    @TableField("update_time")
    private Date updateTime;
    /**
     * 更新用户id
     */
    @TableField("update_user_id")
    private Integer updateUserId;


    @Override
    protected Serializable pkVal() {
        return this.proportionId;
    }

}

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopStaff.java

@@ -7,7 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;

import com.baomidou.mybatisplus.annotations.Version;
import com.baomidou.mybatisplus.annotation.Version;

import lombok.Data;
import lombok.EqualsAndHashCode;

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopSuggest.java

@@ -8,7 +8,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;

import com.baomidou.mybatisplus.annotations.Version;
import com.baomidou.mybatisplus.annotation.Version;

import lombok.Data;
import lombok.EqualsAndHashCode;

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/task/AgencyTaskRecord.java

@@ -10,7 +10,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;

import com.baomidou.mybatisplus.annotations.Version;
import com.baomidou.mybatisplus.annotation.Version;

import lombok.Data;
import lombok.EqualsAndHashCode;

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopFundRecordMapper.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.shop.mapper.shop;

import com.ruoyi.shop.domain.pojo.shop.ShopFundRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 * 商户资金记录 Mapper 接口
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
public interface ShopFundRecordMapper extends BaseMapper<ShopFundRecord> {

}

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopProportionMapper.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.shop.mapper.shop;

import com.ruoyi.shop.domain.pojo.shop.ShopProportion;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 * 商户分成 Mapper 接口
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
public interface ShopProportionMapper extends BaseMapper<ShopProportion> {

}

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopFundRecordServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.shop.service.impl.shop;

import com.ruoyi.shop.domain.pojo.shop.ShopFundRecord;
import com.ruoyi.shop.mapper.shop.ShopFundRecordMapper;
import com.ruoyi.shop.service.shop.ShopFundRecordService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 商户资金记录 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
@Service
public class ShopFundRecordServiceImpl extends ServiceImpl<ShopFundRecordMapper, ShopFundRecord> implements ShopFundRecordService {

}

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopProportionServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.shop.service.impl.shop;

import com.ruoyi.shop.domain.pojo.shop.ShopProportion;
import com.ruoyi.shop.mapper.shop.ShopProportionMapper;
import com.ruoyi.shop.service.shop.ShopProportionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 商户分成 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
@Service
public class ShopProportionServiceImpl extends ServiceImpl<ShopProportionMapper, ShopProportion> implements ShopProportionService {

}

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopFundRecordService.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.shop.service.shop;

import com.ruoyi.shop.domain.pojo.shop.ShopFundRecord;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * 商户资金记录 服务类
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
public interface ShopFundRecordService extends IService<ShopFundRecord> {

}

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopProportionService.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.shop.service.shop;

import com.ruoyi.shop.domain.pojo.shop.ShopProportion;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * 商户分成 服务类
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
public interface ShopProportionService extends IService<ShopProportion> {

}

 ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopFundRecordMapper.xml

New file
@@ -0,0 +1,7 @@
<?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="com.ruoyi.shop.mapper.shop.ShopFundRecordMapper">



</mapper>

 ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopProportionMapper.xml

New file
@@ -0,0 +1,7 @@
<?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="com.ruoyi.shop.mapper.shop.ShopProportionMapper">



</mapper>

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/business/MerConfigController.java

@@ -1,14 +1,21 @@
package com.ruoyi.system.controller.business;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.domain.dto.AppAgreementDto;
import com.ruoyi.system.domain.vo.AppAgreementVo;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.domain.dto.MerRecommendCooperationDto;
import com.ruoyi.system.domain.dto.MerShopRecommendPageDto;
import com.ruoyi.system.domain.vo.MerShopRecommendPageVo;
import com.ruoyi.system.service.config.RecommendCooperationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;

/**
 * @author jqs34
@@ -21,6 +28,28 @@
@RestController
@RequestMapping("/mer/config")
public class MerConfigController {
    

    @Autowired
    private RecommendCooperationService recommendCooperationService;

    @RequestMapping(value = "/pageMerShopRecommend", method = RequestMethod.POST)
    @ApiOperation(value = "分页获取商户推荐列表")
    public R<Page<MerShopRecommendPageVo>> pageMerShopRecommend(@RequestBody MerShopRecommendPageDto merShopRecommendPageDto) {
        Long userId = SecurityUtils.getUserId();
        merShopRecommendPageDto.setUserId(userId);
        Page<MerShopRecommendPageVo> page = new Page<>();
        page.setSize(merShopRecommendPageDto.getPageSize());
        page.setCurrent(merShopRecommendPageDto.getPageNum());
        List<MerShopRecommendPageVo> merShopRecommendPageVoList = recommendCooperationService.pageMerShopRecommend(page,merShopRecommendPageDto);
        return R.ok(page.setRecords(merShopRecommendPageVoList));
    }

    @RequestMapping(value = "/recommendCooperation", method = RequestMethod.POST)
    @ApiOperation(value = "推荐合作")
    public R recommendCooperation(@RequestBody MerRecommendCooperationDto merRecommendCooperationDto) {
        Long userId = SecurityUtils.getUserId();
        merRecommendCooperationDto.setUserId(userId);
        recommendCooperationService.recommendCooperation(merRecommendCooperationDto);
        return R.ok();
    }
}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MerRecommendCooperationDto.java

File was renamed from ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerRecommendCooperationDto.java
@@ -1,4 +1,4 @@
package com.ruoyi.shop.domain.dto;
package com.ruoyi.system.domain.dto;

import com.ruoyi.system.api.domain.dto.MerBaseDto;
import io.swagger.annotations.ApiModelProperty;

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MerShopRecommendPageDto.java

File was renamed from ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerShopRecommendPageDto.java
@@ -1,6 +1,5 @@
package com.ruoyi.shop.domain.dto;
package com.ruoyi.system.domain.dto;

import com.ruoyi.system.api.domain.dto.MerBaseDto;
import com.ruoyi.system.api.domain.dto.MerPageDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Activeness.java

New file
@@ -0,0 +1,82 @@
package com.ruoyi.system.domain.pojo.config;

import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

/**
 * <p>
 * 活跃度配置
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_activeness")
public class Activeness extends Model<Activeness> {

    private static final long serialVersionUID = 1L;

    /**
     * 活跃度id
     */
    @TableId("activeness_id")
    private Integer activenessId;
    /**
     * 删除标记
     */
    @TableField("del_flag")
    private Integer delFlag;
    /**
     * 活跃度名称
     */
    @TableField("activeness_name")
    private String activenessName;
    /**
     * 开始天数
     */
    @TableField("start_day")
    private Integer startDay;
    /**
     * 结束天数
     */
    @TableField("end_day")
    private Integer endDay;
    /**
     * 创建时间
     */
    @TableField("create_time")
    private Date createTime;
    /**
     * 创建用户id
     */
    @TableField("create_user_id")
    private Integer createUserId;
    /**
     * 更新时间
     */
    @TableField("update_time")
    private Date updateTime;
    /**
     * 更新用户id
     */
    @TableField("update_user_id")
    private Integer updateUserId;


    @Override
    protected Serializable pkVal() {
        return this.activenessId;
    }

}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Article.java

New file
@@ -0,0 +1,98 @@
package com.ruoyi.system.domain.pojo.config;

import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

/**
 * <p>
 * 关于鸿瑞堂
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_article")
public class Article extends Model<Article> {

    private static final long serialVersionUID = 1L;

    /**
     * 文章id
     */
    @TableId(value = "article_id", type = IdType.AUTO)
    private Integer articleId;
    /**
     * 删除标记
     */
    @TableField("del_flag")
    private String delFlag;
    /**
     * 分类id
     */
    @TableField("class_id")
    private Integer classId;
    /**
     * 文章排序
     */
    @TableField("article_sort")
    private Integer articleSort;
    /**
     * 文章标题
     */
    @TableField("article_title")
    private String articleTitle;
    /**
     * 文章详情
     */
    @TableField("article_detail")
    private String articleDetail;
    /**
     * 文章封面
     */
    @TableField("article_cover")
    private String articleCover;
    /**
     * 文章视频
     */
    @TableField("article_video")
    private String articleVideo;
    /**
     * 创建时间
     */
    @TableField("create_time")
    private Date createTime;
    /**
     * 创建用户id
     */
    @TableField("create_user_id")
    private Integer createUserId;
    /**
     * 更新时间
     */
    @TableField("update_time")
    private Date updateTime;
    /**
     * 更新用户id
     */
    @TableField("update_user_id")
    private Integer updateUserId;


    @Override
    protected Serializable pkVal() {
        return this.articleId;
    }

}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Cooperation.java

New file
@@ -0,0 +1,67 @@
package com.ruoyi.system.domain.pojo.config;

import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

/**
 * <p>
 * 合作
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_cooperation")
public class Cooperation extends Model<Cooperation> {

    private static final long serialVersionUID = 1L;

    /**
     * 合作id
     */
    @TableId("cooper_id")
    private Integer cooperId;
    /**
     * 删除标记
     */
    @TableField("del_flag")
    private Integer delFlag;
    /**
     * 顶部图片
     */
    @TableField("top_picture")
    private String topPicture;
    /**
     * 文章详情
     */
    @TableField("cooper_detail")
    private String cooperDetail;
    /**
     * 创建时间
     */
    @TableField("create_time")
    private Date createTime;
    /**
     * 创建用户id
     */
    @TableField("create_user_id")
    private Integer createUserId;


    @Override
    protected Serializable pkVal() {
        return this.cooperId;
    }

}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/RecommendCooperation.java

File was renamed from ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/RecommendCooperation.java
@@ -1,4 +1,4 @@
package com.ruoyi.shop.domain.pojo.shop;
package com.ruoyi.system.domain.pojo.config;

import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/StaffSuggest.java

New file
@@ -0,0 +1,83 @@
package com.ruoyi.system.domain.pojo.config;

import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

/**
 * <p>
 * 员工建议
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_staff_suggest")
public class StaffSuggest extends Model<StaffSuggest> {

    private static final long serialVersionUID = 1L;

    /**
     * 建议id
     */
    @TableId(value = "suggest_id", type = IdType.AUTO)
    private Integer suggestId;
    /**
     * 删除标记
     */
    @TableField("del_flag")
    private Integer delFlag;
    /**
     * 建议内容
     */
    @TableField("suggest_content")
    private String suggestContent;
    /**
     * 创建时间
     */
    @TableField("create_time")
    private Date createTime;
    /**
     * 创建人id
     */
    @TableField("create_user_id")
    private Integer createUserId;
    /**
     * 回复内容
     */
    @TableField("replay_content")
    private String replayContent;
    /**
     * 回复用户id
     */
    @TableField("replay_user_id")
    private Integer replayUserId;
    /**
     * 回复时间
     */
    @TableField("replay_time")
    private Date replayTime;
    /**
     * 商户id
     */
    @TableField("shop_id")
    private Integer shopId;


    @Override
    protected Serializable pkVal() {
        return this.suggestId;
    }

}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MerShopRecommendPageVo.java

File was renamed from ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerShopRecommendPageVo.java
@@ -1,9 +1,5 @@
package com.ruoyi.shop.domain.vo;
package com.ruoyi.system.domain.vo;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.system.api.domain.dto.MerPageDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;


 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/ActivenessMapper.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.mapper.config;

import com.ruoyi.system.domain.pojo.config.Activeness;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 * 活跃度配置 Mapper 接口
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
public interface ActivenessMapper extends BaseMapper<Activeness> {

}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/ArticleMapper.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.mapper.config;

import com.ruoyi.system.domain.pojo.config.Article;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 * 关于鸿瑞堂 Mapper 接口
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
public interface ArticleMapper extends BaseMapper<Article> {

}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/CooperationMapper.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.mapper.config;

import com.ruoyi.system.domain.pojo.config.Cooperation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 * 合作 Mapper 接口
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
public interface CooperationMapper extends BaseMapper<Cooperation> {

}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/RecommendCooperationMapper.java

File was renamed from ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/RecommendCooperationMapper.java
@@ -1,10 +1,10 @@
package com.ruoyi.shop.mapper.shop;
package com.ruoyi.system.mapper.config;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.shop.domain.dto.MerShopRecommendPageDto;
import com.ruoyi.shop.domain.pojo.shop.RecommendCooperation;
import com.ruoyi.shop.domain.vo.MerShopRecommendPageVo;
import com.ruoyi.system.domain.dto.MerShopRecommendPageDto;
import com.ruoyi.system.domain.pojo.config.RecommendCooperation;
import com.ruoyi.system.domain.vo.MerShopRecommendPageVo;
import org.apache.ibatis.annotations.Param;

import java.util.List;

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/StaffSuggestMapper.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.mapper.config;

import com.ruoyi.system.domain.pojo.config.StaffSuggest;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 * 员工建议 Mapper 接口
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
public interface StaffSuggestMapper extends BaseMapper<StaffSuggest> {

}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/sys/SysUserMapper.java

@@ -3,7 +3,6 @@
import java.util.List;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.pojo.coupon.Coupon;
import org.apache.ibatis.annotations.Param;
import com.ruoyi.system.api.domain.poji.sys.SysUser;


 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/ActivenessService.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.service.config;

import com.ruoyi.system.domain.pojo.config.Activeness;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * 活跃度配置 服务类
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
public interface ActivenessService extends IService<Activeness> {

}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/ArticleService.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.service.config;

import com.ruoyi.system.domain.pojo.config.Article;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * 关于鸿瑞堂 服务类
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
public interface ArticleService extends IService<Article> {

}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/CooperationService.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.service.config;

import com.ruoyi.system.domain.pojo.config.Cooperation;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * 合作 服务类
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
public interface CooperationService extends IService<Cooperation> {

}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/RecommendCooperationService.java

File was renamed from ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/RecommendCooperationService.java
@@ -1,11 +1,11 @@
package com.ruoyi.shop.service.shop;
package com.ruoyi.system.service.config;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.shop.domain.dto.MerRecommendCooperationDto;
import com.ruoyi.shop.domain.dto.MerShopRecommendPageDto;
import com.ruoyi.shop.domain.pojo.shop.RecommendCooperation;
import com.ruoyi.shop.domain.vo.MerShopRecommendPageVo;
import com.ruoyi.system.domain.dto.MerRecommendCooperationDto;
import com.ruoyi.system.domain.dto.MerShopRecommendPageDto;
import com.ruoyi.system.domain.pojo.config.RecommendCooperation;
import com.ruoyi.system.domain.vo.MerShopRecommendPageVo;

import java.util.List;


 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/StaffSuggestService.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.service.config;

import com.ruoyi.system.domain.pojo.config.StaffSuggest;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * 员工建议 服务类
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
public interface StaffSuggestService extends IService<StaffSuggest> {

}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ActivenessServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.system.service.impl.config;

import com.ruoyi.system.domain.pojo.config.Activeness;
import com.ruoyi.system.mapper.config.ActivenessMapper;
import com.ruoyi.system.service.config.ActivenessService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 活跃度配置 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
@Service
public class ActivenessServiceImpl extends ServiceImpl<ActivenessMapper, Activeness> implements ActivenessService {

}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ArticleServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.system.service.impl.config;

import com.ruoyi.system.domain.pojo.config.Article;
import com.ruoyi.system.mapper.config.ArticleMapper;
import com.ruoyi.system.service.config.ArticleService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 关于鸿瑞堂 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
@Service
public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article> implements ArticleService {

}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CooperationServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.system.service.impl.config;

import com.ruoyi.system.domain.pojo.config.Cooperation;
import com.ruoyi.system.mapper.config.CooperationMapper;
import com.ruoyi.system.service.config.CooperationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 合作 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
@Service
public class CooperationServiceImpl extends ServiceImpl<CooperationMapper, Cooperation> implements CooperationService {

}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RecommendCooperationServiceImpl.java

File was renamed from ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/RecommendCooperationServiceImpl.java
@@ -1,15 +1,15 @@
package com.ruoyi.shop.service.impl.shop;
package com.ruoyi.system.service.impl.config;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.shop.domain.dto.MerRecommendCooperationDto;
import com.ruoyi.shop.domain.dto.MerShopRecommendPageDto;
import com.ruoyi.shop.domain.pojo.shop.RecommendCooperation;
import com.ruoyi.shop.domain.vo.MerShopRecommendPageVo;
import com.ruoyi.shop.mapper.shop.RecommendCooperationMapper;
import com.ruoyi.shop.service.shop.RecommendCooperationService;
import com.ruoyi.system.domain.dto.MerRecommendCooperationDto;
import com.ruoyi.system.domain.dto.MerShopRecommendPageDto;
import com.ruoyi.system.domain.pojo.config.RecommendCooperation;
import com.ruoyi.system.domain.vo.MerShopRecommendPageVo;
import com.ruoyi.system.mapper.config.RecommendCooperationMapper;
import com.ruoyi.system.service.config.RecommendCooperationService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/StaffSuggestServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.system.service.impl.config;

import com.ruoyi.system.domain.pojo.config.StaffSuggest;
import com.ruoyi.system.mapper.config.StaffSuggestMapper;
import com.ruoyi.system.service.config.StaffSuggestService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 员工建议 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-05-25
 */
@Service
public class StaffSuggestServiceImpl extends ServiceImpl<StaffSuggestMapper, StaffSuggest> implements StaffSuggestService {

}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysUserServiceImpl.java

@@ -7,17 +7,10 @@
import javax.annotation.Resource;
import javax.validation.Validator;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.api.domain.dto.AppEditUserDto;
import com.ruoyi.system.api.domain.poji.config.SysTag;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.domain.pojo.coupon.Coupon;
import com.ruoyi.system.mapper.coupon.CouponMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -40,7 +33,6 @@
import com.ruoyi.system.mapper.sys.SysUserRoleMapper;
import com.ruoyi.system.service.sys.ISysConfigService;
import com.ruoyi.system.service.sys.ISysUserService;
import org.springframework.util.ObjectUtils;

/**
 * 用户 业务层处理

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/sys/ISysUserService.java

@@ -5,7 +5,6 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.api.domain.dto.AppEditUserDto;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.domain.pojo.coupon.Coupon;

/**
 * 用户 业务层

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/ActivenessMapper.xml

New file
@@ -0,0 +1,7 @@
<?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="com.ruoyi.system.mapper.config.ActivenessMapper">



</mapper>

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/ArticleMapper.xml

New file
@@ -0,0 +1,7 @@
<?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="com.ruoyi.system.mapper.config.ArticleMapper">



</mapper>

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/CooperationMapper.xml

New file
@@ -0,0 +1,7 @@
<?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="com.ruoyi.system.mapper.config.CooperationMapper">



</mapper>

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/RecommendCooperationMapper.xml

File was renamed from ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/RecommendCooperationMapper.xml
@@ -1,8 +1,8 @@
<?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="com.ruoyi.shop.mapper.shop.RecommendCooperationMapper">
<mapper namespace="com.ruoyi.system.mapper.config.RecommendCooperationMapper">

    <select id="pageMerShopRecommend" resultType="com.ruoyi.shop.domain.vo.MerShopRecommendPageVo">
    <select id="pageMerShopRecommend" resultType="com.ruoyi.system.domain.vo.MerShopRecommendPageVo">
        SELECT
        id id,
        corp_status corpStatus,

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/StaffSuggestMapper.xml

New file
@@ -0,0 +1,7 @@
<?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="com.ruoyi.system.mapper.config.StaffSuggestMapper">



</mapper>