DEMO初步完成

jiangqs

2023-05-10 d3abd08d49bd74000d57bd3ba97537f4fc14fa2b

DEMO初步完成

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MerMemberTagEditDto.java

@@ -15,11 +15,11 @@
public class MerMemberTagEditDto extends MerBaseDto {


    @ApiModelProperty(name = "会员用户id")
    @ApiModelProperty(value = "会员用户id")
    private Long memberUserId;


    @ApiModelProperty(name = "用户标签多个用,号隔开")
    @ApiModelProperty(value = "用户标签多个用,号隔开")
    private String userTags;



 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppUserInfoVo.java

@@ -26,10 +26,10 @@
    @ApiModelProperty("会员编号")
    private String memberNo;

    @ApiModelProperty(name = "用户名称")
    @ApiModelProperty(value = "用户名称")
    private String nickName;

    @ApiModelProperty(name = "手机号码")
    @ApiModelProperty(value = "手机号码")
    private String phonenumber;

    @ApiModelProperty("关联商户")

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberBasicFileVo.java

@@ -20,30 +20,30 @@
    @ApiModelProperty(value = "用户id")
    private Long userId;

    @ApiModelProperty(name = "用户名称")
    @ApiModelProperty(value = "用户名称")
    private String nickName;

    @ApiModelProperty(name = "手机号码")
    @ApiModelProperty(value = "手机号码")
    private String phonenumber;

    @ApiModelProperty(name = "性别0=男,1=女,2=未知")
    @ApiModelProperty(value = "性别0=男,1=女,2=未知")
    private Integer gender;

    @ApiModelProperty(name = "推荐人")
    @ApiModelProperty(value = "推荐人")
    private String referrer;

    @ApiModelProperty(name = "顾客来源")
    @ApiModelProperty(value = "顾客来源")
    private String customerSource;

    @ApiModelProperty(name = "等级")
    @ApiModelProperty(value = "等级")
    private String level;

    @ApiModelProperty(name = "生日")
    @ApiModelProperty(value = "生日")
    private String birthday;

    @ApiModelProperty(name = "调理问题")
    @ApiModelProperty(value = "调理问题")
    private List<String> memberNurse;

    @ApiModelProperty(name = "创建时间")
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberInfoVo.java

@@ -19,10 +19,10 @@
    @ApiModelProperty(value = "用户id")
    private Long userId;

    @ApiModelProperty(name = "用户名称")
    @ApiModelProperty(value = "用户名称")
    private String nickName;

    @ApiModelProperty(name = "手机号码")
    @ApiModelProperty(value = "手机号码")
    private String phonenumber;

    @ApiModelProperty("用户头像")

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberTagVo.java

@@ -13,9 +13,9 @@
@Data
public class MerMemberTagVo {

    @ApiModelProperty(name="标签")
    @ApiModelProperty(value="标签")
    private String tagName;

    @ApiModelProperty(name="选择标记0否1是")
    @ApiModelProperty(value="选择标记0否1是")
    private Integer selectFlag;
}

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

@@ -15,7 +15,7 @@
@Data
public class MerConsumerGoodsDto extends MerBaseDto {

    @ApiModelProperty(name = "会员用户id")
    @ApiModelProperty(value = "会员用户id")
    private Long memberUserId;

    @ApiModelProperty("商品类型1周期2服务3体验")

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

@@ -15,7 +15,7 @@
@Data
public class MerConsumerGoodsPageDto extends MerPageDto {

    @ApiModelProperty(name = "会员用户id")
    @ApiModelProperty(value = "会员用户id")
    private Long memberUserId;

    @ApiModelProperty("商品类型1周期2服务3体验")

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

@@ -15,9 +15,12 @@
public class MerOrderPageDto extends MerPageDto {



    @ApiModelProperty(value = "会员用户id")
    private Long memberUserId;

    @ApiModelProperty(value = "搜索关键词")
    private String keyword;


    @ApiModelProperty(value = "1.全部2.待核销3.已核销")
    private Integer type;

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

@@ -16,10 +16,10 @@
@Data
public class MerSureConsumerGoodsDto extends MerBaseDto {

    @ApiModelProperty(name = "会员用户id")
    @ApiModelProperty(value = "会员用户id")
    private Long memberUserId;

    @ApiModelProperty(name = "确认服务列表")
    @ApiModelProperty(value = "确认服务列表")
    private List<MerSureConsumerGoodsListDto> merSureConsumerGoodsListDtoList;

}

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

@@ -14,9 +14,9 @@
public class MerSureConsumerGoodsListDto {


    @ApiModelProperty(name = "服务id")
    @ApiModelProperty(value = "服务id")
    private String consumerGoodsId;

    @ApiModelProperty(name = "服务次数")
    @ApiModelProperty(value = "服务次数")
    private Integer serviceNum;
}

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

@@ -4,6 +4,7 @@
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

/**
@@ -22,6 +23,9 @@
    @ApiModelProperty("订单编号")
    private String orderNo;

    @ApiModelProperty("订单状态")
    private Integer orderStatus;

    @ApiModelProperty(value = "商品总价")
    private BigDecimal orderGoodsMoney;

@@ -39,4 +43,7 @@

    @ApiModelProperty("订单未支付金额")
    private BigDecimal unPaidMoney;

    @ApiModelProperty("创建时间")
    private Date createTime;
}

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

@@ -696,7 +696,9 @@
            orderGoods.setOrderId(orderId);
            orderGoods.setGoodsId(goodsId);
            orderGoods.setBuyNum(buyNum);
            if(StringUtils.isNotBlank(userCouponId.toString())){
            orderGoods.setCouponId(userCouponId.toString());
            }
            orderGoods.setGoodsPrice(goodsPrice);
            orderGoods.setGoodsTotalMoney(orderGoodsMoney);
            orderGoods.setGoodsReceivableMoney(goodsRealPrice);

 ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml

@@ -231,13 +231,15 @@
        SELECT
        toc.order_id orderId,
        toc.order_no orderNo,
        toc.order_status orderStatus,
        toc.order_money orderGoodsMoney,
        toc.coupon_money couponDiscount,
        toc.receivable_money receivableMoney,
        toc.receivable_deposit receivableDeposit,
        toc.pay_money payMoney
        toc.pay_money payMoney,
        toc.create_time createTime
        FROM t_order toc
        WHERE toc.del_flag = 0 AND toc.user_id = #{userId} AND toc.orderStatus = 2 AND toc.close_flag = 0
        WHERE toc.del_flag = 0 AND toc.user_id = #{userId} AND toc.order_status = 2 AND toc.close_flag = 0
        ORDER BY toc.create_time DESC
    </select>

@@ -262,6 +264,9 @@
        INNER JOIN t_order_goods tog ON tog.order_id = toc.order_id
        INNER JOIN t_goods tg ON tg.goods_id = tog.goods_id
        WHERE toc.del_flag = 0
        <if test="param.memberUserId != null and param.memberUserId != ''">
            AND toc.user_id = #{param.memberUserId}
        </if>
        <if test="param.type != null and param.type ==1 ">
            AND (toc.order_status = 2 OR toc.order_status = 3)
        </if>
@@ -281,13 +286,14 @@
        SELECT
        toc.order_id orderId,
        toc.order_no orderNo,
        toc.order_status orderStatus,
        toc.order_money orderGoodsMoney,
        toc.coupon_money couponDiscount,
        toc.receivable_money receivableMoney,
        toc.receivable_deposit receivableDeposit,
        toc.pay_money payMoney
        FROM t_order toc
        WHERE toc.del_flag = 0 AND toc.user_id = #{userId} AND (toc.orderStatus = 2 OR toc.orderStatus = 3)
        WHERE toc.del_flag = 0 AND toc.user_id = #{userId} AND (toc.order_status = 2 OR toc.order_status = 3)
        ORDER BY toc.create_time DESC
    </select>
</mapper>

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerAgencyPageDto.java

@@ -14,10 +14,10 @@
@Data
public class MerAgencyPageDto extends MerPageDto {

    @ApiModelProperty(name = "商户id")
    @ApiModelProperty(value = "商户id")
    private Long shopId;

    @ApiModelProperty(name = "搜索关键词")
    @ApiModelProperty(value = "搜索关键词")
    private String keyword ;



 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerAgencyTaskPageDto.java

@@ -16,12 +16,12 @@
@Data
public class MerAgencyTaskPageDto extends MerPageDto {

    @ApiModelProperty(name = "代理商id")
    @ApiModelProperty(value = "代理商id")
    private Long agencyId;

    @ApiModelProperty(name = "任务状态0未开始1待处理2已处理3已过期")
    @ApiModelProperty(value = "任务状态0未开始1待处理2已处理3已过期")
    private Integer taskStatus;

    @ApiModelProperty(name = "现在日期",hidden = true)
    @ApiModelProperty(value = "现在日期",hidden = true)
    private String nowDay;
}

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerCreateAgencyTaskDto.java

@@ -14,13 +14,13 @@
@Data
public class MerCreateAgencyTaskDto extends MerBaseDto {

    @ApiModelProperty(name = "跟进代理商id")
    @ApiModelProperty(value = "跟进代理商id")
    private Long agencyId;

    @ApiModelProperty(name = "任务时间")
    @ApiModelProperty(value = "任务时间")
    private String taskDate;

    @ApiModelProperty(name = "任务内容")
    @ApiModelProperty(value = "任务内容")
    private String taskContent;



 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerCreateMemberTaskDto.java

@@ -16,13 +16,13 @@
@Data
public class MerCreateMemberTaskDto extends MerBaseDto {

    @ApiModelProperty(name = "跟进会员用户id")
    @ApiModelProperty(value = "跟进会员用户id")
    private Long memberUserId;

    @ApiModelProperty(name = "任务时间")
    @ApiModelProperty(value = "任务时间")
    private String taskDate;

    @ApiModelProperty(name = "任务内容")
    @ApiModelProperty(value = "任务内容")
    private String taskContent;



 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowAgencyTaskDto.java

@@ -16,7 +16,7 @@
@Data
public class MerFollowAgencyTaskDto extends MerBaseDto {

    @ApiModelProperty(name = "任务id")
    @ApiModelProperty(value = "任务id")
    private String taskId;

    @ApiModelProperty("跟踪类型1电话2手动")

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerFollowMemberTaskDto.java

@@ -18,7 +18,7 @@
@Data
public class MerFollowMemberTaskDto extends MerBaseDto {

    @ApiModelProperty(name = "任务id")
    @ApiModelProperty(value = "任务id")
    private String taskId;

    @ApiModelProperty("跟踪类型1电话2手动")

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerMemberTaskPageDto.java

@@ -14,9 +14,9 @@
@Data
public class MerMemberTaskPageDto extends MerPageDto {

    @ApiModelProperty(name = "会员用户id")
    @ApiModelProperty(value = "会员用户id")
    private Long memberUserId;

    @ApiModelProperty(name = "今日",hidden = true)
    @ApiModelProperty(value = "今日",hidden = true)
    private String today;
}

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

@@ -14,12 +14,12 @@
@Data
public class MerRecommendCooperationDto extends MerBaseDto {

    @ApiModelProperty(name = "被推荐人")
    @ApiModelProperty(value = "被推荐人")
    private String recommendedName;

    @ApiModelProperty(name = "被推荐人电话")
    @ApiModelProperty(value = "被推荐人电话")
    private String recommendedPhone;

    @ApiModelProperty(name = "备注")
    @ApiModelProperty(value = "备注")
    private String remark;
}

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerShopCertificateEditDto.java

@@ -1,5 +1,6 @@
package com.ruoyi.shop.domain.dto;

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

@@ -11,17 +12,17 @@
 * @version: 1.0
 */
@Data
public class MerShopCertificateEditDto {
public class MerShopCertificateEditDto extends MerBaseDto {

    @ApiModelProperty(name = "证书id 新增不传")
    @ApiModelProperty(value = "证书id 新增不传")
    private Long cerId;

    @ApiModelProperty(name = "证书名字")
    @ApiModelProperty(value = "证书名字")
    private String cerName;

    @ApiModelProperty(name = "证书编号")
    @ApiModelProperty(value = "证书编号")
    private String cerNumber;

    @ApiModelProperty(name = "证书图片")
    @ApiModelProperty(value = "证书图片")
    private String cerPicture;
}

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerShopCertificateListDto.java

@@ -16,6 +16,6 @@
public class MerShopCertificateListDto extends MerBaseDto {


    @ApiModelProperty(name = "状态1审核通过2审核中")
    @ApiModelProperty(value = "状态1审核通过2审核中")
    private Integer status;
}

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

@@ -15,6 +15,6 @@
@Data
public class MerShopRecommendPageDto extends MerPageDto {

    @ApiModelProperty(name = "搜索关键词")
    @ApiModelProperty(value = "搜索关键词")
    private String keyword;
}

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MerShopSuggestDto.java

@@ -16,7 +16,7 @@
@Data
public class MerShopSuggestDto extends MerBaseDto {

    @ApiModelProperty(name = "建议内容")
    @ApiModelProperty(value = "建议内容")
    private String suggestContent;

}

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerAgencyTaskPageVo.java

@@ -15,10 +15,10 @@
@Data
public class MerAgencyTaskPageVo {

    @ApiModelProperty(name = "任务id")
    @ApiModelProperty(value = "任务id")
    private String taskId;

    @ApiModelProperty(name = "任务时间")
    @ApiModelProperty(value = "任务时间")
    private String taskDate;

    @ApiModelProperty("任务内容")

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerAgencyTaskRecordPageVo.java

@@ -16,13 +16,13 @@
@Data
public class MerAgencyTaskRecordPageVo {

    @ApiModelProperty(name = "跟进id")
    @ApiModelProperty(value = "跟进id")
    private Long followId;

    @ApiModelProperty(name = "任务id")
    @ApiModelProperty(value = "任务id")
    private String taskId;

    @ApiModelProperty(name = "任务时间")
    @ApiModelProperty(value = "任务时间")
    private String taskDate;

    @ApiModelProperty("跟踪类型1电话2手动")

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerMemberTaskPageVo.java

@@ -17,10 +17,10 @@
@Data
public class MerMemberTaskPageVo {

    @ApiModelProperty(name = "任务id")
    @ApiModelProperty(value = "任务id")
    private String taskId;

    @ApiModelProperty(name = "任务时间")
    @ApiModelProperty(value = "任务时间")
    private String taskDate;

    @ApiModelProperty("任务内容")

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerMemberTaskRecordPageVo.java

@@ -16,13 +16,13 @@
@Data
public class MerMemberTaskRecordPageVo {

    @ApiModelProperty(name = "跟进id")
    @ApiModelProperty(value = "跟进id")
    private Long followId;

    @ApiModelProperty(name = "任务id")
    @ApiModelProperty(value = "任务id")
    private String taskId;

    @ApiModelProperty(name = "任务时间")
    @ApiModelProperty(value = "任务时间")
    private String taskDate;

    @ApiModelProperty("跟踪类型1电话2手动")

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerShopCertificateListVo.java

@@ -17,16 +17,19 @@
public class MerShopCertificateListVo {


    @ApiModelProperty(name = "证书id")
    @ApiModelProperty(value = "证书id")
    private Long cerId;

    @ApiModelProperty(name = "证书名字")
    @ApiModelProperty(value = "证书名字")
    private String cerName;

    @ApiModelProperty(name = "证书编号")
    @ApiModelProperty(value = "证书编号")
    private String cerNumber;

    @ApiModelProperty(name = "证书图片")
    @ApiModelProperty(value = "证书图片")
    private String cerPicture;

    @ApiModelProperty(value = "证书状态-1删除0待审核1审核通过2审核拒绝")
    private Integer cerStatus;

}

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

@@ -17,18 +17,18 @@
@Data
public class MerShopRecommendPageVo {

    @ApiModelProperty(name = "推荐id")
    @ApiModelProperty(value = "推荐id")
    private Long id;

    @ApiModelProperty(name = "签约状态1.未签约2已签约")
    @ApiModelProperty(value = "签约状态1.未签约2已签约")
    private Integer corpStatus;

    @ApiModelProperty(name = "被推荐人")
    @ApiModelProperty(value = "被推荐人")
    private String recommendedName;

    @ApiModelProperty(name = "被推荐人电话")
    @ApiModelProperty(value = "被推荐人电话")
    private String recommendedPhone;

    @ApiModelProperty(name = "备注")
    @ApiModelProperty(value = "备注")
    private String remark;
}

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MerShopSuggestVo.java

@@ -17,14 +17,14 @@
public class MerShopSuggestVo {


    @ApiModelProperty(name = "建议内容")
    @ApiModelProperty(value = "建议内容")
    private String suggestContent;


    @ApiModelProperty(name = "回复内容")
    @ApiModelProperty(value = "回复内容")
    private String replayContent;


    @ApiModelProperty(name = "创建时间")
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
}

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

@@ -12,6 +12,7 @@
import org.springframework.stereotype.Service;

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

/**
@@ -50,6 +51,7 @@
        shopSuggest.setCreateUserId(merShopSuggestDto.getUserId());
        shopSuggest.setShopId(merShopSuggestDto.getShopId());
        shopSuggest.setSuggestContent(merShopSuggestDto.getSuggestContent());
        shopSuggest.setCreateTime(new Date());
        this.save(shopSuggest);
    }
}

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

@@ -81,7 +81,8 @@
        cer_id cerId,
        cer_name cerName,
        cer_number cerNumber,
        cer_picture cerPicture
        cer_picture cerPicture,
        cer_status cerStatus
        FROM t_shop_certificate
        WHERE del_flag = 0 AND shop_id = #{param.shopId}
        <if test="param.status != null and param.status == 1">

 ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/AgencyTaskRecordMapper.xml

@@ -19,13 +19,13 @@
        tmtr.id followId,
        tmtr.task_id taskId,
        tmt.task_date taskDate,
        tmtr.followType followType,
        tmtr.callTime callTime,
        tmtr.followContent followContent,
        tmtr.callPhone callPhone
        tmtr.follow_type followType,
        tmtr.call_time callTime,
        tmtr.follow_content followContent,
        tmtr.call_phone callPhone
        FROM t_agency_task tmt
        INNER JOIN t_agency_task_record tmtr ON tmtr.task_id = tmt.task_id
        WHERE del_flag = 0 AND shop_id = #{param.shopId} AND agency_id = #{param.agencyId}
        WHERE tmt.del_flag = 0 AND tmt.shop_id = #{param.shopId} AND tmt.agency_id = #{param.agencyId}
        ORDER BY tmt.task_date DESC
    </select>
</mapper>

 ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskRecordMapper.xml

@@ -82,13 +82,13 @@
        tmtr.id followId,
        tmtr.task_id taskId,
        tmt.task_date taskDate,
        tmtr.followType followType,
        tmtr.callTime callTime,
        tmtr.followContent followContent,
        tmtr.callPhone callPhone
        tmtr.follow_type followType,
        tmtr.call_time callTime,
        tmtr.follow_content followContent,
        tmtr.call_phone callPhone
        FROM t_member_task tmt
        INNER JOIN t_member_task_record tmtr ON tmtr.task_id = tmt.task_id
        WHERE del_flag = 0 AND shop_id = #{param.shopId} AND user_id = #{param.memberUserId}
        WHERE tmt.del_flag = 0 AND tmt.shop_id = #{param.shopId} AND tmt.user_id = #{param.memberUserId}
        ORDER BY tmt.task_date DESC
    </select>
</mapper>