商户进件支付框架补充

jiangqs

2023-06-02 ff926ba7b7fe5e7a3edffd994f605acd552a27db

商户进件支付框架补充

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/management/MgtGoodsController.java

@@ -7,7 +7,10 @@
import com.ruoyi.goods.domain.dto.MgtGoodsPageDto;
import com.ruoyi.goods.domain.vo.MerGoodsPageVo;
import com.ruoyi.goods.domain.vo.MgtGoodsPageVo;
import com.ruoyi.goods.domain.vo.MgtGoodsTotalVo;
import com.ruoyi.goods.service.goods.GoodsService;
import com.ruoyi.system.api.domain.dto.MgtBaseDto;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -46,5 +49,15 @@
        return R.ok(page.setRecords(merGoodsPageVoList));
    }

    @RequestMapping(value = "/getMgtGoodsTotal", method = RequestMethod.POST)
    @ApiOperation(value = "获取商品统计")
    public R<MgtGoodsTotalVo> getMgtGoodsTotal(@RequestBody MgtBaseDto mgtBaseDto) {
        Long userId = SecurityUtils.getUserId();
        mgtBaseDto.setUserId(userId);
        MgtGoodsTotalVo mgtGoodsTotalVo = goodsService.getMgtGoodsTotal();
        return R.ok(mgtGoodsTotalVo);
    }



}

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

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

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

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

/**
 * @author jqs34
 * @ClassName MgtGoodsEditDto
 * @description: TODO
 * @date 2023年06月02日
 * @version: 1.0
 */
@Data
public class MgtGoodsEditDto {


    @ApiModelProperty(value = "商品id")
    private String goodsId;

    @ApiModelProperty(value = "商品状态-1删除1上架2下架")
    private Integer goodsStatus;

    @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
    private Integer goodsType;

    @ApiModelProperty(value = "商品分类id")
    private Long goodsClassId;

    @ApiModelProperty(value = "商品名称")
    private String goodsName;

    @ApiModelProperty(value = "周期次数标记0否1是")
    private Integer cycleNumFlag;

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

    @ApiModelProperty(value = "商品简介")
    private String goodsIntroduction;

    @ApiModelProperty(value = "建议售价")
    private BigDecimal salesPrice;

    @ApiModelProperty(value = "最低售价")
    private BigDecimal mininumPrice;

    @ApiModelProperty(value = "订金标记0否1是")
    private Integer subscriptionFlag;

    @ApiModelProperty(value = "订金")
    private BigDecimal subscription;

    @ApiModelProperty(value = "商品详情")
    private String goodsDetail;

    @ApiModelProperty(value = "是否推荐0否1是")
    private Integer recommendFlag;

    @ApiModelProperty(value = "商品调理问题")
    private String goodsNurses;

    @ApiModelProperty(value = "商品标签")
    private String goodsTags;
    
    
    
    
}

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

New file
@@ -0,0 +1,28 @@
package com.ruoyi.goods.domain.vo;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * @author jqs34
 * @ClassName MgtGoodsTotalVo
 * @description: TODO
 * @date 2023年06月02日
 * @version: 1.0
 */
@Data
public class MgtGoodsTotalVo {

    @ApiModelProperty(value = "总商品数")
    private Integer goodsTotal;

    @ApiModelProperty(value = "销量")
    private Integer buyNumCount;

    @ApiModelProperty(value = "销售额")
    private BigDecimal buyMoneyTotal;


}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsMapper.java

@@ -3,14 +3,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.goods.domain.dto.MerGoodsPageDto;
import com.ruoyi.goods.domain.dto.MgtGoodsPageDto;
import com.ruoyi.goods.domain.vo.AppSimpleActivityGoodsVo;
import com.ruoyi.goods.domain.vo.AppSimpleGoodsVo;
import com.ruoyi.goods.domain.vo.*;
import com.ruoyi.goods.domain.dto.AppSearchGoodsPageDto;
import com.ruoyi.goods.domain.dto.AppShopGoodsPageDto;
import com.ruoyi.goods.domain.vo.MgtGoodsPageVo;
import com.ruoyi.system.api.domain.poji.goods.Goods;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.goods.domain.vo.MerGoodsPageVo;
import org.apache.ibatis.annotations.Param;

import java.util.List;
@@ -69,4 +66,11 @@
     * @return
     */
    List<MgtGoodsPageVo> pageMgtGoods(Page page, @Param("param")MgtGoodsPageDto mgtGoodsPageDto);


    /**
     *
     * @return
     */
    MgtGoodsTotalVo getMgtGoodsTotal();
}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsService.java

@@ -75,4 +75,10 @@
     * @return
     */
    List<MgtGoodsPageVo> pageMgtGoods(Page page,MgtGoodsPageDto mgtGoodsPageDto);

    /**
     *
     * @return
     */
    MgtGoodsTotalVo getMgtGoodsTotal();
}

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

@@ -230,4 +230,13 @@
        }
        return mgtGoodsPageVoList;
    }

    /**
     *
     * @return
     */
    @Override
    public MgtGoodsTotalVo getMgtGoodsTotal(){
        return goodsMapper.getMgtGoodsTotal();
    }
}

 ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsMapper.xml

@@ -358,4 +358,12 @@
            AND tg.goods_name LIKE CONCAT('%',#{param.goodsName},'%')
        </if>
    </select>

    <select id="getMgtGoodsTotal" resultType="com.ruoyi.goods.domain.vo.MgtGoodsTotalVo">
        SELECT
        COUNT(tgt.goods_id) goodsTotal,
        IFNULL(tgt.buy_num_count,0) buyNumCount,
        IFNULL(tgt.buy_money_total,0) buyMoneyTotal
        FROM t_goods_total tgt
    </select>
</mapper>

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtMemberController.java

@@ -7,7 +7,9 @@
import com.ruoyi.order.domain.dto.MgtMemberServiceRecordPageDto;
import com.ruoyi.order.domain.vo.MgtMemberOrderPageVo;
import com.ruoyi.order.domain.vo.MgtMemberServiceRecordPageVo;
import com.ruoyi.order.domain.vo.MgtMemberServiceTotalVo;
import com.ruoyi.order.service.order.UserServiceRecordService;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import com.ruoyi.system.api.domain.dto.MgtPageDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -46,5 +48,12 @@
        return R.ok(page.setRecords(list));
    }


    @RequestMapping(value = "/getMgtMemberServiceTotal", method = RequestMethod.POST)
    @ApiOperation(value = "获取会员服务统计")
    public R<MgtMemberServiceTotalVo> getMgtMemberServiceTotal(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
        Long userId = SecurityUtils.getUserId();
        mgtBaseGetDto.setUserId(userId);
        MgtMemberServiceTotalVo mgtMemberServiceTotalVo = userServiceRecordService.getMgtMemberServiceTotal(Long.valueOf(mgtBaseGetDto.getId()));
        return R.ok(mgtMemberServiceTotalVo);
    }
}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/BackMessage.java

New file
@@ -0,0 +1,57 @@
package com.ruoyi.order.domain.pojo.account;

import com.baomidou.mybatisplus.annotation.IdType;
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-06-02
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_back_message")
public class BackMessage extends Model<BackMessage> {

    private static final long serialVersionUID = 1L;

    /**
     * 报文id
     */
    @TableId(value = "message_id", type = IdType.AUTO)
    private Integer messageId;
    /**
     * 删除标记
     */
    @TableField("del_flag")
    private String delFlag;
    /**
     * 回调类型1支付回调2退款回调
     */
    @TableField("result_type")
    private Integer resultType;
    /**
     * 收到报文
     */
    @TableField("result_message")
    private String resultMessage;


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

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/FinishOrder.java

New file
@@ -0,0 +1,62 @@
package com.ruoyi.order.domain.pojo.account;

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-06-02
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_finish_order")
public class FinishOrder extends Model<FinishOrder> {

    private static final long serialVersionUID = 1L;

    /**
     * 完结id
     */
    @TableId("finish_id")
    private Integer finishId;
    /**
     * 删除标记
     */
    @TableField("del_flag")
    private Integer delFlag;
    /**
     * 商户id
     */
    @TableField("shop_id")
    private Integer shopId;
    /**
     * 订单id
     */
    @TableField("order_id")
    private String orderId;
    /**
     * 创建时间
     */
    @TableField("create_time")
    private Date createTime;


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

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/OrderPayment.java

New file
@@ -0,0 +1,113 @@
package com.ruoyi.order.domain.pojo.account;

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-06-02
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_order_payment")
public class OrderPayment extends Model<OrderPayment> {

    private static final long serialVersionUID = 1L;

    /**
     * 支付id
     */
    @TableId("payment_id")
    private String paymentId;
    /**
     * 删除标记
     */
    @TableField("del_flag")
    private Integer delFlag;
    /**
     * 用户id
     */
    @TableField("user_id")
    private Integer userId;
    /**
     * 商户id
     */
    @TableField("shop_id")
    private Integer shopId;
    /**
     * 订单id
     */
    @TableField("order_id")
    private String orderId;
    /**
     * 支付状态1发起支付2支付成功3支付失败4已关闭
     */
    @TableField("pay_status")
    private Integer payStatus;
    /**
     * 支付金额
     */
    @TableField("pay_money")
    private BigDecimal payMoney;
    /**
     * 失效时间
     */
    @TableField("time_expire")
    private Date timeExpire;
    /**
     * 分账标记
     */
    @TableField("profit_sharing")
    private Integer profitSharing;
    /**
     * 补差金额
     */
    @TableField("subsidy_amount")
    private BigDecimal subsidyAmount;
    /**
     * 用户openid
     */
    @TableField("user_open_id")
    private String userOpenId;
    /**
     * 商品信息
     */
    @TableField("goods_names")
    private String goodsNames;
    /**
     * 创建时间
     */
    @TableField("create_time")
    private Date createTime;
    /**
     * 预支付交易会话标识
     */
    @TableField("prepay_id")
    private String prepayId;
    /**
     * 回调时间
     */
    @TableField("back_time")
    private Date backTime;


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

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/OrderRefund.java

New file
@@ -0,0 +1,109 @@
package com.ruoyi.order.domain.pojo.account;

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-06-02
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_order_refund")
public class OrderRefund extends Model<OrderRefund> {

    private static final long serialVersionUID = 1L;

    /**
     * 退款id
     */
    @TableId("refund_id")
    private String refundId;
    /**
     * 删除标记
     */
    @TableField("del_flag")
    private Integer delFlag;
    /**
     * 退款类型1用户发起2用户取消3超时取消4商户发起
     */
    @TableField("refund_type")
    private Integer refundType;
    /**
     * 售后id
     */
    @TableField("after_sales_id")
    private Integer afterSalesId;
    /**
     * 订单id
     */
    @TableField("order_id")
    private String orderId;
    /**
     * 用户id
     */
    @TableField("user_id")
    private Integer userId;
    /**
     * 商户id
     */
    @TableField("shop_id")
    private Integer shopId;
    /**
     * 退款金额
     */
    @TableField("refund_money")
    private String refundMoney;
    /**
     * 退款理由
     */
    @TableField("refund_reason")
    private String refundReason;
    /**
     * 订单金额
     */
    @TableField("order_money")
    private String orderMoney;
    /**
     * 退款出资商户
REFUND_SOURCE_PARTNER_ADVANCE : 电商平台垫付，需要向微信支付申请开通
REFUND_SOURCE_SUB_MERCHANT : 二级商户，默认值
     */
    @TableField("refund_account")
    private String refundAccount;
    /**
     * 资金账户
     */
    @TableField("funds_account")
    private String fundsAccount;
    /**
     * 创建时间
     */
    @TableField("create_time")
    private Date createTime;
    /**
     * 回调时间
     */
    @TableField("back_time")
    private Date backTime;


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

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/PaymentMessage.java

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

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-06-02
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_payment_message")
public class PaymentMessage extends Model<PaymentMessage> {

    private static final long serialVersionUID = 1L;

    /**
     * 报文id
     */
    @TableId(value = "message_id", type = IdType.AUTO)
    private Integer messageId;
    /**
     * 删除标记
     */
    @TableField("del_flag")
    private String delFlag;
    /**
     * 发送类型1订单支付2关闭订单3订单退款4订单分账5完结分账
     */
    @TableField("send_type")
    private String sendType;
    /**
     * 发起关联id
     */
    @TableField("send_id")
    private Integer sendId;
    /**
     * 发送报文
     */
    @TableField("send_message")
    private String sendMessage;
    /**
     * 结果报文
     */
    @TableField("result_message")
    private String resultMessage;
    /**
     * 创建时间
     */
    @TableField("create_time")
    private Date createTime;


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

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/account/ProfitSharing.java

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

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-06-02
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_profit_sharing")
public class ProfitSharing extends Model<ProfitSharing> {

    private static final long serialVersionUID = 1L;

    /**
     * 分账id
     */
    @TableId("share_id")
    private String shareId;
    /**
     * 删除标记
     */
    @TableField("del_flag")
    private Integer delFlag;
    /**
     * 1：PROCESSING：处理中
2：FINISHED：分账完成
     */
    @TableField("share_status")
    private Integer shareStatus;
    /**
     * 商户id
     */
    @TableField("shop_id")
    private Integer shopId;
    /**
     * 订单id
     */
    @TableField("order_id")
    private String orderId;
    /**
     * 订单金额
     */
    @TableField("order_money")
    private BigDecimal orderMoney;
    /**
     * 分账接收方账号
     */
    @TableField("receiver_account")
    private String receiverAccount;
    /**
     * 分账金额
     */
    @TableField("receiver_amount")
    private BigDecimal receiverAmount;
    /**
     * 分账描述
     */
    @TableField("receiver_description")
    private String receiverDescription;
    /**
     * 是否分账完成
     */
    @TableField("finish_flag")
    private Integer finishFlag;
    /**
     * 结余金额
     */
    @TableField("surp_money")
    private BigDecimal surpMoney;
    /**
     * 创建时间
     */
    @TableField("create_time")
    private Date createTime;
    /**
     * 完成时间
     */
    @TableField("finish_time")
    private Date finishTime;
    /**
     * 分账失败原因
1、ACCOUNT_ABNORMAL : 分账接收账户异常
2、NO_RELATION : 分账关系已解除
3、RECEIVER_HIGH_RISK : 高风险接收方
4、RECEIVER_REAL_NAME_NOT_VERIFIED : 接收方未实名
5、NO_AUTH : 分账权限已解除
6、RECEIVER_RECEIPT_LIMIT : 超出用户月收款限额
7、PAYER_ACCOUNT_ABNORMAL : 分出方账户异常
8、INVALID_REQUEST: 描述参数设置失败
     */
    @TableField("fail_reason")
    private String failReason;
    /**
     * 分账明细单号
     */
    @TableField("detail_id")
    private String detailId;


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

}

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

New file
@@ -0,0 +1,25 @@
package com.ruoyi.order.domain.vo;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author jqs34
 * @ClassName MgtMemberServiceTotalVo
 * @description: TODO
 * @date 2023年06月02日
 * @version: 1.0
 */
@Data
public class MgtMemberServiceTotalVo {


    @ApiModelProperty(value = "总周期数")
    private Integer cycleTotal;

    @ApiModelProperty(value = "总周期次数")
    private Integer cycleCount;

    @ApiModelProperty(value = "剩余次数")
    private Integer surpCycleCount;
}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/account/BackMessageMapper.java

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

import com.ruoyi.order.domain.pojo.account.BackMessage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 * 回调报文 Mapper 接口
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
public interface BackMessageMapper extends BaseMapper<BackMessage> {

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/account/FinishOrderMapper.java

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

import com.ruoyi.order.domain.pojo.account.FinishOrder;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 * 完结分账 Mapper 接口
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
public interface FinishOrderMapper extends BaseMapper<FinishOrder> {

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/account/OrderPaymentMapper.java

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

import com.ruoyi.order.domain.pojo.account.OrderPayment;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 * 订单支付 Mapper 接口
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
public interface OrderPaymentMapper extends BaseMapper<OrderPayment> {

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/account/OrderRefundMapper.java

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

import com.ruoyi.order.domain.pojo.account.OrderRefund;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 * 订单退款 Mapper 接口
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
public interface OrderRefundMapper extends BaseMapper<OrderRefund> {

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/account/PaymentMessageMapper.java

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

import com.ruoyi.order.domain.pojo.account.PaymentMessage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 * 支付报文 Mapper 接口
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
public interface PaymentMessageMapper extends BaseMapper<PaymentMessage> {

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/account/ProfitSharingMapper.java

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

import com.ruoyi.order.domain.pojo.account.ProfitSharing;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * <p>
 * 分账 Mapper 接口
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
public interface ProfitSharingMapper extends BaseMapper<ProfitSharing> {

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/ServiceRecordDetailMapper.java

File was renamed from ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/ServiceRecordDetailMapper.java
@@ -1,4 +1,4 @@
package com.ruoyi.order.mapper;
package com.ruoyi.order.mapper.order;

import com.ruoyi.order.domain.pojo.order.ServiceRecordDetail;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/UserServiceRecordMapper.java

@@ -9,6 +9,7 @@
import com.ruoyi.order.domain.vo.AppServiceRecordPageVo;
import com.ruoyi.order.domain.vo.MerServiceRecordPageVo;
import com.ruoyi.order.domain.vo.MgtMemberServiceRecordPageVo;
import com.ruoyi.order.domain.vo.MgtMemberServiceTotalVo;
import org.apache.ibatis.annotations.Param;

import java.util.List;
@@ -46,4 +47,13 @@
     * @return
     */
    List<MgtMemberServiceRecordPageVo> pageMgtMemberServiceRecord(Page page, @Param("param") MgtMemberServiceRecordPageDto mgtMemberServiceRecordPageDto);

    /**
     * 通过用户id获取会员服务统计
     * @param userId
     * @return
     */
    MgtMemberServiceTotalVo getMgtMemberServiceTotal(@Param("userId")Long userId);


}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/account/BackMessageService.java

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

import com.ruoyi.order.domain.pojo.account.BackMessage;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * 回调报文 服务类
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
public interface BackMessageService extends IService<BackMessage> {

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/account/FinishOrderService.java

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

import com.ruoyi.order.domain.pojo.account.FinishOrder;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * 完结分账 服务类
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
public interface FinishOrderService extends IService<FinishOrder> {

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/account/OrderPaymentService.java

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

import com.ruoyi.order.domain.pojo.account.OrderPayment;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * 订单支付 服务类
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
public interface OrderPaymentService extends IService<OrderPayment> {

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/account/OrderRefundService.java

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

import com.ruoyi.order.domain.pojo.account.OrderRefund;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * 订单退款 服务类
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
public interface OrderRefundService extends IService<OrderRefund> {

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/account/PaymentMessageService.java

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

import com.ruoyi.order.domain.pojo.account.PaymentMessage;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * 支付报文 服务类
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
public interface PaymentMessageService extends IService<PaymentMessage> {

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/account/ProfitSharingService.java

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

import com.ruoyi.order.domain.pojo.account.ProfitSharing;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * 分账 服务类
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
public interface ProfitSharingService extends IService<ProfitSharing> {

}

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

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

import com.ruoyi.order.domain.pojo.account.BackMessage;
import com.ruoyi.order.mapper.account.BackMessageMapper;
import com.ruoyi.order.service.account.BackMessageService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 回调报文 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
@Service
public class BackMessageServiceImpl extends ServiceImpl<BackMessageMapper, BackMessage> implements BackMessageService {

}

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

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

import com.ruoyi.order.domain.pojo.account.FinishOrder;
import com.ruoyi.order.mapper.account.FinishOrderMapper;
import com.ruoyi.order.service.account.FinishOrderService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 完结分账 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
@Service
public class FinishOrderServiceImpl extends ServiceImpl<FinishOrderMapper, FinishOrder> implements FinishOrderService {

}

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

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

import com.ruoyi.order.domain.pojo.account.OrderPayment;
import com.ruoyi.order.mapper.account.OrderPaymentMapper;
import com.ruoyi.order.service.account.OrderPaymentService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 订单支付 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
@Service
public class OrderPaymentServiceImpl extends ServiceImpl<OrderPaymentMapper, OrderPayment> implements OrderPaymentService {

}

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

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

import com.ruoyi.order.domain.pojo.account.OrderRefund;
import com.ruoyi.order.mapper.account.OrderRefundMapper;
import com.ruoyi.order.service.account.OrderRefundService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 订单退款 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
@Service
public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, OrderRefund> implements OrderRefundService {

}

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

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

import com.ruoyi.order.domain.pojo.account.PaymentMessage;
import com.ruoyi.order.mapper.account.PaymentMessageMapper;
import com.ruoyi.order.service.account.PaymentMessageService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 支付报文 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
@Service
public class PaymentMessageServiceImpl extends ServiceImpl<PaymentMessageMapper, PaymentMessage> implements PaymentMessageService {

}

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

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

import com.ruoyi.order.domain.pojo.account.ProfitSharing;
import com.ruoyi.order.mapper.account.ProfitSharingMapper;
import com.ruoyi.order.service.account.ProfitSharingService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 分账 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
@Service
public class ProfitSharingServiceImpl extends ServiceImpl<ProfitSharingMapper, ProfitSharing> implements ProfitSharingService {

}

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

@@ -1,7 +1,7 @@
package com.ruoyi.order.service.impl.order;

import com.ruoyi.order.domain.pojo.order.ServiceRecordDetail;
import com.ruoyi.order.mapper.ServiceRecordDetailMapper;
import com.ruoyi.order.mapper.order.ServiceRecordDetailMapper;
import com.ruoyi.order.service.order.ServiceRecordDetailService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

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

@@ -10,6 +10,7 @@
import com.ruoyi.order.domain.vo.AppServiceRecordPageVo;
import com.ruoyi.order.domain.vo.MerServiceRecordPageVo;
import com.ruoyi.order.domain.vo.MgtMemberServiceRecordPageVo;
import com.ruoyi.order.domain.vo.MgtMemberServiceTotalVo;
import com.ruoyi.order.mapper.order.UserServiceRecordMapper;
import com.ruoyi.order.service.order.UserServiceRecordService;
import org.springframework.stereotype.Service;
@@ -63,4 +64,15 @@
    public List<MgtMemberServiceRecordPageVo> pageMgtMemberServiceRecord(Page page, MgtMemberServiceRecordPageDto mgtMemberServiceRecordPageDto){
        return userServiceRecordMapper.pageMgtMemberServiceRecord(page, mgtMemberServiceRecordPageDto);
    }

    /**
     * 通过用户id获取会员服务统计
     * @param userId
     * @return
     */
    @Override
    public MgtMemberServiceTotalVo getMgtMemberServiceTotal(Long userId){
        return userServiceRecordMapper.getMgtMemberServiceTotal(userId);
    }

}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/UserServiceRecordService.java

@@ -9,6 +9,7 @@
import com.ruoyi.order.domain.vo.AppServiceRecordPageVo;
import com.ruoyi.order.domain.vo.MerServiceRecordPageVo;
import com.ruoyi.order.domain.vo.MgtMemberServiceRecordPageVo;
import com.ruoyi.order.domain.vo.MgtMemberServiceTotalVo;

import java.util.List;

@@ -45,4 +46,11 @@
     * @return
     */
    List<MgtMemberServiceRecordPageVo> pageMgtMemberServiceRecord(Page page, MgtMemberServiceRecordPageDto mgtMemberServiceRecordPageDto);

    /**
     * 通过用户id获取会员服务统计
     * @param userId
     * @return
     */
    MgtMemberServiceTotalVo getMgtMemberServiceTotal(Long userId);
}

 ruoyi-modules/ruoyi-order/src/main/resources/mapper/account/BackMessageMapper.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.order.mapper.account.BackMessageMapper">



</mapper>

 ruoyi-modules/ruoyi-order/src/main/resources/mapper/account/FinishOrderMapper.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.order.mapper.account.FinishOrderMapper">



</mapper>

 ruoyi-modules/ruoyi-order/src/main/resources/mapper/account/OrderPaymentMapper.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.order.mapper.account.OrderPaymentMapper">



</mapper>

 ruoyi-modules/ruoyi-order/src/main/resources/mapper/account/OrderRefundMapper.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.order.mapper.account.OrderRefundMapper">



</mapper>

 ruoyi-modules/ruoyi-order/src/main/resources/mapper/account/PaymentMessageMapper.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.order.mapper.account.PaymentMessageMapper">



</mapper>

 ruoyi-modules/ruoyi-order/src/main/resources/mapper/account/ProfitSharingMapper.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.order.mapper.account.ProfitSharingMapper">



</mapper>

 ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/ServiceRecordDetailMapper.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.order.mapper.ServiceRecordDetailMapper">
<mapper namespace="com.ruoyi.order.mapper.order.ServiceRecordDetailMapper">


</mapper>

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

@@ -108,10 +108,26 @@
        tsrd.surp_num surpNum
        FROM t_user_service_record tusr
        INNER JOIN t_service_record_detail tsrd ON tsrd.record_id = tusr.id
        WHERE tusr.del_flag = 0 AND tusr.user_id = #{param.memberUserId}
        WHERE tusr.del_flag = 0 AND tusr.user_id = #{param.memberUserId} AND tusr.service_type = 1
        <if test="param.keyword != null and param.keyword != ''">
            AND tsrd.consumer_goods_name LIKE  CONCAT('%',#{param.keyword},'%')
        </if>
        ORDER BY tusr.create_time DESC
    </select>

    <select id="getMgtMemberServiceTotal" resultType="com.ruoyi.order.domain.vo.MgtMemberServiceTotalVo">
        SELECT
        COUNT(temp.consumerGoodsId),
        IFNULL(SUM(temp.cycleCount),0) cycleCount,
        IFNULL(SUM(temp.surpCycleCount),0) surpCycleCount
        FROM (SELECT
        tsrd.consumer_goods_id consumerGoodsId,
        IFNULL(SUM(tsrd.service_num),0) cycleCount,
        IFNULL(SUM(tsrd.surp_num),0) surpCycleCount
        FROM t_user_service_record tusr
        INNER JOIN t_service_record_detail tsrd ON tsrd.record_id = tusr.id
        WHERE tusr.del_flag = 0 AND tusr.user_id = #{userId} AND tusr.service_type = 1
        GROUP BY tsrd.consumer_goods_id) AS temp
    </select>

</mapper>

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

@@ -17,6 +17,9 @@
@Data
public class MgtShopPageDto extends MgtPageDto {

    @ApiModelProperty(value = "商户类型1经销商2代理商")
    private Integer shopType ;

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


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

New file
@@ -0,0 +1,63 @@
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-06-02
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_authentication_process")
public class AuthenticationProcess extends Model<AuthenticationProcess> {

    private static final long serialVersionUID = 1L;

    /**
     * 步骤id
     */
    @TableId(value = "process_id", type = IdType.AUTO)
    private Integer processId;
    /**
     * 删除标记
     */
    @TableField("del_flag")
    private Integer delFlag;
    /**
     * 审核id
     */
    @TableField("auth_id")
    private String authId;
    /**
     * 步骤名
     */
    @TableField("process_name")
    private String processName;
    /**
     * 步骤时间
     */
    @TableField("create_time")
    private Date createTime;


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

}

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

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

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-06-02
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_shop_account")
public class ShopAccount extends Model<ShopAccount> {

    private static final long serialVersionUID = 1L;

    /**
     * 商户id
     */
    @TableId("shop_id")
    private Integer shopId;
    /**
     * 删除标记
     */
    @TableField("del_flag")
    private Integer delFlag;
    /**
     * 二级商户支付id
     */
    @TableField("sub_mchid")
    private String subMchid;
    /**
     * 总收入
     */
    @TableField("total_income")
    private BigDecimal totalIncome;
    /**
     * 总支出
     */
    @TableField("total_disburse")
    private BigDecimal totalDisburse;
    /**
     * 总退款
     */
    @TableField("total_refund")
    private BigDecimal totalRefund;
    /**
     * 总分账
     */
    @TableField("total_profitsharing")
    private BigDecimal totalProfitsharing;
    /**
     * 总结余
     */
    @TableField("total_money")
    private BigDecimal totalMoney;


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

}

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

New file
@@ -0,0 +1,262 @@
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-06-02
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_shop_authentication")
public class ShopAuthentication extends Model<ShopAuthentication> {

    private static final long serialVersionUID = 1L;

    /**
     * 审核id
     */
    @TableId("auth_id")
    private String authId;
    /**
     * 删除标记
     */
    @TableField("del_flag")
    private Integer delFlag;
    /**
     * 商户id
     */
    @TableField("shop_id")
    private Integer shopId;
    /**
     * 申请编号
     */
    @TableField("apply_number")
    private String applyNumber;
    /**
     * 审核状态
1：CHECKING：资料校验中
2：ACCOUNT_NEED_VERIFY：待账户验证
3：AUDITING：审核中
4：REJECTED：已驳回
5：NEED_SIGN：待签约
6：FINISH：完成
7：FROZEN：已冻结
8：CANCELED：已作废
     */
    @TableField("audit_status")
    private Integer auditStatus;
    /**
     * 主题类型1个人2企业
     */
    @TableField("main_type")
    private Integer mainType;
    /**
     * 营业执照商户名称
     */
    @TableField("bl_shop_name")
    private String blShopName;
    /**
     * 营业执照编号
     */
    @TableField("bl_number")
    private String blNumber;
    /**
     * 营业执照法人姓名
     */
    @TableField("bl_corporate_name")
    private String blCorporateName;
    /**
     * 营业执照注册地址
     */
    @TableField("bl_registered_address")
    private String blRegisteredAddress;
    /**
     * 营业执照期限
     */
    @TableField("bl_business_deanline")
    private String blBusinessDeanline;
    /**
     * 营业执照图片
     */
    @TableField("bl_image")
    private String blImage;
    /**
     * 法人姓名
     */
    @TableField("lp_corporate_name")
    private String lpCorporateName;
    /**
     * 法人身份证号
     */
    @TableField("lp_id_card")
    private String lpIdCard;
    /**
     * 法人身份证开始日期
     */
    @TableField("lp_ic_start_date")
    private String lpIcStartDate;
    /**
     * 法人身份证有效日期
     */
    @TableField("lp_ic_end_date")
    private String lpIcEndDate;
    /**
     * 法人身份证正面
     */
    @TableField("lp_ic_front")
    private String lpIcFront;
    /**
     * 法人身份证背面
     */
    @TableField("lp_ic_back")
    private String lpIcBack;
    /**
     * 结算账户类型1对公2对私
     */
    @TableField("settlement_account_type")
    private String settlementAccountType;
    /**
     * 开户行
     */
    @TableField("sa_bank")
    private String saBank;
    /**
     * 开户名称
     */
    @TableField("sa_account_name")
    private String saAccountName;
    /**
     * 开户所在省
     */
    @TableField("sa_bank_province_code")
    private String saBankProvinceCode;
    /**
     * 开户所在市
     */
    @TableField("sa_bank_city_code")
    private String saBankCityCode;
    /**
     * 开户行全称
     */
    @TableField("sa_bank_name")
    private String saBankName;
    /**
     * 银行卡号
     */
    @TableField("sa_number")
    private String saNumber;
    /**
     * 微信支付申请单号
     */
    @TableField("applyment_id")
    private String applymentId;
    /**
     *     1、UNSIGNED：未签约。该状态下，电商平台可查询获取签约链接，引导二级商户的超级管理员完成签约；
2、SIGNED ：已签约。指二级商户的超级管理员已完成签约。注意：若申请单被驳回，商户修改了商户主体名称、法人名称、超级管理员信息、主体类型等信息，则需重新签约。
3、NOT_SIGNABLE：不可签约。该状态下，暂不支持超级管理员签约。一般为申请单处于已驳回、已冻结、机器校验中状态，无法签约。
     */
    @TableField("sign_state")
    private Integer signState;
    /**
     * 签约链接
1、当申请状态为NEED_SIGN 或 签约状态为UNSIGNED时返回，该链接为永久有效；
2、申请单中的超级管理者，需用已实名认证的微信扫码打开，完成签约。
     */
    @TableField("sign_url")
    private String signUrl;
    /**
     * 电商平台二级商户号
     */
    @TableField("sub_mchid")
    private String subMchid;
    /**
     * 付款户名
     */
    @TableField("av_account_name")
    private String avAccountName;
    /**
     * 付款卡号
     */
    @TableField("av_account_no")
    private String avAccountNo;
    /**
     * 汇款金额
     */
    @TableField("av_pay_amount")
    private BigDecimal avPayAmount;
    /**
     * 收款卡号	
     */
    @TableField("da_number")
    private String daNumber;
    /**
     * 收款户名
     */
    @TableField("da_name")
    private String daName;
    /**
     * 开户银行
     */
    @TableField("da_bank")
    private String daBank;
    /**
     * 省市信息
     */
    @TableField("da_city")
    private String daCity;
    /**
     * 商户汇款时，需要填写的备注信息
     */
    @TableField("da_remark")
    private String daRemark;
    /**
     * 汇款截止时间
     */
    @TableField("da_deadline")
    private String daDeadline;
    /**
     * 提交申请单的资料项名称
     */
    @TableField("ad_param_name")
    private String adParamName;
    /**
     * 提交资料项被驳回原因
     */
    @TableField("ad_reject_reason")
    private String adRejectReason;
    /**
     * 法人验证链接
1、当申请状态为
ACCOUNT_NEED_VERIFY，且通过系统校验的申请单，将返回链接。
2、建议将链接转为二维码展示，让商户法人用微信扫码打开，完成账户验证。
     */
    @TableField("legal_validation_url")
    private String legalValidationUrl;
    @TableField("create_time")
    private Date createTime;
    @TableField("update_time")
    private Date updateTime;


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

}

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

New file
@@ -0,0 +1,88 @@
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-06-02
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_shop_flow")
public class ShopFlow extends Model<ShopFlow> {

    private static final long serialVersionUID = 1L;

    /**
     * 流水id
     */
    @TableId("flow_id")
    private Integer flowId;
    /**
     * 删除标记
     */
    @TableField("del_flag")
    private String delFlag;
    /**
     * 商户id
     */
    @TableField("shop_id")
    private Integer shopId;
    /**
     * 流水类型1订单收入2退款支出3分账支出
     */
    @TableField("flow_type")
    private Integer flowType;
    /**
     * 金额
     */
    @TableField("flow_money")
    private BigDecimal flowMoney;
    /**
     * 关联类型1订单id2退款id3分账id
     */
    @TableField("relation_type")
    private String relationType;
    /**
     * 关联id
     */
    @TableField("relation_id")
    private String relationId;
    /**
     * 创建时间
     */
    @TableField("create_time")
    private Date createTime;
    /**
     * 变动前结余
     */
    @TableField("before_money")
    private BigDecimal beforeMoney;
    /**
     * 变动后结余
     */
    @TableField("after_money")
    private BigDecimal afterMoney;


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

}

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

@@ -61,7 +61,7 @@
    private String shopownerPhone;

    @ApiModelProperty("商户状态-1删除0冻结1正常2终止合作")
    private Integer shopStatus;
    private String shopStatus;

    @ApiModelProperty("商户活动次数")
    private Integer shopActivityCount;

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

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

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

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
public interface AuthenticationProcessMapper extends BaseMapper<AuthenticationProcess> {

}

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

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

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

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
public interface ShopAccountMapper extends BaseMapper<ShopAccount> {

}

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

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

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

/**
 * <p>
 * 商户信息 Mapper 接口
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
public interface ShopAuthenticationMapper extends BaseMapper<ShopAuthentication> {

}

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

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

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

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
public interface ShopFlowMapper extends BaseMapper<ShopFlow> {

}

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

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

import com.ruoyi.shop.domain.pojo.shop.AuthenticationProcess;
import com.ruoyi.shop.mapper.shop.AuthenticationProcessMapper;
import com.ruoyi.shop.service.shop.AuthenticationProcessService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
@Service
public class AuthenticationProcessServiceImpl extends ServiceImpl<AuthenticationProcessMapper, AuthenticationProcess> implements AuthenticationProcessService {

}

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

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

import com.ruoyi.shop.domain.pojo.shop.ShopAccount;
import com.ruoyi.shop.mapper.shop.ShopAccountMapper;
import com.ruoyi.shop.service.shop.ShopAccountService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
@Service
public class ShopAccountServiceImpl extends ServiceImpl<ShopAccountMapper, ShopAccount> implements ShopAccountService {

}

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

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

import com.ruoyi.shop.domain.pojo.shop.ShopAuthentication;
import com.ruoyi.shop.mapper.shop.ShopAuthenticationMapper;
import com.ruoyi.shop.service.shop.ShopAuthenticationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 商户信息 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
@Service
public class ShopAuthenticationServiceImpl extends ServiceImpl<ShopAuthenticationMapper, ShopAuthentication> implements ShopAuthenticationService {

}

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

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

import com.ruoyi.shop.domain.pojo.shop.ShopFlow;
import com.ruoyi.shop.mapper.shop.ShopFlowMapper;
import com.ruoyi.shop.service.shop.ShopFlowService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
@Service
public class ShopFlowServiceImpl extends ServiceImpl<ShopFlowMapper, ShopFlow> implements ShopFlowService {

}

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

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

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

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
public interface AuthenticationProcessService extends IService<AuthenticationProcess> {

}

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

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

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

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
public interface ShopAccountService extends IService<ShopAccount> {

}

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

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

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

/**
 * <p>
 * 商户信息 服务类
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
public interface ShopAuthenticationService extends IService<ShopAuthentication> {

}

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

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

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

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author jqs
 * @since 2023-06-02
 */
public interface ShopFlowService extends IService<ShopFlow> {

}

 ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/AuthenticationProcessMapper.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.AuthenticationProcessMapper">



</mapper>

 ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopAccountMapper.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.ShopAccountMapper">



</mapper>

 ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopAuthenticationMapper.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.ShopAuthenticationMapper">



</mapper>

 ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopFlowMapper.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.ShopFlowMapper">



</mapper>

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

@@ -296,7 +296,11 @@
        CONCAT(ts.shop_area_name,ts.shop_address) shopAddress,
        ts.shopowner_name shopownerName,
        ts.shopowner_phone shopownerPhone,
        ts.shop_status shopStatus,
        CASE ts.shop_status
        WHEN 0 THEN "冻结"
        WHEN 1 THEN "正常"
        WHEN 2 THEN "终止合作"
        END shopStatus,
        tsm.shop_marketing_total shopActivityCount,
        ts.shop_custom_status shopCustomStatus
        FROM t_shop ts
@@ -305,6 +309,9 @@
        LEFT JOIN sys_dept sd ON sub.dept_id = sd.dept_id
        LEFT JOIN t_shop_marketing tsm ON tsm.shop_id = ts.shop_id
        WHERE ts.del_flag = 0
        <if test="param.shopType!=null and param.shopType!=''">
            AND ts.shop_type = #{param.shopType}
        </if>
        <if test="param.shopProvinceCode!=null and param.shopProvinceCode!=''">
            AND ts.shop_province_code = #{param.shopProvinceCode}
        </if>