Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!1036

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserShareController.java

@@ -46,6 +46,7 @@ public class UserShareController extends BaseApiController {
 	public AjaxResult generateInviteCode(@RequestBody  JSONObject jsonObject) {
 		String boxId = jsonObject.getString("boxId"); // 票组ID
 		String type = jsonObject.getString("type"); // 分享类型，1/2
+		String poster = jsonObject.getString("poster"); // 海报分享标识
 		String appId = AppSourceEnum.MSDQ.getAppId();
 		Long userId = SecurityUtils.getUserId();
 		if (UserShareVO.SHARE_TYPE_SITE.equals(type) && StringUtils.isBlank(boxId)) {
@@ -53,7 +54,10 @@ public class UserShareController extends BaseApiController {
 			String rst = wxUrlLinkService.generateUnlimitCode("", userId + "&" + type, appId);
 			return new AjaxResult(Type.SUCCESS, "", rst);
 		}
-		String rst = wxUrlLinkService.generateUnlimitCode("pages/index/index", boxId + "&" + userId + "&" + type, appId);
+		String rst = wxUrlLinkService.generateUnlimitCode("packagePrize/goods/index", boxId + "&" + userId + "&" + type, appId);
+		if ("1".equals(poster)) {
+			rst = wxUrlLinkService.generateUnlimitCode("pages/index/index", boxId + "&" + userId + "&" + type, appId);
+		}
 		return new AjaxResult(Type.SUCCESS, "", rst);
 	}
 }

mp-common/pom.xml

@@ -22,6 +22,13 @@
 
     <dependencies>
 
+        <!-- 盈盛支付sdk -->
+        <dependency>
+            <groupId>io.github.ysgatesdk</groupId>
+            <artifactId>yspay-opensdk-java</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+
         <!--dingtalk-->
         <dependency>
             <groupId>com.aliyun</groupId>

mp-service/src/main/java/com/qs/mp/channel/domain/ChannelBank.java

@@ -0,0 +1,78 @@
+package com.qs.mp.channel.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+/**
+ * @describe 渠道银行卡表实体类
+ * @auther quanshu
+ * @create 2023-03-27 14:24:40
+ */
+@TableName("mp_channel_bank")
+@Data
+@ApiModel("渠道银行卡表实体类")
+public class ChannelBank implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 渠道id
+     */
+    @ApiModelProperty("渠道id")
+    @TableField("channel_id")
+    private Long channelId;
+
+    /**
+     * 银行卡号
+     */
+    @ApiModelProperty("银行卡号")
+    @TableField("bank_no")
+    private String bankNo;
+
+    /**
+     * 银行名称
+     */
+    @ApiModelProperty("银行名称")
+    @TableField("bank_name")
+    private String bankName;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField("created_time")
+    private Date createdTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @TableField("updated_time")
+    private Date updatedTime;
+
+    /**
+     * 逻辑删除标识
+     */
+    @ApiModelProperty("逻辑删除标识")
+    @TableField("is_deleted")
+    @TableLogic
+    private Integer isDeleted;
+
+
+}

mp-service/src/main/java/com/qs/mp/channel/mapper/ChannelBankMapper.java

@@ -0,0 +1,13 @@
+package com.qs.mp.channel.mapper;
+
+import com.qs.mp.channel.domain.ChannelBank;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @auther quanshu
+ * @create 2023-03-27 14:24:40
+ * @describe 渠道银行卡表mapper类
+ */
+public interface ChannelBankMapper extends BaseMapper<ChannelBank> {
+
+}

mp-service/src/main/java/com/qs/mp/channel/service/IChannelBankService.java

@@ -0,0 +1,16 @@
+package com.qs.mp.channel.service;
+
+import com.qs.mp.channel.domain.ChannelBank;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 渠道银行卡表 服务类
+ * </p>
+ *
+ * @author quanshu
+ * @since 2023-03-27
+ */
+public interface IChannelBankService extends IService<ChannelBank> {
+
+}

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelBankServiceImpl.java

@@ -0,0 +1,20 @@
+package com.qs.mp.channel.service.impl;
+
+import com.qs.mp.channel.domain.ChannelBank;
+import com.qs.mp.channel.mapper.ChannelBankMapper;
+import com.qs.mp.channel.service.IChannelBankService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 渠道银行卡表 服务实现类
+ * </p>
+ *
+ * @author quanshu
+ * @since 2023-03-27
+ */
+@Service
+public class ChannelBankServiceImpl extends ServiceImpl<ChannelBankMapper, ChannelBank> implements IChannelBankService {
+
+}

mp-service/src/main/java/com/qs/mp/common/domain/YsCallLog.java

@@ -0,0 +1,85 @@
+package com.qs.mp.common.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+/**
+ * @describe 银盛调用日志表实体类
+ * @auther quanshu
+ * @create 2023-03-27 14:24:03
+ */
+@TableName("mp_ys_call_log")
+@Data
+@ApiModel("银盛调用日志实体类")
+public class YsCallLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 请求id
+     */
+    @ApiModelProperty("请求id")
+    @TableField("req_id")
+    private String reqId;
+
+    /**
+     * 请求接口
+     */
+    @ApiModelProperty("请求接口")
+    @TableField("interface_id")
+    private String interfaceId;
+
+    /**
+     * 请求参数
+     */
+    @ApiModelProperty("请求参数")
+    @TableField("req_json")
+    private String reqJson;
+
+    /**
+     * 响应参数
+     */
+    @ApiModelProperty("响应参数")
+    @TableField("res_json")
+    private String resJson;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField("created_time")
+    private Date createdTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @TableField("updated_time")
+    private Date updatedTime;
+
+    /**
+     * 逻辑删除标识
+     */
+    @ApiModelProperty("逻辑删除标识")
+    @TableField("is_deleted")
+    @TableLogic
+    private Integer isDeleted;
+
+
+}

mp-service/src/main/java/com/qs/mp/common/mapper/YsCallLogMapper.java

@@ -0,0 +1,13 @@
+package com.qs.mp.common.mapper;
+
+import com.qs.mp.common.domain.YsCallLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @auther quanshu
+ * @create 2023-03-27 14:24:03
+ * @describe 银盛调用日志表mapper类
+ */
+public interface YsCallLogMapper extends BaseMapper<YsCallLog> {
+
+}

mp-service/src/main/java/com/qs/mp/common/service/IYsCallLogService.java

@@ -0,0 +1,16 @@
+package com.qs.mp.common.service;
+
+import com.qs.mp.common.domain.YsCallLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 银盛调用日志表 服务类
+ * </p>
+ *
+ * @author quanshu
+ * @since 2023-03-27
+ */
+public interface IYsCallLogService extends IService<YsCallLog> {
+
+}

mp-service/src/main/java/com/qs/mp/common/service/impl/YsCallLogServiceImpl.java

@@ -0,0 +1,20 @@
+package com.qs.mp.common.service.impl;
+
+import com.qs.mp.common.domain.YsCallLog;
+import com.qs.mp.common.mapper.YsCallLogMapper;
+import com.qs.mp.common.service.IYsCallLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 银盛调用日志表 服务实现类
+ * </p>
+ *
+ * @author quanshu
+ * @since 2023-03-27
+ */
+@Service
+public class YsCallLogServiceImpl extends ServiceImpl<YsCallLogMapper, YsCallLog> implements IYsCallLogService {
+
+}

mp-service/src/main/java/com/qs/mp/pay/domain/DivisionLog.java

@@ -0,0 +1,92 @@
+package com.qs.mp.pay.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+/**
+ * @describe 分账记录表实体类
+ * @auther quanshu
+ * @create 2023-03-27 14:24:26
+ */
+@TableName("mp_division_log")
+@Data
+@ApiModel("分账记录表实体类")
+public class DivisionLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 分账单号
+     */
+    @ApiModelProperty("分账单号")
+    @TableField("trade_no")
+    private String tradeNo;
+
+    /**
+     * 关联支付单号
+     */
+    @ApiModelProperty("关联支付单号")
+    @TableField("order_no")
+    private String orderNo;
+
+    /**
+     * 关联业务单号
+     */
+    @ApiModelProperty("关联业务单号")
+    @TableField("biz_id")
+    private String bizId;
+
+    /**
+     * 分账金额
+     */
+    @ApiModelProperty("分账金额")
+    @TableField("amount")
+    private Integer amount;
+
+    /**
+     * 状态:1初始化,2完成,3失败
+     */
+    @ApiModelProperty("状态:1初始化,2完成,3失败")
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField("created_time")
+    private Date createdTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @TableField("updated_time")
+    private Date updatedTime;
+
+    /**
+     * 逻辑删除标识
+     */
+    @ApiModelProperty("逻辑删除标识")
+    @TableField("is_deleted")
+    @TableLogic
+    private Integer isDeleted;
+
+
+}

mp-service/src/main/java/com/qs/mp/pay/mapper/DivisionLogMapper.java

@@ -0,0 +1,13 @@
+package com.qs.mp.pay.mapper;
+
+import com.qs.mp.pay.domain.DivisionLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @auther quanshu
+ * @create 2023-03-27 14:24:26
+ * @describe 分账记录表mapper类
+ */
+public interface DivisionLogMapper extends BaseMapper<DivisionLog> {
+
+}

mp-service/src/main/java/com/qs/mp/pay/service/IDivisionLogService.java

@@ -0,0 +1,16 @@
+package com.qs.mp.pay.service;
+
+import com.qs.mp.pay.domain.DivisionLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 分账记录表 服务类
+ * </p>
+ *
+ * @author quanshu
+ * @since 2023-03-27
+ */
+public interface IDivisionLogService extends IService<DivisionLog> {
+
+}

mp-service/src/main/java/com/qs/mp/pay/service/impl/DivisionLogServiceImpl.java

@@ -0,0 +1,20 @@
+package com.qs.mp.pay.service.impl;
+
+import com.qs.mp.pay.domain.DivisionLog;
+import com.qs.mp.pay.mapper.DivisionLogMapper;
+import com.qs.mp.pay.service.IDivisionLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 分账记录表 服务实现类
+ * </p>
+ *
+ * @author quanshu
+ * @since 2023-03-27
+ */
+@Service
+public class DivisionLogServiceImpl extends ServiceImpl<DivisionLogMapper, DivisionLog> implements IDivisionLogService {
+
+}

mp-service/src/main/resources/mapper/channel/ChannelBankMapper.xml

@@ -0,0 +1,21 @@
+<?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.qs.mp.channel.mapper.ChannelBankMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.qs.mp.channel.domain.ChannelBank">
+        <id column="id" property="id" />
+        <result column="channel_id" property="channelId" />
+        <result column="bank_no" property="bankNo" />
+        <result column="bank_name" property="bankName" />
+        <result column="created_time" property="createdTime" />
+        <result column="updated_time" property="updatedTime" />
+        <result column="is_deleted" property="isDeleted" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, channel_id, bank_no, bank_name, created_time, updated_time, is_deleted
+    </sql>
+
+</mapper>

mp-service/src/main/resources/mapper/common/YsCallLogMapper.xml

@@ -0,0 +1,22 @@
+<?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.qs.mp.common.mapper.YsCallLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.qs.mp.common.domain.YsCallLog">
+        <id column="id" property="id" />
+        <result column="req_id" property="reqId" />
+        <result column="interface_id" property="interfaceId" />
+        <result column="req_json" property="reqJson" />
+        <result column="res_json" property="resJson" />
+        <result column="created_time" property="createdTime" />
+        <result column="updated_time" property="updatedTime" />
+        <result column="is_deleted" property="isDeleted" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, req_id, interface_id, req_json, res_json, created_time, updated_time, is_deleted
+    </sql>
+
+</mapper>

mp-service/src/main/resources/mapper/pay/DivisionLogMapper.xml

@@ -0,0 +1,23 @@
+<?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.qs.mp.pay.mapper.DivisionLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.qs.mp.pay.domain.DivisionLog">
+        <id column="id" property="id" />
+        <result column="trade_no" property="tradeNo" />
+        <result column="order_no" property="orderNo" />
+        <result column="biz_id" property="bizId" />
+        <result column="amount" property="amount" />
+        <result column="status" property="status" />
+        <result column="created_time" property="createdTime" />
+        <result column="updated_time" property="updatedTime" />
+        <result column="is_deleted" property="isDeleted" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, trade_no, order_no, biz_id, amount, status, created_time, updated_time, is_deleted
+    </sql>
+
+</mapper>