suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新店装修阶段2.0+修改查询运营列表PSOT

Browse Source
This commit is contained in:
shuo.wang
2024-04-29 15:40:11 +08:00
parent cee949537b
commit 9539790a34
23 changed files with 531 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coolstore-partner-common/src/main/java/com/cool/store/enums/ConstructionPhaseEnum.java
View File

@@ -7,6 +7,7 @@ package com.cool.store.enums;
* @注释: * @注释:
*/ */
public enum ConstructionPhaseEnum { public enum ConstructionPhaseEnum {
//施工阶段
NOT_SHOWN(-1,"不显示"), NOT_SHOWN(-1,"不显示"),
NOT_START(0,"未开工"), NOT_START(0,"未开工"),
construction_ING(1,"施工中"), construction_ING(1,"施工中"),

2
coolstore-partner-common/src/main/java/com/cool/store/enums/DesignPhaseEnum.java
View File

@@ -13,7 +13,7 @@ public enum DesignPhaseEnum {
ACCEPTANCE_NOT_START(1, "未开始"), ACCEPTANCE_NOT_START(1, "未开始"),
ACCEPTANCE_DESIGNING(2, "设计中"), ACCEPTANCE_DESIGNING(2, "设计中"),
ACCEPTED_NOT(3, "未验收"), ACCEPTED_NOT(3, "未验收"),
ACCEPTANCE_FAILEDS(0,"验收未通过"),
AUDIT_WAIT(5,"待审批"), AUDIT_WAIT(5,"待审批"),
AUDIT_FAIL(6,"审批驳回"), AUDIT_FAIL(6,"审批驳回"),
AUDIT_ING(7,"审批中"), AUDIT_ING(7,"审批中"),

3
coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowSubStageStatusEnum.java
View File

@@ -24,7 +24,7 @@ public enum WorkflowSubStageStatusEnum {
FIRST_INTERVIEWS_40(40,"一审未通过"), FIRST_INTERVIEWS_40(40,"一审未通过"),
FIRST_INTERVIEWS_42(42,"一审重新预约"), FIRST_INTERVIEWS_42(42,"一审重新预约"),
//缴纳意向金 //缴纳意向金，装修款
PAY_DEPOSIT_45(45,"待缴费"), PAY_DEPOSIT_45(45,"待缴费"),
PAY_DEPOSIT_50(50,"已缴费"), PAY_DEPOSIT_50(50,"已缴费"),
PAY_FAIL_55(55,"缴费失败"), PAY_FAIL_55(55,"缴费失败"),
@@ -51,6 +51,7 @@ public enum WorkflowSubStageStatusEnum {
SECOND_INTERVIEWS_115(115,"二审未通过"), SECOND_INTERVIEWS_115(115,"二审未通过"),
SECOND_INTERVIEWS_120(120,"二审重新预约"), SECOND_INTERVIEWS_120(120,"二审重新预约"),
SECOND_INTERVIEWS_125(125,"二审通过"), SECOND_INTERVIEWS_125(125,"二审通过"),
; ;
private Integer code; private Integer code;

31
coolstore-partner-common/src/main/java/com/cool/store/enums/point/PayBusinessTypeEnum.java Normal file
View File

@@ -0,0 +1,31 @@
package com.cool.store.enums.point;
/**
* @Auther: WangShuo
* @Date: 2024/04/29/上午9:33
* @Version 1.0
* @注释:
*/
public enum PayBusinessTypeEnum {
INTENT_MONEY(0,"缴纳意向金"),
FRANCHISE_FEE(1,"缴纳加盟费"),
DECORATION_MODEL(2,"装修款");
private Integer code;
private String desc;
PayBusinessTypeEnum(Integer code, String desc) {
this.code = code;
this.desc = desc;
}
public Integer getCode() {
return code;
}
public String getDesc() {
return desc;
}
}

28
coolstore-partner-common/src/main/java/com/cool/store/enums/point/PayTypeEnum.java Normal file
View File

@@ -0,0 +1,28 @@
package com.cool.store.enums.point;
/**
* @Auther: WangShuo
* @Date: 2024/04/29/上午9:45
* @Version 1.0
* @注释:
*/
public enum PayTypeEnum {
WX_PAY(1,"微信支付"),
BANK_PAY(2,"银行转账");
private Integer code;
private String desc;
PayTypeEnum(Integer code, String desc) {
this.code = code;
this.desc = desc;
}
public Integer getCode() {
return code;
}
public String getDesc() {
return desc;
}
}

10
coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java
View File

@@ -148,17 +148,17 @@ public class ShopInfoDAO {
/** /**
* @Auther: wangshuo * @Auther: wangshuo
* @Date: 2024/4/25 * @Date: 2024/4/25
* @description: 根据idlist 获取shopcode * @description: 根据idlist 获取storeNum
*/ */
public List<OpenPlanShopInfoDTO> queryShopCodeListByid(@Param("shopIdList") List<Long> shopIdList){ public List<OpenPlanShopInfoDTO> queryStoreNumeListByid(List<Long> shopIdList){
return shopInfoMapper.queryShopCodeListByid(shopIdList); return shopInfoMapper.queryStoreNumeListByid(shopIdList);
} }
public List<PreparationDTO> ListByCondition(PreparationRequest request){ public List<PreparationDTO> ListByCondition(PreparationRequest request){
return shopInfoMapper.ListByCondition(request); return shopInfoMapper.ListByCondition(request);
} }
public Long getRegionIdByShopCode(String shopCode){ public Long getRegionIdByid(Long shopId){
return shopInfoMapper.getRegionIdByShopCode(shopCode); return shopInfoMapper.getRegionIdByid(shopId);
} }
} }

2
coolstore-partner-dao/src/main/java/com/cool/store/mapper/BankdocMapper.java
View File

@@ -5,6 +5,7 @@ import com.cool.store.entity.BankdocDO;
import com.cool.store.request.BranchBankPageRequest; import com.cool.store.request.BranchBankPageRequest;
import com.cool.store.request.LineInterviewPageRequest; import com.cool.store.request.LineInterviewPageRequest;
import com.github.pagehelper.Page; import com.github.pagehelper.Page;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
@@ -23,4 +24,5 @@ public interface BankdocMapper {
Page<BankdocDO> listBranchBank(BranchBankPageRequest request); Page<BankdocDO> listBranchBank(BranchBankPageRequest request);
} }

6
coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java
View File

@@ -76,14 +76,14 @@ public interface ShopInfoMapper extends Mapper<ShopInfoDO> {
/** /**
* @Auther: wangshuo * @Auther: wangshuo
* @Date: 2024/4/25 * @Date: 2024/4/25
* @description: 根据idlist 获取shopcode * @description: 根据idlist 获取storenum
*/ */
List<OpenPlanShopInfoDTO> queryShopCodeListByid(@Param("shopIdList") List<Long> shopIdList); List<OpenPlanShopInfoDTO> queryStoreNumeListByid(@Param("shopIdList") List<Long> shopIdList);
List<LineCountDTO> getSelectedShopNum(@Param("lineIds") List<Long> lineIds); List<LineCountDTO> getSelectedShopNum(@Param("lineIds") List<Long> lineIds);
List<PreparationDTO> ListByCondition(@Param("request") PreparationRequest request); List<PreparationDTO> ListByCondition(@Param("request") PreparationRequest request);
Long getRegionIdByShopCode(@Param("shopCode") String shopCode); Long getRegionIdByid(@Param("shopId") Long shopId);
} }

610
coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml
View File

@@ -1,310 +1,318 @@
<?xml version="1.0" encoding="UTF-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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.cool.store.mapper.LinePayMapper"> <mapper namespace="com.cool.store.mapper.LinePayMapper">
<resultMap id="BaseResultMap" type="com.cool.store.entity.LinePayDO"> <resultMap id="BaseResultMap" type="com.cool.store.entity.LinePayDO">
<id column="id" jdbcType="BIGINT" property="id" /> <id column="id" jdbcType="BIGINT" property="id"/>
<result column="partner_id" jdbcType="VARCHAR" property="partnerId" /> <result column="partner_id" jdbcType="VARCHAR" property="partnerId"/>
<result column="line_id" jdbcType="BIGINT" property="lineId" /> <result column="line_id" jdbcType="BIGINT" property="lineId"/>
<result column="pay_status" jdbcType="TINYINT" property="payStatus" /> <result column="pay_status" jdbcType="TINYINT" property="payStatus"/>
<result column="pay_type" jdbcType="TINYINT" property="payType" /> <result column="pay_type" jdbcType="TINYINT" property="payType"/>
<result column="pay_user_name" jdbcType="VARCHAR" property="payUserName" /> <result column="pay_user_name" jdbcType="VARCHAR" property="payUserName"/>
<result column="pay_account" jdbcType="VARCHAR" property="payAccount" /> <result column="pay_account" jdbcType="VARCHAR" property="payAccount"/>
<result column="bank_code" jdbcType="VARCHAR" property="bankCode" /> <result column="bank_code" jdbcType="VARCHAR" property="bankCode"/>
<result column="bank_name" jdbcType="VARCHAR" property="bankName" /> <result column="bank_name" jdbcType="VARCHAR" property="bankName"/>
<result column="branch_bank_code" jdbcType="VARCHAR" property="branchBankCode" /> <result column="branch_bank_code" jdbcType="VARCHAR" property="branchBankCode"/>
<result column="branch_bank_name" jdbcType="VARCHAR" property="branchBankName" /> <result column="branch_bank_name" jdbcType="VARCHAR" property="branchBankName"/>
<result column="pay_time" jdbcType="TIMESTAMP" property="payTime" /> <result column="pay_time" jdbcType="TIMESTAMP" property="payTime"/>
<result column="pay_pic" jdbcType="VARCHAR" property="payPic" /> <result column="pay_pic" jdbcType="VARCHAR" property="payPic"/>
<result column="promise_pic" jdbcType="VARCHAR" property="promisePic" /> <result column="promise_pic" jdbcType="VARCHAR" property="promisePic"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" /> <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" /> <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
<result column="create_user_id" jdbcType="VARCHAR" property="createUserId" /> <result column="create_user_id" jdbcType="VARCHAR" property="createUserId"/>
<result column="update_user_id" jdbcType="VARCHAR" property="updateUserId" /> <result column="update_user_id" jdbcType="VARCHAR" property="updateUserId"/>
<result column="deleted" jdbcType="BIT" property="deleted" /> <result column="deleted" jdbcType="BIT" property="deleted"/>
<result column="pay_business_type" jdbcType="TINYINT" property="payBusinessType" /> <result column="pay_business_type" jdbcType="TINYINT" property="payBusinessType"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, partner_id, line_id, pay_status, pay_type, pay_user_name, pay_account, bank_code, id
, partner_id, line_id, pay_status, pay_type, pay_user_name, pay_account, bank_code,
bank_name, branch_bank_code, branch_bank_name, pay_time, pay_pic, promise_pic, create_time, bank_name, branch_bank_code, branch_bank_name, pay_time, pay_pic, promise_pic, create_time,
update_time, create_user_id, update_user_id, deleted,pay_business_type update_time, create_user_id, update_user_id, deleted,pay_business_type
</sql> </sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List"/>
from xfsg_line_pay from xfsg_line_pay
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from xfsg_line_pay delete
where id = #{id,jdbcType=BIGINT} from xfsg_line_pay
</delete> where id = #{id,jdbcType=BIGINT}
<insert id="insertSelective" parameterType="com.cool.store.entity.LinePayDO"> </delete>
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long"> <insert id="insertSelective" parameterType="com.cool.store.entity.LinePayDO">
SELECT LAST_INSERT_ID() <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
</selectKey> SELECT LAST_INSERT_ID()
insert into xfsg_line_pay </selectKey>
<trim prefix="(" suffix=")" suffixOverrides=","> insert into xfsg_line_pay
<if test="partnerId != null"> <trim prefix="(" suffix=")" suffixOverrides=",">
partner_id, <if test="partnerId != null">
</if> partner_id,
<if test="lineId != null"> </if>
line_id, <if test="lineId != null">
</if> line_id,
<if test="payStatus != null"> </if>
pay_status, <if test="payStatus != null">
</if> pay_status,
<if test="payType != null"> </if>
pay_type, <if test="payType != null">
</if> pay_type,
<if test="payUserName != null"> </if>
pay_user_name, <if test="payUserName != null">
</if> pay_user_name,
<if test="payAccount != null"> </if>
pay_account, <if test="payAccount != null">
</if> pay_account,
<if test="bankCode != null"> </if>
bank_code, <if test="bankCode != null">
</if> bank_code,
<if test="bankName != null"> </if>
bank_name, <if test="bankName != null">
</if> bank_name,
<if test="branchBankCode != null"> </if>
branch_bank_code, <if test="branchBankCode != null">
</if> branch_bank_code,
<if test="branchBankName != null"> </if>
branch_bank_name, <if test="branchBankName != null">
</if> branch_bank_name,
<if test="payTime != null"> </if>
pay_time, <if test="payTime != null">
</if> pay_time,
<if test="payPic != null"> </if>
pay_pic, <if test="payPic != null">
</if> pay_pic,
<if test="promisePic != null"> </if>
promise_pic, <if test="promisePic != null">
</if> promise_pic,
<if test="createTime != null"> </if>
create_time, <if test="createTime != null">
</if> create_time,
<if test="updateTime != null"> </if>
update_time, <if test="updateTime != null">
</if> update_time,
<if test="createUserId != null"> </if>
create_user_id, <if test="createUserId != null">
</if> create_user_id,
<if test="updateUserId != null"> </if>
update_user_id, <if test="updateUserId != null">
</if> update_user_id,
<if test="deleted != null"> </if>
deleted, <if test="deleted != null">
</if> deleted,
</trim> </if>
<trim prefix="values (" suffix=")" suffixOverrides=","> <if test="payBusinessType !=null">
<if test="partnerId != null"> pay_business_type
#{partnerId,jdbcType=VARCHAR}, </if>
</if> </trim>
<if test="lineId != null"> <trim prefix="values (" suffix=")" suffixOverrides=",">
#{lineId,jdbcType=BIGINT}, <if test="partnerId != null">
</if> #{partnerId,jdbcType=VARCHAR},
<if test="payStatus != null"> </if>
#{payStatus,jdbcType=TINYINT}, <if test="lineId != null">
</if> #{lineId,jdbcType=BIGINT},
<if test="payType != null"> </if>
#{payType,jdbcType=TINYINT}, <if test="payStatus != null">
</if> #{payStatus,jdbcType=TINYINT},
<if test="payUserName != null"> </if>
#{payUserName,jdbcType=VARCHAR}, <if test="payType != null">
</if> #{payType,jdbcType=TINYINT},
<if test="payAccount != null"> </if>
#{payAccount,jdbcType=VARCHAR}, <if test="payUserName != null">
</if> #{payUserName,jdbcType=VARCHAR},
<if test="bankCode != null"> </if>
#{bankCode,jdbcType=VARCHAR}, <if test="payAccount != null">
</if> #{payAccount,jdbcType=VARCHAR},
<if test="bankName != null"> </if>
#{bankName,jdbcType=VARCHAR}, <if test="bankCode != null">
</if> #{bankCode,jdbcType=VARCHAR},
<if test="branchBankCode != null"> </if>
#{branchBankCode,jdbcType=VARCHAR}, <if test="bankName != null">
</if> #{bankName,jdbcType=VARCHAR},
<if test="branchBankName != null"> </if>
#{branchBankName,jdbcType=VARCHAR}, <if test="branchBankCode != null">
</if> #{branchBankCode,jdbcType=VARCHAR},
<if test="payTime != null"> </if>
#{payTime,jdbcType=TIMESTAMP}, <if test="branchBankName != null">
</if> #{branchBankName,jdbcType=VARCHAR},
<if test="payPic != null"> </if>
#{payPic,jdbcType=VARCHAR}, <if test="payTime != null">
</if> #{payTime,jdbcType=TIMESTAMP},
<if test="promisePic != null"> </if>
#{promisePic,jdbcType=VARCHAR}, <if test="payPic != null">
</if> #{payPic,jdbcType=VARCHAR},
<if test="createTime != null"> </if>
#{createTime,jdbcType=TIMESTAMP}, <if test="promisePic != null">
</if> #{promisePic,jdbcType=VARCHAR},
<if test="updateTime != null"> </if>
#{updateTime,jdbcType=TIMESTAMP}, <if test="createTime != null">
</if> #{createTime,jdbcType=TIMESTAMP},
<if test="createUserId != null"> </if>
#{createUserId,jdbcType=VARCHAR}, <if test="updateTime != null">
</if> #{updateTime,jdbcType=TIMESTAMP},
<if test="updateUserId != null"> </if>
#{updateUserId,jdbcType=VARCHAR}, <if test="createUserId != null">
</if> #{createUserId,jdbcType=VARCHAR},
<if test="deleted != null"> </if>
#{deleted,jdbcType=BIT}, <if test="updateUserId != null">
</if> #{updateUserId,jdbcType=VARCHAR},
</trim> </if>
</insert> <if test="deleted != null">
<update id="updateByPrimaryKeySelective" parameterType="com.cool.store.entity.LinePayDO"> #{deleted,jdbcType=BIT},
update xfsg_line_pay </if>
<set> <if test="payBusinessType !=null">
<if test="partnerId != null"> #{payBusinessType,jdbcType=TINYINT}
partner_id = #{partnerId,jdbcType=VARCHAR}, </if>
</if> </trim>
<if test="lineId != null"> </insert>
line_id = #{lineId,jdbcType=BIGINT}, <update id="updateByPrimaryKeySelective" parameterType="com.cool.store.entity.LinePayDO">
</if> update xfsg_line_pay
<if test="payStatus != null"> <set>
pay_status = #{payStatus,jdbcType=TINYINT}, <if test="partnerId != null">
</if> partner_id = #{partnerId,jdbcType=VARCHAR},
<if test="payType != null"> </if>
pay_type = #{payType,jdbcType=TINYINT}, <if test="lineId != null">
</if> line_id = #{lineId,jdbcType=BIGINT},
<if test="payUserName != null"> </if>
pay_user_name = #{payUserName,jdbcType=VARCHAR}, <if test="payStatus != null">
</if> pay_status = #{payStatus,jdbcType=TINYINT},
<if test="payAccount != null"> </if>
pay_account = #{payAccount,jdbcType=VARCHAR}, <if test="payType != null">
</if> pay_type = #{payType,jdbcType=TINYINT},
<if test="bankCode != null"> </if>
bank_code = #{bankCode,jdbcType=VARCHAR}, <if test="payUserName != null">
</if> pay_user_name = #{payUserName,jdbcType=VARCHAR},
<if test="bankName != null"> </if>
bank_name = #{bankName,jdbcType=VARCHAR}, <if test="payAccount != null">
</if> pay_account = #{payAccount,jdbcType=VARCHAR},
<if test="branchBankCode != null"> </if>
branch_bank_code = #{branchBankCode,jdbcType=VARCHAR}, <if test="bankCode != null">
</if> bank_code = #{bankCode,jdbcType=VARCHAR},
<if test="branchBankName != null"> </if>
branch_bank_name = #{branchBankName,jdbcType=VARCHAR}, <if test="bankName != null">
</if> bank_name = #{bankName,jdbcType=VARCHAR},
<if test="payTime != null"> </if>
pay_time = #{payTime,jdbcType=TIMESTAMP}, <if test="branchBankCode != null">
</if> branch_bank_code = #{branchBankCode,jdbcType=VARCHAR},
<if test="payPic != null"> </if>
pay_pic = #{payPic,jdbcType=VARCHAR}, <if test="branchBankName != null">
</if> branch_bank_name = #{branchBankName,jdbcType=VARCHAR},
<if test="promisePic != null"> </if>
promise_pic = #{promisePic,jdbcType=VARCHAR}, <if test="payTime != null">
</if> pay_time = #{payTime,jdbcType=TIMESTAMP},
<if test="createTime != null"> </if>
create_time = #{createTime,jdbcType=TIMESTAMP}, <if test="payPic != null">
</if> pay_pic = #{payPic,jdbcType=VARCHAR},
<if test="updateTime != null"> </if>
update_time = #{updateTime,jdbcType=TIMESTAMP}, <if test="promisePic != null">
</if> promise_pic = #{promisePic,jdbcType=VARCHAR},
<if test="createUserId != null"> </if>
create_user_id = #{createUserId,jdbcType=VARCHAR}, <if test="createTime != null">
</if> create_time = #{createTime,jdbcType=TIMESTAMP},
<if test="updateUserId != null"> </if>
update_user_id = #{updateUserId,jdbcType=VARCHAR}, <if test="updateTime != null">
</if> update_time = #{updateTime,jdbcType=TIMESTAMP},
<if test="deleted != null"> </if>
deleted = #{deleted,jdbcType=BIT}, <if test="createUserId != null">
</if> create_user_id = #{createUserId,jdbcType=VARCHAR},
</set> </if>
where id = #{id,jdbcType=BIGINT} <if test="updateUserId != null">
</update> update_user_id = #{updateUserId,jdbcType=VARCHAR},
<update id="updateByPidAndLid"> </if>
update xfsg_line_pay <if test="deleted != null">
set audit_id = #{auditId} deleted = #{deleted,jdbcType=BIT},
where line_id = #{lineId} </if>
and partner_id = #{partnerId} </set>
</update> where id = #{id,jdbcType=BIGINT}
<sql id="dynamicQuery"> </update>
<trim prefix="WHERE" prefixOverrides="AND | OR"> <update id="updateByPidAndLid">
<if test="null != id"> update xfsg_line_pay
and t.id = #{id,jdbcType=BIGINT} set audit_id = #{auditId}
</if> where line_id = #{lineId}
<if test="null != partnerId"> and partner_id = #{partnerId}
and t.partner_id = #{partnerId,jdbcType=VARCHAR} </update>
</if> <sql id="dynamicQuery">
<if test="null != lineId"> <trim prefix="WHERE" prefixOverrides="AND | OR">
and t.line_id = #{lineId,jdbcType=BIGINT} <if test="null != id">
</if> and t.id = #{id,jdbcType=BIGINT}
<if test="null != payStatus"> </if>
and t.pay_status = #{payStatus,jdbcType=TINYINT} <if test="null != partnerId">
</if> and t.partner_id = #{partnerId,jdbcType=VARCHAR}
<if test="null != payType"> </if>
and t.pay_type = #{payType,jdbcType=TINYINT} <if test="null != lineId">
</if> and t.line_id = #{lineId,jdbcType=BIGINT}
<if test="null != payUserName"> </if>
and t.pay_user_name = #{payUserName,jdbcType=VARCHAR} <if test="null != payStatus">
</if> and t.pay_status = #{payStatus,jdbcType=TINYINT}
<if test="null != payAccount"> </if>
and t.pay_account = #{payAccount,jdbcType=VARCHAR} <if test="null != payType">
</if> and t.pay_type = #{payType,jdbcType=TINYINT}
<if test="null != bankCode"> </if>
and t.bank_code = #{bankCode,jdbcType=VARCHAR} <if test="null != payUserName">
</if> and t.pay_user_name = #{payUserName,jdbcType=VARCHAR}
<if test="null != bankName"> </if>
and t.bank_name = #{bankName,jdbcType=VARCHAR} <if test="null != payAccount">
</if> and t.pay_account = #{payAccount,jdbcType=VARCHAR}
<if test="null != branchBankCode"> </if>
and t.branch_bank_code = #{branchBankCode,jdbcType=VARCHAR} <if test="null != bankCode">
</if> and t.bank_code = #{bankCode,jdbcType=VARCHAR}
<if test="null != branchBankName"> </if>
and t.branch_bank_name = #{branchBankName,jdbcType=VARCHAR} <if test="null != bankName">
</if> and t.bank_name = #{bankName,jdbcType=VARCHAR}
<if test="null != payTime"> </if>
and t.pay_time = #{payTime,jdbcType=TIMESTAMP} <if test="null != branchBankCode">
</if> and t.branch_bank_code = #{branchBankCode,jdbcType=VARCHAR}
<if test="null != payPic"> </if>
and t.pay_pic = #{payPic,jdbcType=VARCHAR} <if test="null != branchBankName">
</if> and t.branch_bank_name = #{branchBankName,jdbcType=VARCHAR}
<if test="null != promisePic"> </if>
and t.promise_pic = #{promisePic,jdbcType=VARCHAR} <if test="null != payTime">
</if> and t.pay_time = #{payTime,jdbcType=TIMESTAMP}
<if test="null != createTime"> </if>
and t.create_time = #{createTime,jdbcType=TIMESTAMP} <if test="null != payPic">
</if> and t.pay_pic = #{payPic,jdbcType=VARCHAR}
<if test="null != updateTime"> </if>
and t.update_time = #{updateTime,jdbcType=TIMESTAMP} <if test="null != promisePic">
</if> and t.promise_pic = #{promisePic,jdbcType=VARCHAR}
<if test="null != createUserId"> </if>
and t.create_user_id = #{createUserId,jdbcType=VARCHAR} <if test="null != createTime">
</if> and t.create_time = #{createTime,jdbcType=TIMESTAMP}
<if test="null != updateUserId"> </if>
and t.update_user_id = #{updateUserId,jdbcType=VARCHAR} <if test="null != updateTime">
</if> and t.update_time = #{updateTime,jdbcType=TIMESTAMP}
<if test="null != deleted"> </if>
and t.deleted = #{deleted,jdbcType=BIT} <if test="null != createUserId">
</if> and t.create_user_id = #{createUserId,jdbcType=VARCHAR}
</trim> </if>
</sql> <if test="null != updateUserId">
and t.update_user_id = #{updateUserId,jdbcType=VARCHAR}
</if>
<if test="null != deleted">
and t.deleted = #{deleted,jdbcType=BIT}
</if>
</trim>
</sql>
<select id="getLinePayByLineId" resultMap="BaseResultMap"> <select id="getLinePayByLineId" resultMap="BaseResultMap">
select * select *
from xfsg_line_pay from xfsg_line_pay
where line_id = #{lineId} where line_id = #{lineId}
and deleted = '0' and deleted = '0'
</select> </select>
<select id="getLinePayByLineIdAndPayType" resultMap="BaseResultMap"> <select id="getLinePayByLineIdAndPayType" resultMap="BaseResultMap">
select * select *
from xfsg_line_pay from xfsg_line_pay
where line_id = #{lineId} where line_id = #{lineId}
and deleted = '0' and deleted = '0'
and pay_business_type = #{payBusinessType} and pay_business_type = #{payBusinessType}
</select> </select>
<select id="getLinePayByLineIds" resultMap="BaseResultMap"> <select id="getLinePayByLineIds" resultMap="BaseResultMap">
select * from xfsg_line_pay where deleted = 0 select * from xfsg_line_pay where deleted = 0
<if test="lineIds !=null and lineIds.size>0"> <if test="lineIds !=null and lineIds.size>0">
<foreach collection="lineIds" item="lineId" open="and line_id in (" close=")" separator=","> <foreach collection="lineIds" item="lineId" open="and line_id in (" close=")" separator=",">
#{lineId} #{lineId}
</foreach> </foreach>
</if> </if>
</select> </select>
</mapper> </mapper>

2
coolstore-partner-dao/src/main/resources/mapper/OpeningOperationPlanMapper.xml
View File

@@ -47,7 +47,7 @@
<select id="getOpenPlanShopListByCondition" <select id="getOpenPlanShopListByCondition"
resultType="com.cool.store.dto.openPreparation.OpenPlanShopInfoDTO"> resultType="com.cool.store.dto.openPreparation.OpenPlanShopInfoDTO">
select si.id as shopId, si.region_id AS regionId,si.line_id as lineId, si.shop_name as shopName, select si.id as shopId, si.region_id AS regionId,si.line_id as lineId, si.shop_name as shopName,
si.shop_code as shopCode, si.shop_manager_user_id as shopManagerUserId,li.investment_manager AS investmentManagerId, si.store_num as storeNum, si.shop_manager_user_id as shopManagerUserId,li.investment_manager AS investmentManagerId,
li.username as partnerName, li.mobile as mobile , li.username as partnerName, li.mobile as mobile ,
op.submission_time AS submissionTime , op.result_type AS resultType op.submission_time AS submissionTime , op.result_type AS resultType
from xfsg_opening_operation_plan op from xfsg_opening_operation_plan op

10
coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
View File

@@ -79,13 +79,13 @@
where shop_stage = 2 where shop_stage = 2
and deleted = 0 and deleted = 0
</select> </select>
<select id="queryShopCodeListByid" resultType="com.cool.store.dto.openPreparation.OpenPlanShopInfoDTO"> <select id="queryStoreNumeListByid" resultType="com.cool.store.dto.openPreparation.OpenPlanShopInfoDTO">
select id as shopId,shop_code as shopCode select id as shopId,store_num as storeNum
from xfsg_shop_info from xfsg_shop_info
where 1=1 where 1=1
<if test="shopIdList != null and shopIdList.size >0"> <if test="shopIdList != null and shopIdList.size >0">
and id in and id in
<foreach collection="shopIdList" separator="," open="（" close="）" item="shopId"> <foreach collection="shopIdList" separator="," open="(" close=")" item="shopId">
#{shopId} #{shopId}
</foreach> </foreach>
</if> </if>
@@ -149,11 +149,11 @@
</foreach> </foreach>
</if> </if>
</select> </select>
<select id="getRegionIdByShopCode" resultType="java.lang.Long"> <select id="getRegionIdByid" resultType="java.lang.Long">
select r.parent_id select r.parent_id
from xfsg_shop_info xsi from xfsg_shop_info xsi
join region_${enterpriseId} r on r.id = xsi.region_id join region_${enterpriseId} r on r.id = xsi.region_id
where xsi.shop_code = #{shopCode} where xsi.id = #{shopId}
</select> </select>

4
coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/OpenPlanShopInfoDTO.java
View File

@@ -26,8 +26,8 @@ public class OpenPlanShopInfoDTO {
@ApiModelProperty("门店名字") @ApiModelProperty("门店名字")
private String shopName; private String shopName;
@ApiModelProperty("门店代码") @ApiModelProperty("门店编码")
private String shopCode; private String storeNum;
@ApiModelProperty("开店负责人id") @ApiModelProperty("开店负责人id")
private String shopManagerUserId; private String shopManagerUserId;

16
coolstore-partner-model/src/main/java/com/cool/store/request/DecorationPayRequest.java
View File

@@ -1,8 +1,10 @@
package com.cool.store.request; package com.cool.store.request;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotNull;
import java.util.Date; import java.util.Date;
/** /**
@@ -13,20 +15,30 @@ import java.util.Date;
*/ */
@Data @Data
public class DecorationPayRequest { public class DecorationPayRequest {
@ApiModelProperty("xfsg_user_info.partner_id")
private String partnerId;
@ApiModelProperty("line_info.id") @ApiModelProperty("line_info.id")
@NotNull(message = "线索id不能为空")
private Long lineId; private Long lineId;
@ApiModelProperty("店铺编码") @ApiModelProperty("店铺shopId")
private String shopCode; private String shopId;
@ApiModelProperty("加盟商姓名") @ApiModelProperty("加盟商姓名")
private String name; private String name;
@ApiModelProperty("支付账户") @ApiModelProperty("支付账户")
private String payAccount; private String payAccount;
@ApiModelProperty("开户行code") @ApiModelProperty("开户行code")
private String bankCode; private String bankCode;
@ApiModelProperty("开户行名称")
private String bankName;
@ApiModelProperty("支行code") @ApiModelProperty("支行code")
private String branchBankCode; private String branchBankCode;
@ApiModelProperty("支行名称")
private String branchBankName;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("缴纳时间") @ApiModelProperty("缴纳时间")
private Date payTime; private Date payTime;
@ApiModelProperty("付款截图") @ApiModelProperty("付款截图")
private String payPic; private String payPic;
@ApiModelProperty("支付类型 2-装修款")
private Integer payBusinessType;
} }

2
coolstore-partner-model/src/main/java/com/cool/store/vo/OpeningOperationPlanListVO.java
View File

@@ -22,7 +22,7 @@ public class OpeningOperationPlanListVO {
private String shopName; private String shopName;
@ApiModelProperty("门店代码") @ApiModelProperty("门店代码")
private String shopCode; private String storeNum;
@ApiModelProperty("开店负责人") @ApiModelProperty("开店负责人")
private String shopManagerName; private String shopManagerName;

9
coolstore-partner-service/src/main/java/com/cool/store/service/DecorationService.java
View File

@@ -3,6 +3,7 @@ package com.cool.store.service;
import com.cool.store.dto.decoration.ConstructionScheduleDTO; import com.cool.store.dto.decoration.ConstructionScheduleDTO;
import com.cool.store.dto.decoration.DecorationModelDTO; import com.cool.store.dto.decoration.DecorationModelDTO;
import com.cool.store.request.DecorationPayRequest; import com.cool.store.request.DecorationPayRequest;
import com.cool.store.request.LinePaySubmitRequest;
import com.cool.store.vo.DesignInfoVo; import com.cool.store.vo.DesignInfoVo;
import com.cool.store.vo.PartnerUserInfoVO; import com.cool.store.vo.PartnerUserInfoVO;
@@ -26,23 +27,23 @@ public interface DecorationService {
* @Date: 2024/4/28 * @Date: 2024/4/28
* @description:设计阶段信息 * @description:设计阶段信息
*/ */
DesignInfoVo DesignInfo(String shopCode); DesignInfoVo DesignInfo(Long shopId);
/** /**
* @Auther: wangshuo * @Auther: wangshuo
* @Date: 2024/4/28 * @Date: 2024/4/28
* @description:获取装修款和支付二维码 * @description:获取装修款和支付二维码
*/ */
DecorationModelDTO DecorationModel(String shopCode); DecorationModelDTO DecorationModel(Long shopId);
/** /**
* @Auther: wangshuo * @Auther: wangshuo
* @Date: 2024/4/28 * @Date: 2024/4/28
* @description:提交装修款付款凭证 * @description:提交装修款付款凭证
*/ */
String submitDecorationModel(DecorationPayRequest decorationPayRequest, PartnerUserInfoVO partnerUserInfoVO); String submitDecorationModel(LinePaySubmitRequest LinePaySubmitRequest, PartnerUserInfoVO partnerUserInfoVO);
/** /**
* @Auther: wangshuo * @Auther: wangshuo
* @Date: 2024/4/28 * @Date: 2024/4/28
* @description:施工阶段 * @description:施工阶段
*/ */
List<ConstructionScheduleDTO> getConstruction(String shopCode); List<ConstructionScheduleDTO> getConstruction(Long shopId);
} }

74
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java
View File

@@ -3,17 +3,26 @@ package com.cool.store.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.cool.store.context.PartnerUserHolder; import com.cool.store.context.PartnerUserHolder;
import com.cool.store.dao.LineInfoDAO;
import com.cool.store.dao.LinePayDAO; import com.cool.store.dao.LinePayDAO;
import com.cool.store.dao.RegionQrcodeConfigDao; import com.cool.store.dao.RegionQrcodeConfigDao;
import com.cool.store.dao.ShopInfoDAO; import com.cool.store.dao.ShopInfoDAO;
import com.cool.store.dto.decoration.*; import com.cool.store.dto.decoration.*;
import com.cool.store.dto.openPreparation.OpenPlanShopInfoDTO;
import com.cool.store.entity.LineInfoDO;
import com.cool.store.entity.LinePayDO; import com.cool.store.entity.LinePayDO;
import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.enums.WorkflowSubStageStatusEnum;
import com.cool.store.enums.point.PayBusinessTypeEnum;
import com.cool.store.enums.point.PayTypeEnum;
import com.cool.store.exception.ServiceException; import com.cool.store.exception.ServiceException;
import com.cool.store.request.DecorationPayRequest; import com.cool.store.request.DecorationPayRequest;
import com.cool.store.request.LinePaySubmitRequest;
import com.cool.store.service.DecorationService; import com.cool.store.service.DecorationService;
import com.cool.store.service.LinePayService;
import com.cool.store.service.YlfService; import com.cool.store.service.YlfService;
import com.cool.store.utils.poi.StringUtils; import com.cool.store.utils.poi.StringUtils;
import com.cool.store.utils.poi.constant.Constants;
import com.cool.store.vo.DesignInfoVo; import com.cool.store.vo.DesignInfoVo;
import com.cool.store.vo.PartnerUserInfoVO; import com.cool.store.vo.PartnerUserInfoVO;
import com.cool.store.vo.log.DesignLogVo; import com.cool.store.vo.log.DesignLogVo;
@@ -21,6 +30,7 @@ import org.apache.poi.ss.formula.functions.T;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.*; import java.util.*;
@@ -44,7 +54,10 @@ public class DecorationServiceImpl implements DecorationService {
@Resource @Resource
private ShopInfoDAO shopInfoDAO; private ShopInfoDAO shopInfoDAO;
@Resource @Resource
private LinePayDAO linePayDAO; private LineInfoDAO lineInfoDAO;
@Resource
private LinePayService linePayService;
private static String MEASURING_THE_ROOM = "量房"; private static String MEASURING_THE_ROOM = "量房";
private static String CONSTRUCTION_DRAWING = "施工图+预算"; private static String CONSTRUCTION_DRAWING = "施工图+预算";
@Override @Override
@@ -53,10 +66,8 @@ public class DecorationServiceImpl implements DecorationService {
} }
@Override @Override
public DesignInfoVo DesignInfo(String shopCode) { public DesignInfoVo DesignInfo(Long shopId) {
ProjectDTO projectList = ylfService.getProjectList(shopCode); DecorationDTO decoration = getDecorationDTO(shopId);
String projectId = projectList.getProjectId();
DecorationDTO decoration = ylfService.getDecoration(Long.parseLong(projectId));
List<DesignSchemeDTO> designScheme = decoration.getDesignScheme(); List<DesignSchemeDTO> designScheme = decoration.getDesignScheme();
List<ConstructionScheduleDTO> constructionSchedule = decoration.getConstructionSchedule(); List<ConstructionScheduleDTO> constructionSchedule = decoration.getConstructionSchedule();
@@ -78,54 +89,61 @@ public class DecorationServiceImpl implements DecorationService {
return designInfoVo; return designInfoVo;
} }
@Override @Override
public DecorationModelDTO DecorationModel(String shopCode) { public DecorationModelDTO DecorationModel(Long shopId) {
if (StringUtils.isEmpty(shopCode)){ if (shopId == null){
log.error("DecorationModel shopCode is null"); log.error("DecorationModel shopCode is null");
throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
} }
ProjectDTO projectList = ylfService.getProjectList(shopCode); DecorationDTO decoration = getDecorationDTO(shopId);
String projectId = projectList.getProjectId();
DecorationDTO decoration = ylfService.getDecoration(Long.parseLong(projectId));
//TODO 验证 //TODO 验证
//预算 //预算
List<BudgetDTO> proposedBookBudget = decoration.getProposedBookBudget(); List<BudgetDTO> proposedBookBudget = decoration.getProposedBookBudget();
Collections.sort(decoration.getProposedBookBudget(),(x1,x2)->x2.getId().compareTo(x1.getId())); Collections.sort(decoration.getProposedBookBudget(),(x1,x2)->x2.getId().compareTo(x1.getId()));
String totalAmount = proposedBookBudget.get(0).getTotalAmount(); String totalAmount = proposedBookBudget.get(0).getTotalAmount();
//支付二维码url //支付二维码url
Long regionId = shopInfoDAO.getRegionIdByShopCode(shopCode); Long regionId = shopInfoDAO.getRegionIdByid(shopId);
String payPic = regionQrcodeConfigDao.getPayPicByRegionId(regionId); String payPic = regionQrcodeConfigDao.getPayPicByRegionId(regionId);
DecorationModelDTO decorationModelDTO = new DecorationModelDTO(); DecorationModelDTO decorationModelDTO = new DecorationModelDTO();
decorationModelDTO.setPayUrl(payPic); decorationModelDTO.setPayUrl(payPic);
decorationModelDTO.setTotalAmount(totalAmount); decorationModelDTO.setTotalAmount(totalAmount);
return decorationModelDTO; return decorationModelDTO;
} }
@Transactional(rollbackFor = Exception.class)
@Override @Override
public String submitDecorationModel(DecorationPayRequest decorationPayRequest, PartnerUserInfoVO partnerUserInfoVO) { public String submitDecorationModel(LinePaySubmitRequest request, PartnerUserInfoVO partnerUserInfoVO) {
LinePayDO linePayDO =new LinePayDO(); DecorationDTO decoration = getDecorationDTO(request.getShopId());
BeanUtil.copyProperties(decorationPayRequest, linePayDO); if ( decoration.getPayment() != null && decoration.getPayment().size()>0){
linePayDO.setCreateTime(new Date()); request.setPayStatus(WorkflowSubStageStatusEnum.PAY_DEPOSIT_50.getCode());
linePayDO.setUpdateTime(new Date()); }else {
linePayDO.setLineId(partnerUserInfoVO.getLineId()); request.setPayStatus(WorkflowSubStageStatusEnum.PAY_DEPOSIT_45.getCode());
linePayDO.setCreateUserId(partnerUserInfoVO.getUsername()); }
linePayDO.setUpdateUserId(partnerUserInfoVO.getUsername());
linePayDO.setPayBusinessType(2); Long payId = linePayService.submitPayInfo(request, partnerUserInfoVO);
linePayDO.setPayType(2); return payId.toString();
return "";
} }
@Override @Override
public List<ConstructionScheduleDTO> getConstruction(String shopCode) { public List<ConstructionScheduleDTO> getConstruction(Long shopId) {
ProjectDTO projectList = ylfService.getProjectList(shopCode); DecorationDTO decoration = getDecorationDTO(shopId);
String projectId = projectList.getProjectId();
DecorationDTO decoration = ylfService.getDecoration(Long.parseLong(projectId));
List<ConstructionScheduleDTO> constructionSchedule = decoration.getConstructionSchedule(); List<ConstructionScheduleDTO> constructionSchedule = decoration.getConstructionSchedule();
Map<String, ConstructionScheduleDTO> constructionScheduleMap = constructionSchedule.stream().collect(Collectors.toMap(ConstructionScheduleDTO::getName, Map<String, ConstructionScheduleDTO> constructionScheduleMap = constructionSchedule.stream().collect(Collectors.toMap(ConstructionScheduleDTO::getName,
dto -> dto)); dto -> dto));
constructionScheduleMap.remove(MEASURING_THE_ROOM); constructionScheduleMap.remove(MEASURING_THE_ROOM);
constructionScheduleMap.remove(CONSTRUCTION_DRAWING); constructionScheduleMap.remove(CONSTRUCTION_DRAWING);
List<ConstructionScheduleDTO> collect = constructionScheduleMap.values().stream().collect(Collectors.toList()); List<ConstructionScheduleDTO> collect = constructionScheduleMap.values().stream().collect(Collectors.toList());
collect.sort(Comparator.comparing(ConstructionScheduleDTO::getId));
return collect; return collect;
} }
private DecorationDTO getDecorationDTO(Long shopId) {
List<Long> shopIds =new ArrayList<>();
shopIds.add(shopId);
List<OpenPlanShopInfoDTO> openPlanShopInfoDTOS = shopInfoDAO.queryStoreNumeListByid(shopIds);
String storeNum = openPlanShopInfoDTOS.get(0).getStoreNum();
ProjectDTO projectList = ylfService.getProjectList(storeNum);
String projectId = projectList.getProjectId();
DecorationDTO decoration = ylfService.getDecoration(Long.parseLong(projectId));
return decoration;
}
} }

21
coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java
View File

@@ -11,6 +11,8 @@ import com.cool.store.entity.LinePayDO;
import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.enums.WorkflowSubStageEnum; import com.cool.store.enums.WorkflowSubStageEnum;
import com.cool.store.enums.WorkflowSubStageStatusEnum; import com.cool.store.enums.WorkflowSubStageStatusEnum;
import com.cool.store.enums.point.PayBusinessTypeEnum;
import com.cool.store.enums.point.PayTypeEnum;
import com.cool.store.exception.ServiceException; import com.cool.store.exception.ServiceException;
import com.cool.store.mapper.FranchiseFeeMapper; import com.cool.store.mapper.FranchiseFeeMapper;
import com.cool.store.mapper.LineInfoMapper; import com.cool.store.mapper.LineInfoMapper;
@@ -82,7 +84,10 @@ public class LinePayServiceImpl implements LinePayService {
fillLinePay(false, linePayDO, request, partnerUser); fillLinePay(false, linePayDO, request, partnerUser);
linePayDAO.updateLinePay(linePayDO); linePayDAO.updateLinePay(linePayDO);
} }
}else { }
if(request.getPayBusinessType() != null
&& request.getPayBusinessType() == 0
&& request.getShopId() != null) {
LinePayDO linePayDO = linePayDAO.getLinePayByLineIdAndPayType(request.getLineId(),0); LinePayDO linePayDO = linePayDAO.getLinePayByLineIdAndPayType(request.getLineId(),0);
if(linePayDO == null){ if(linePayDO == null){
linePayDO = new LinePayDO(); linePayDO = new LinePayDO();
@@ -98,6 +103,20 @@ public class LinePayServiceImpl implements LinePayService {
lineInfoDAO.insertOrUpdate(lineInfo); lineInfoDAO.insertOrUpdate(lineInfo);
return linePayDO.getId(); return linePayDO.getId();
} }
if (request.getPayBusinessType() != null
&& request.getPayBusinessType() == PayBusinessTypeEnum.DECORATION_MODEL.getCode()
&& request.getShopId() != null){
LinePayDO linePayDO = linePayDAO.getLinePayByLineIdAndPayType(request.getLineId(),PayBusinessTypeEnum.DECORATION_MODEL.getCode());
if(linePayDO == null){
linePayDO = new LinePayDO();
fillLinePay(true, linePayDO, request, partnerUser);
linePayDAO.addLinePay(linePayDO);
}else {
fillLinePay(false, linePayDO, request, partnerUser);
linePayDAO.updateLinePay(linePayDO);
}
return linePayDO.getId();
}
return null; return null;
} }

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java
View File

@@ -164,7 +164,7 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
OpeningOperationPlanListVO openingOperationPlanListVO = new OpeningOperationPlanListVO(); OpeningOperationPlanListVO openingOperationPlanListVO = new OpeningOperationPlanListVO();
openingOperationPlanListVO.setShopId(x.getShopId()); openingOperationPlanListVO.setShopId(x.getShopId());
openingOperationPlanListVO.setShopName(x.getShopName()); openingOperationPlanListVO.setShopName(x.getShopName());
openingOperationPlanListVO.setShopCode(x.getShopCode()); openingOperationPlanListVO.setStoreNum(x.getStoreNum());
openingOperationPlanListVO.setPartnerName(x.getPartnerName()); openingOperationPlanListVO.setPartnerName(x.getPartnerName());
openingOperationPlanListVO.setMobile(x.getMobile()); openingOperationPlanListVO.setMobile(x.getMobile());
String[] split = regionNameMap.getOrDefault(x.getRegionId(), "").split("-"); String[] split = regionNameMap.getOrDefault(x.getRegionId(), "").split("-");

2
coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java
View File

@@ -53,6 +53,8 @@ public class SignValidateFilter implements Filter {
"/xfsg/favicon.ico", "/xfsg/favicon.ico",
"/xfsg/v2/api-docs","/**/test/**", "/xfsg/v2/api-docs","/**/test/**",
"/xfsg/mini/program/oss/getUploadFileConfig", "/xfsg/mini/program/oss/getUploadFileConfig",
//
"/xfsg/mini/decoration/**",
"/xfsg/mini/program/v1/partnerManage/partner/getIdentityCardInfo", "/xfsg/mini/program/v1/partnerManage/partner/getIdentityCardInfo",
"/**/swagger*/**", "/**/swagger*/**",
"/**/webjars/**", "/**/webjars/**",

4
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenPreparationController.java
View File

@@ -36,7 +36,7 @@ import java.util.List;
* @注释: * @注释:
*/ */
@RestController @RestController
@RequestMapping("/pc/OpenPreparation") @RequestMapping("/pc/openPreparation")
@Api(tags = "pc开业筹备") @Api(tags = "pc开业筹备")
@Slf4j @Slf4j
public class OpenPreparationController { public class OpenPreparationController {
@@ -71,7 +71,7 @@ public class OpenPreparationController {
return ResponseResult.success(auditOpeningOperationPlanService.auditPlan(request)); return ResponseResult.success(auditOpeningOperationPlanService.auditPlan(request));
} }
@GetMapping("/openingOperationPlan/planList") @PostMapping("/openingOperationPlan/planList")
@ApiOperation("查询运营方案列表") @ApiOperation("查询运营方案列表")
public ResponseResult<PageInfo<OpeningOperationPlanListVO>> planList(@RequestBody PlanListRequest request) { public ResponseResult<PageInfo<OpeningOperationPlanListVO>> planList(@RequestBody PlanListRequest request) {
return ResponseResult.success(openingOperationPlanService.getPlanListPage(request)); return ResponseResult.success(openingOperationPlanService.getPlanListPage(request));

23
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java
View File

@@ -6,6 +6,7 @@ import com.cool.store.dto.decoration.ConstructionScheduleDTO;
import com.cool.store.dto.decoration.DecorationDTO; import com.cool.store.dto.decoration.DecorationDTO;
import com.cool.store.dto.decoration.DecorationModelDTO; import com.cool.store.dto.decoration.DecorationModelDTO;
import com.cool.store.request.DecorationPayRequest; import com.cool.store.request.DecorationPayRequest;
import com.cool.store.request.LinePaySubmitRequest;
import com.cool.store.response.ResponseResult; import com.cool.store.response.ResponseResult;
import com.cool.store.service.CoolStoreStartFlowService; import com.cool.store.service.CoolStoreStartFlowService;
import com.cool.store.service.DecorationService; import com.cool.store.service.DecorationService;
@@ -13,6 +14,7 @@ import com.cool.store.service.YlfService;
import com.cool.store.vo.DesignInfoVo; import com.cool.store.vo.DesignInfoVo;
import com.cool.store.vo.PartnerUserInfoVO; import com.cool.store.vo.PartnerUserInfoVO;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -32,22 +34,19 @@ import java.util.List;
public class PCDecorationController { public class PCDecorationController {
@Resource @Resource
private DecorationService decorationService; private DecorationService decorationService;
@ApiModelProperty("获取设计阶段信息")
@GetMapping("/design") @GetMapping("/design")
public ResponseResult<DesignInfoVo> get(@RequestParam String shopCode){ public ResponseResult<DesignInfoVo> get(@RequestParam Long shopId){
return ResponseResult.success( decorationService.DesignInfo(shopCode)) ; return ResponseResult.success( decorationService.DesignInfo(shopId)) ;
} }
@ApiModelProperty("获取装修款信息,和二维码")
@GetMapping("/getDecorationModel") @GetMapping("/getDecorationModel")
public ResponseResult<DecorationModelDTO> getDecorationModel(@RequestParam String shopCode){ public ResponseResult<DecorationModelDTO> getDecorationModel(@RequestParam Long shopId){
return ResponseResult.success(decorationService.DecorationModel(shopCode)) ; return ResponseResult.success(decorationService.DecorationModel(shopId)) ;
}
@PostMapping("/submitDecorationModel")
public ResponseResult submitDecorationModel(@RequestBody DecorationPayRequest DecorationPayRequest){
PartnerUserInfoVO user = PartnerUserHolder.getUser();
decorationService.submitDecorationModel(DecorationPayRequest, user);
return ResponseResult.success();
} }
@ApiModelProperty("获取施工阶段信息")
@GetMapping("/getConstruction") @GetMapping("/getConstruction")
public ResponseResult<List<ConstructionScheduleDTO>> getConstruction(@RequestParam String shopCode){ public ResponseResult<List<ConstructionScheduleDTO>> getConstruction(@RequestParam Long shopId){
return ResponseResult.success(decorationService.getConstruction(shopCode)) ; return ResponseResult.success(decorationService.getConstruction(shopId)) ;
} }
} }

37
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java Normal file
View File

@@ -0,0 +1,37 @@
package com.cool.store.controller.webc;
import com.cool.store.context.PartnerUserHolder;
import com.cool.store.request.LinePaySubmitRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.DecorationService;
import com.cool.store.vo.PartnerUserInfoVO;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
/**
* @Auther: WangShuo
* @Date: 2024/04/29/下午2:46
* @Version 1.0
* @注释:
*/
@RestController
@RequestMapping("/mini/decoration")
@Api(tags = "mini装修阶段")
@Slf4j
public class MiniDecorationController {
@Resource
private DecorationService decorationService;
@PostMapping("/submitDecorationModel")
public ResponseResult submitDecorationModel(@RequestBody LinePaySubmitRequest linePaySubmitRequest){
PartnerUserInfoVO user = PartnerUserHolder.getUser();
user.setPartnerId("61bf57dc65334885802a278835f499d0");
decorationService.submitDecorationModel(linePaySubmitRequest, user);
return ResponseResult.success();
}
}

4
coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
View File

@@ -108,9 +108,9 @@ public class XxlJobHandler {
log.info("------今日没有待更新数据------"); log.info("------今日没有待更新数据------");
return; return;
} }
List<OpenPlanShopInfoDTO> openPlanShopInfoDTOS = shopInfoDAO.queryShopCodeListByid(shopIdListByStageStatus); List<OpenPlanShopInfoDTO> openPlanShopInfoDTOS = shopInfoDAO.queryStoreNumeListByid(shopIdListByStageStatus);
Map<Long, String> map = openPlanShopInfoDTOS.stream(). Map<Long, String> map = openPlanShopInfoDTOS.stream().
collect(Collectors.toMap(OpenPlanShopInfoDTO::getShopId, OpenPlanShopInfoDTO::getShopCode)); collect(Collectors.toMap(OpenPlanShopInfoDTO::getShopId, OpenPlanShopInfoDTO::getStoreNum));
for (Long shopId : map.keySet()){ for (Long shopId : map.keySet()){
String shopCode = map.get(shopId); String shopCode = map.get(shopId);
try { try {