新店装修阶段2.0+修改查询运营列表PSOT
This commit is contained in:
@@ -7,6 +7,7 @@ package com.cool.store.enums;
|
||||
* @注释:
|
||||
*/
|
||||
public enum ConstructionPhaseEnum {
|
||||
//施工阶段
|
||||
NOT_SHOWN(-1,"不显示"),
|
||||
NOT_START(0,"未开工"),
|
||||
construction_ING(1,"施工中"),
|
||||
|
||||
@@ -13,7 +13,7 @@ public enum DesignPhaseEnum {
|
||||
ACCEPTANCE_NOT_START(1, "未开始"),
|
||||
ACCEPTANCE_DESIGNING(2, "设计中"),
|
||||
ACCEPTED_NOT(3, "未验收"),
|
||||
|
||||
ACCEPTANCE_FAILEDS(0,"验收未通过"),
|
||||
AUDIT_WAIT(5,"待审批"),
|
||||
AUDIT_FAIL(6,"审批驳回"),
|
||||
AUDIT_ING(7,"审批中"),
|
||||
|
||||
@@ -24,7 +24,7 @@ public enum WorkflowSubStageStatusEnum {
|
||||
FIRST_INTERVIEWS_40(40,"一审未通过"),
|
||||
FIRST_INTERVIEWS_42(42,"一审重新预约"),
|
||||
|
||||
//缴纳意向金
|
||||
//缴纳意向金,装修款
|
||||
PAY_DEPOSIT_45(45,"待缴费"),
|
||||
PAY_DEPOSIT_50(50,"已缴费"),
|
||||
PAY_FAIL_55(55,"缴费失败"),
|
||||
@@ -51,6 +51,7 @@ public enum WorkflowSubStageStatusEnum {
|
||||
SECOND_INTERVIEWS_115(115,"二审未通过"),
|
||||
SECOND_INTERVIEWS_120(120,"二审重新预约"),
|
||||
SECOND_INTERVIEWS_125(125,"二审通过"),
|
||||
|
||||
;
|
||||
|
||||
private Integer code;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -148,17 +148,17 @@ public class ShopInfoDAO {
|
||||
/**
|
||||
* @Auther: wangshuo
|
||||
* @Date: 2024/4/25
|
||||
* @description: 根据idlist 获取shopcode
|
||||
* @description: 根据idlist 获取storeNum
|
||||
*/
|
||||
public List<OpenPlanShopInfoDTO> queryShopCodeListByid(@Param("shopIdList") List<Long> shopIdList){
|
||||
return shopInfoMapper.queryShopCodeListByid(shopIdList);
|
||||
public List<OpenPlanShopInfoDTO> queryStoreNumeListByid(List<Long> shopIdList){
|
||||
return shopInfoMapper.queryStoreNumeListByid(shopIdList);
|
||||
}
|
||||
|
||||
|
||||
public List<PreparationDTO> ListByCondition(PreparationRequest request){
|
||||
return shopInfoMapper.ListByCondition(request);
|
||||
}
|
||||
public Long getRegionIdByShopCode(String shopCode){
|
||||
return shopInfoMapper.getRegionIdByShopCode(shopCode);
|
||||
public Long getRegionIdByid(Long shopId){
|
||||
return shopInfoMapper.getRegionIdByid(shopId);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import com.cool.store.entity.BankdocDO;
|
||||
import com.cool.store.request.BranchBankPageRequest;
|
||||
import com.cool.store.request.LineInterviewPageRequest;
|
||||
import com.github.pagehelper.Page;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -23,4 +24,5 @@ public interface BankdocMapper {
|
||||
|
||||
Page<BankdocDO> listBranchBank(BranchBankPageRequest request);
|
||||
|
||||
|
||||
}
|
||||
@@ -76,14 +76,14 @@ public interface ShopInfoMapper extends Mapper<ShopInfoDO> {
|
||||
/**
|
||||
* @Auther: wangshuo
|
||||
* @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<PreparationDTO> ListByCondition(@Param("request") PreparationRequest request);
|
||||
|
||||
Long getRegionIdByShopCode(@Param("shopCode") String shopCode);
|
||||
Long getRegionIdByid(@Param("shopId") Long shopId);
|
||||
}
|
||||
@@ -1,310 +1,318 @@
|
||||
<?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.cool.store.mapper.LinePayMapper">
|
||||
<resultMap id="BaseResultMap" type="com.cool.store.entity.LinePayDO">
|
||||
<id column="id" jdbcType="BIGINT" property="id" />
|
||||
<result column="partner_id" jdbcType="VARCHAR" property="partnerId" />
|
||||
<result column="line_id" jdbcType="BIGINT" property="lineId" />
|
||||
<result column="pay_status" jdbcType="TINYINT" property="payStatus" />
|
||||
<result column="pay_type" jdbcType="TINYINT" property="payType" />
|
||||
<result column="pay_user_name" jdbcType="VARCHAR" property="payUserName" />
|
||||
<result column="pay_account" jdbcType="VARCHAR" property="payAccount" />
|
||||
<result column="bank_code" jdbcType="VARCHAR" property="bankCode" />
|
||||
<result column="bank_name" jdbcType="VARCHAR" property="bankName" />
|
||||
<result column="branch_bank_code" jdbcType="VARCHAR" property="branchBankCode" />
|
||||
<result column="branch_bank_name" jdbcType="VARCHAR" property="branchBankName" />
|
||||
<result column="pay_time" jdbcType="TIMESTAMP" property="payTime" />
|
||||
<result column="pay_pic" jdbcType="VARCHAR" property="payPic" />
|
||||
<result column="promise_pic" jdbcType="VARCHAR" property="promisePic" />
|
||||
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
|
||||
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
|
||||
<result column="create_user_id" jdbcType="VARCHAR" property="createUserId" />
|
||||
<result column="update_user_id" jdbcType="VARCHAR" property="updateUserId" />
|
||||
<result column="deleted" jdbcType="BIT" property="deleted" />
|
||||
<result column="pay_business_type" jdbcType="TINYINT" property="payBusinessType" />
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
id, partner_id, line_id, pay_status, pay_type, pay_user_name, pay_account, bank_code,
|
||||
<resultMap id="BaseResultMap" type="com.cool.store.entity.LinePayDO">
|
||||
<id column="id" jdbcType="BIGINT" property="id"/>
|
||||
<result column="partner_id" jdbcType="VARCHAR" property="partnerId"/>
|
||||
<result column="line_id" jdbcType="BIGINT" property="lineId"/>
|
||||
<result column="pay_status" jdbcType="TINYINT" property="payStatus"/>
|
||||
<result column="pay_type" jdbcType="TINYINT" property="payType"/>
|
||||
<result column="pay_user_name" jdbcType="VARCHAR" property="payUserName"/>
|
||||
<result column="pay_account" jdbcType="VARCHAR" property="payAccount"/>
|
||||
<result column="bank_code" jdbcType="VARCHAR" property="bankCode"/>
|
||||
<result column="bank_name" jdbcType="VARCHAR" property="bankName"/>
|
||||
<result column="branch_bank_code" jdbcType="VARCHAR" property="branchBankCode"/>
|
||||
<result column="branch_bank_name" jdbcType="VARCHAR" property="branchBankName"/>
|
||||
<result column="pay_time" jdbcType="TIMESTAMP" property="payTime"/>
|
||||
<result column="pay_pic" jdbcType="VARCHAR" property="payPic"/>
|
||||
<result column="promise_pic" jdbcType="VARCHAR" property="promisePic"/>
|
||||
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
|
||||
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
|
||||
<result column="create_user_id" jdbcType="VARCHAR" property="createUserId"/>
|
||||
<result column="update_user_id" jdbcType="VARCHAR" property="updateUserId"/>
|
||||
<result column="deleted" jdbcType="BIT" property="deleted"/>
|
||||
<result column="pay_business_type" jdbcType="TINYINT" property="payBusinessType"/>
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
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,
|
||||
update_time, create_user_id, update_user_id, deleted,pay_business_type
|
||||
</sql>
|
||||
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
|
||||
select
|
||||
<include refid="Base_Column_List" />
|
||||
from xfsg_line_pay
|
||||
where id = #{id,jdbcType=BIGINT}
|
||||
</select>
|
||||
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
|
||||
delete from xfsg_line_pay
|
||||
where id = #{id,jdbcType=BIGINT}
|
||||
</delete>
|
||||
<insert id="insertSelective" parameterType="com.cool.store.entity.LinePayDO">
|
||||
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
|
||||
SELECT LAST_INSERT_ID()
|
||||
</selectKey>
|
||||
insert into xfsg_line_pay
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="partnerId != null">
|
||||
partner_id,
|
||||
</if>
|
||||
<if test="lineId != null">
|
||||
line_id,
|
||||
</if>
|
||||
<if test="payStatus != null">
|
||||
pay_status,
|
||||
</if>
|
||||
<if test="payType != null">
|
||||
pay_type,
|
||||
</if>
|
||||
<if test="payUserName != null">
|
||||
pay_user_name,
|
||||
</if>
|
||||
<if test="payAccount != null">
|
||||
pay_account,
|
||||
</if>
|
||||
<if test="bankCode != null">
|
||||
bank_code,
|
||||
</if>
|
||||
<if test="bankName != null">
|
||||
bank_name,
|
||||
</if>
|
||||
<if test="branchBankCode != null">
|
||||
branch_bank_code,
|
||||
</if>
|
||||
<if test="branchBankName != null">
|
||||
branch_bank_name,
|
||||
</if>
|
||||
<if test="payTime != null">
|
||||
pay_time,
|
||||
</if>
|
||||
<if test="payPic != null">
|
||||
pay_pic,
|
||||
</if>
|
||||
<if test="promisePic != null">
|
||||
promise_pic,
|
||||
</if>
|
||||
<if test="createTime != null">
|
||||
create_time,
|
||||
</if>
|
||||
<if test="updateTime != null">
|
||||
update_time,
|
||||
</if>
|
||||
<if test="createUserId != null">
|
||||
create_user_id,
|
||||
</if>
|
||||
<if test="updateUserId != null">
|
||||
update_user_id,
|
||||
</if>
|
||||
<if test="deleted != null">
|
||||
deleted,
|
||||
</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="partnerId != null">
|
||||
#{partnerId,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="lineId != null">
|
||||
#{lineId,jdbcType=BIGINT},
|
||||
</if>
|
||||
<if test="payStatus != null">
|
||||
#{payStatus,jdbcType=TINYINT},
|
||||
</if>
|
||||
<if test="payType != null">
|
||||
#{payType,jdbcType=TINYINT},
|
||||
</if>
|
||||
<if test="payUserName != null">
|
||||
#{payUserName,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="payAccount != null">
|
||||
#{payAccount,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="bankCode != null">
|
||||
#{bankCode,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="bankName != null">
|
||||
#{bankName,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="branchBankCode != null">
|
||||
#{branchBankCode,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="branchBankName != null">
|
||||
#{branchBankName,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="payTime != null">
|
||||
#{payTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
<if test="payPic != null">
|
||||
#{payPic,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="promisePic != null">
|
||||
#{promisePic,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="createTime != null">
|
||||
#{createTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
<if test="updateTime != null">
|
||||
#{updateTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
<if test="createUserId != null">
|
||||
#{createUserId,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="updateUserId != null">
|
||||
#{updateUserId,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="deleted != null">
|
||||
#{deleted,jdbcType=BIT},
|
||||
</if>
|
||||
</trim>
|
||||
</insert>
|
||||
<update id="updateByPrimaryKeySelective" parameterType="com.cool.store.entity.LinePayDO">
|
||||
update xfsg_line_pay
|
||||
<set>
|
||||
<if test="partnerId != null">
|
||||
partner_id = #{partnerId,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="lineId != null">
|
||||
line_id = #{lineId,jdbcType=BIGINT},
|
||||
</if>
|
||||
<if test="payStatus != null">
|
||||
pay_status = #{payStatus,jdbcType=TINYINT},
|
||||
</if>
|
||||
<if test="payType != null">
|
||||
pay_type = #{payType,jdbcType=TINYINT},
|
||||
</if>
|
||||
<if test="payUserName != null">
|
||||
pay_user_name = #{payUserName,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="payAccount != null">
|
||||
pay_account = #{payAccount,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="bankCode != null">
|
||||
bank_code = #{bankCode,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="bankName != null">
|
||||
bank_name = #{bankName,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="branchBankCode != null">
|
||||
branch_bank_code = #{branchBankCode,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="branchBankName != null">
|
||||
branch_bank_name = #{branchBankName,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="payTime != null">
|
||||
pay_time = #{payTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
<if test="payPic != null">
|
||||
pay_pic = #{payPic,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="promisePic != null">
|
||||
promise_pic = #{promisePic,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="createTime != null">
|
||||
create_time = #{createTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
<if test="updateTime != null">
|
||||
update_time = #{updateTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
<if test="createUserId != null">
|
||||
create_user_id = #{createUserId,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="updateUserId != null">
|
||||
update_user_id = #{updateUserId,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="deleted != null">
|
||||
deleted = #{deleted,jdbcType=BIT},
|
||||
</if>
|
||||
</set>
|
||||
where id = #{id,jdbcType=BIGINT}
|
||||
</update>
|
||||
<update id="updateByPidAndLid">
|
||||
update xfsg_line_pay
|
||||
set audit_id = #{auditId}
|
||||
where line_id = #{lineId}
|
||||
and partner_id = #{partnerId}
|
||||
</update>
|
||||
<sql id="dynamicQuery">
|
||||
<trim prefix="WHERE" prefixOverrides="AND | OR">
|
||||
<if test="null != id">
|
||||
and t.id = #{id,jdbcType=BIGINT}
|
||||
</if>
|
||||
<if test="null != partnerId">
|
||||
and t.partner_id = #{partnerId,jdbcType=VARCHAR}
|
||||
</if>
|
||||
<if test="null != lineId">
|
||||
and t.line_id = #{lineId,jdbcType=BIGINT}
|
||||
</if>
|
||||
<if test="null != payStatus">
|
||||
and t.pay_status = #{payStatus,jdbcType=TINYINT}
|
||||
</if>
|
||||
<if test="null != payType">
|
||||
and t.pay_type = #{payType,jdbcType=TINYINT}
|
||||
</if>
|
||||
<if test="null != payUserName">
|
||||
and t.pay_user_name = #{payUserName,jdbcType=VARCHAR}
|
||||
</if>
|
||||
<if test="null != payAccount">
|
||||
and t.pay_account = #{payAccount,jdbcType=VARCHAR}
|
||||
</if>
|
||||
<if test="null != bankCode">
|
||||
and t.bank_code = #{bankCode,jdbcType=VARCHAR}
|
||||
</if>
|
||||
<if test="null != bankName">
|
||||
and t.bank_name = #{bankName,jdbcType=VARCHAR}
|
||||
</if>
|
||||
<if test="null != branchBankCode">
|
||||
and t.branch_bank_code = #{branchBankCode,jdbcType=VARCHAR}
|
||||
</if>
|
||||
<if test="null != branchBankName">
|
||||
and t.branch_bank_name = #{branchBankName,jdbcType=VARCHAR}
|
||||
</if>
|
||||
<if test="null != payTime">
|
||||
and t.pay_time = #{payTime,jdbcType=TIMESTAMP}
|
||||
</if>
|
||||
<if test="null != payPic">
|
||||
and t.pay_pic = #{payPic,jdbcType=VARCHAR}
|
||||
</if>
|
||||
<if test="null != promisePic">
|
||||
and t.promise_pic = #{promisePic,jdbcType=VARCHAR}
|
||||
</if>
|
||||
<if test="null != createTime">
|
||||
and t.create_time = #{createTime,jdbcType=TIMESTAMP}
|
||||
</if>
|
||||
<if test="null != updateTime">
|
||||
and t.update_time = #{updateTime,jdbcType=TIMESTAMP}
|
||||
</if>
|
||||
<if test="null != createUserId">
|
||||
and t.create_user_id = #{createUserId,jdbcType=VARCHAR}
|
||||
</if>
|
||||
<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>
|
||||
</sql>
|
||||
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
|
||||
select
|
||||
<include refid="Base_Column_List"/>
|
||||
from xfsg_line_pay
|
||||
where id = #{id,jdbcType=BIGINT}
|
||||
</select>
|
||||
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
|
||||
delete
|
||||
from xfsg_line_pay
|
||||
where id = #{id,jdbcType=BIGINT}
|
||||
</delete>
|
||||
<insert id="insertSelective" parameterType="com.cool.store.entity.LinePayDO">
|
||||
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
|
||||
SELECT LAST_INSERT_ID()
|
||||
</selectKey>
|
||||
insert into xfsg_line_pay
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="partnerId != null">
|
||||
partner_id,
|
||||
</if>
|
||||
<if test="lineId != null">
|
||||
line_id,
|
||||
</if>
|
||||
<if test="payStatus != null">
|
||||
pay_status,
|
||||
</if>
|
||||
<if test="payType != null">
|
||||
pay_type,
|
||||
</if>
|
||||
<if test="payUserName != null">
|
||||
pay_user_name,
|
||||
</if>
|
||||
<if test="payAccount != null">
|
||||
pay_account,
|
||||
</if>
|
||||
<if test="bankCode != null">
|
||||
bank_code,
|
||||
</if>
|
||||
<if test="bankName != null">
|
||||
bank_name,
|
||||
</if>
|
||||
<if test="branchBankCode != null">
|
||||
branch_bank_code,
|
||||
</if>
|
||||
<if test="branchBankName != null">
|
||||
branch_bank_name,
|
||||
</if>
|
||||
<if test="payTime != null">
|
||||
pay_time,
|
||||
</if>
|
||||
<if test="payPic != null">
|
||||
pay_pic,
|
||||
</if>
|
||||
<if test="promisePic != null">
|
||||
promise_pic,
|
||||
</if>
|
||||
<if test="createTime != null">
|
||||
create_time,
|
||||
</if>
|
||||
<if test="updateTime != null">
|
||||
update_time,
|
||||
</if>
|
||||
<if test="createUserId != null">
|
||||
create_user_id,
|
||||
</if>
|
||||
<if test="updateUserId != null">
|
||||
update_user_id,
|
||||
</if>
|
||||
<if test="deleted != null">
|
||||
deleted,
|
||||
</if>
|
||||
<if test="payBusinessType !=null">
|
||||
pay_business_type
|
||||
</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="partnerId != null">
|
||||
#{partnerId,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="lineId != null">
|
||||
#{lineId,jdbcType=BIGINT},
|
||||
</if>
|
||||
<if test="payStatus != null">
|
||||
#{payStatus,jdbcType=TINYINT},
|
||||
</if>
|
||||
<if test="payType != null">
|
||||
#{payType,jdbcType=TINYINT},
|
||||
</if>
|
||||
<if test="payUserName != null">
|
||||
#{payUserName,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="payAccount != null">
|
||||
#{payAccount,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="bankCode != null">
|
||||
#{bankCode,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="bankName != null">
|
||||
#{bankName,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="branchBankCode != null">
|
||||
#{branchBankCode,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="branchBankName != null">
|
||||
#{branchBankName,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="payTime != null">
|
||||
#{payTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
<if test="payPic != null">
|
||||
#{payPic,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="promisePic != null">
|
||||
#{promisePic,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="createTime != null">
|
||||
#{createTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
<if test="updateTime != null">
|
||||
#{updateTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
<if test="createUserId != null">
|
||||
#{createUserId,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="updateUserId != null">
|
||||
#{updateUserId,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="deleted != null">
|
||||
#{deleted,jdbcType=BIT},
|
||||
</if>
|
||||
<if test="payBusinessType !=null">
|
||||
#{payBusinessType,jdbcType=TINYINT}
|
||||
</if>
|
||||
</trim>
|
||||
</insert>
|
||||
<update id="updateByPrimaryKeySelective" parameterType="com.cool.store.entity.LinePayDO">
|
||||
update xfsg_line_pay
|
||||
<set>
|
||||
<if test="partnerId != null">
|
||||
partner_id = #{partnerId,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="lineId != null">
|
||||
line_id = #{lineId,jdbcType=BIGINT},
|
||||
</if>
|
||||
<if test="payStatus != null">
|
||||
pay_status = #{payStatus,jdbcType=TINYINT},
|
||||
</if>
|
||||
<if test="payType != null">
|
||||
pay_type = #{payType,jdbcType=TINYINT},
|
||||
</if>
|
||||
<if test="payUserName != null">
|
||||
pay_user_name = #{payUserName,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="payAccount != null">
|
||||
pay_account = #{payAccount,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="bankCode != null">
|
||||
bank_code = #{bankCode,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="bankName != null">
|
||||
bank_name = #{bankName,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="branchBankCode != null">
|
||||
branch_bank_code = #{branchBankCode,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="branchBankName != null">
|
||||
branch_bank_name = #{branchBankName,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="payTime != null">
|
||||
pay_time = #{payTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
<if test="payPic != null">
|
||||
pay_pic = #{payPic,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="promisePic != null">
|
||||
promise_pic = #{promisePic,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="createTime != null">
|
||||
create_time = #{createTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
<if test="updateTime != null">
|
||||
update_time = #{updateTime,jdbcType=TIMESTAMP},
|
||||
</if>
|
||||
<if test="createUserId != null">
|
||||
create_user_id = #{createUserId,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="updateUserId != null">
|
||||
update_user_id = #{updateUserId,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="deleted != null">
|
||||
deleted = #{deleted,jdbcType=BIT},
|
||||
</if>
|
||||
</set>
|
||||
where id = #{id,jdbcType=BIGINT}
|
||||
</update>
|
||||
<update id="updateByPidAndLid">
|
||||
update xfsg_line_pay
|
||||
set audit_id = #{auditId}
|
||||
where line_id = #{lineId}
|
||||
and partner_id = #{partnerId}
|
||||
</update>
|
||||
<sql id="dynamicQuery">
|
||||
<trim prefix="WHERE" prefixOverrides="AND | OR">
|
||||
<if test="null != id">
|
||||
and t.id = #{id,jdbcType=BIGINT}
|
||||
</if>
|
||||
<if test="null != partnerId">
|
||||
and t.partner_id = #{partnerId,jdbcType=VARCHAR}
|
||||
</if>
|
||||
<if test="null != lineId">
|
||||
and t.line_id = #{lineId,jdbcType=BIGINT}
|
||||
</if>
|
||||
<if test="null != payStatus">
|
||||
and t.pay_status = #{payStatus,jdbcType=TINYINT}
|
||||
</if>
|
||||
<if test="null != payType">
|
||||
and t.pay_type = #{payType,jdbcType=TINYINT}
|
||||
</if>
|
||||
<if test="null != payUserName">
|
||||
and t.pay_user_name = #{payUserName,jdbcType=VARCHAR}
|
||||
</if>
|
||||
<if test="null != payAccount">
|
||||
and t.pay_account = #{payAccount,jdbcType=VARCHAR}
|
||||
</if>
|
||||
<if test="null != bankCode">
|
||||
and t.bank_code = #{bankCode,jdbcType=VARCHAR}
|
||||
</if>
|
||||
<if test="null != bankName">
|
||||
and t.bank_name = #{bankName,jdbcType=VARCHAR}
|
||||
</if>
|
||||
<if test="null != branchBankCode">
|
||||
and t.branch_bank_code = #{branchBankCode,jdbcType=VARCHAR}
|
||||
</if>
|
||||
<if test="null != branchBankName">
|
||||
and t.branch_bank_name = #{branchBankName,jdbcType=VARCHAR}
|
||||
</if>
|
||||
<if test="null != payTime">
|
||||
and t.pay_time = #{payTime,jdbcType=TIMESTAMP}
|
||||
</if>
|
||||
<if test="null != payPic">
|
||||
and t.pay_pic = #{payPic,jdbcType=VARCHAR}
|
||||
</if>
|
||||
<if test="null != promisePic">
|
||||
and t.promise_pic = #{promisePic,jdbcType=VARCHAR}
|
||||
</if>
|
||||
<if test="null != createTime">
|
||||
and t.create_time = #{createTime,jdbcType=TIMESTAMP}
|
||||
</if>
|
||||
<if test="null != updateTime">
|
||||
and t.update_time = #{updateTime,jdbcType=TIMESTAMP}
|
||||
</if>
|
||||
<if test="null != createUserId">
|
||||
and t.create_user_id = #{createUserId,jdbcType=VARCHAR}
|
||||
</if>
|
||||
<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 *
|
||||
from xfsg_line_pay
|
||||
where line_id = #{lineId}
|
||||
and deleted = '0'
|
||||
</select>
|
||||
<select id="getLinePayByLineId" resultMap="BaseResultMap">
|
||||
select *
|
||||
from xfsg_line_pay
|
||||
where line_id = #{lineId}
|
||||
and deleted = '0'
|
||||
</select>
|
||||
|
||||
<select id="getLinePayByLineIdAndPayType" resultMap="BaseResultMap">
|
||||
select *
|
||||
from xfsg_line_pay
|
||||
where line_id = #{lineId}
|
||||
and deleted = '0'
|
||||
and pay_business_type = #{payBusinessType}
|
||||
</select>
|
||||
<select id="getLinePayByLineIdAndPayType" resultMap="BaseResultMap">
|
||||
select *
|
||||
from xfsg_line_pay
|
||||
where line_id = #{lineId}
|
||||
and deleted = '0'
|
||||
and pay_business_type = #{payBusinessType}
|
||||
</select>
|
||||
|
||||
<select id="getLinePayByLineIds" resultMap="BaseResultMap">
|
||||
select * from xfsg_line_pay where deleted = 0
|
||||
<if test="lineIds !=null and lineIds.size>0">
|
||||
<foreach collection="lineIds" item="lineId" open="and line_id in (" close=")" separator=",">
|
||||
#{lineId}
|
||||
</foreach>
|
||||
</if>
|
||||
</select>
|
||||
<select id="getLinePayByLineIds" resultMap="BaseResultMap">
|
||||
select * from xfsg_line_pay where deleted = 0
|
||||
<if test="lineIds !=null and lineIds.size>0">
|
||||
<foreach collection="lineIds" item="lineId" open="and line_id in (" close=")" separator=",">
|
||||
#{lineId}
|
||||
</foreach>
|
||||
</if>
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -47,7 +47,7 @@
|
||||
<select id="getOpenPlanShopListByCondition"
|
||||
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,
|
||||
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 ,
|
||||
op.submission_time AS submissionTime , op.result_type AS resultType
|
||||
from xfsg_opening_operation_plan op
|
||||
|
||||
@@ -79,13 +79,13 @@
|
||||
where shop_stage = 2
|
||||
and deleted = 0
|
||||
</select>
|
||||
<select id="queryShopCodeListByid" resultType="com.cool.store.dto.openPreparation.OpenPlanShopInfoDTO">
|
||||
select id as shopId,shop_code as shopCode
|
||||
<select id="queryStoreNumeListByid" resultType="com.cool.store.dto.openPreparation.OpenPlanShopInfoDTO">
|
||||
select id as shopId,store_num as storeNum
|
||||
from xfsg_shop_info
|
||||
where 1=1
|
||||
<if test="shopIdList != null and shopIdList.size >0">
|
||||
and id in
|
||||
<foreach collection="shopIdList" separator="," open="(" close=")" item="shopId">
|
||||
<foreach collection="shopIdList" separator="," open="(" close=")" item="shopId">
|
||||
#{shopId}
|
||||
</foreach>
|
||||
</if>
|
||||
@@ -149,11 +149,11 @@
|
||||
</foreach>
|
||||
</if>
|
||||
</select>
|
||||
<select id="getRegionIdByShopCode" resultType="java.lang.Long">
|
||||
<select id="getRegionIdByid" resultType="java.lang.Long">
|
||||
select r.parent_id
|
||||
from xfsg_shop_info xsi
|
||||
join region_${enterpriseId} r on r.id = xsi.region_id
|
||||
where xsi.shop_code = #{shopCode}
|
||||
where xsi.id = #{shopId}
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
@@ -26,8 +26,8 @@ public class OpenPlanShopInfoDTO {
|
||||
@ApiModelProperty("门店名字")
|
||||
private String shopName;
|
||||
|
||||
@ApiModelProperty("门店代码")
|
||||
private String shopCode;
|
||||
@ApiModelProperty("门店编码")
|
||||
private String storeNum;
|
||||
|
||||
@ApiModelProperty("开店负责人id")
|
||||
private String shopManagerUserId;
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
package com.cool.store.request;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
@@ -13,20 +15,30 @@ import java.util.Date;
|
||||
*/
|
||||
@Data
|
||||
public class DecorationPayRequest {
|
||||
@ApiModelProperty("xfsg_user_info.partner_id")
|
||||
private String partnerId;
|
||||
@ApiModelProperty("line_info.id")
|
||||
@NotNull(message = "线索id不能为空")
|
||||
private Long lineId;
|
||||
@ApiModelProperty("店铺编码")
|
||||
private String shopCode;
|
||||
@ApiModelProperty("店铺shopId")
|
||||
private String shopId;
|
||||
@ApiModelProperty("加盟商姓名")
|
||||
private String name;
|
||||
@ApiModelProperty("支付账户")
|
||||
private String payAccount;
|
||||
@ApiModelProperty("开户行code")
|
||||
private String bankCode;
|
||||
@ApiModelProperty("开户行名称")
|
||||
private String bankName;
|
||||
@ApiModelProperty("支行code")
|
||||
private String branchBankCode;
|
||||
@ApiModelProperty("支行名称")
|
||||
private String branchBankName;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty("缴纳时间")
|
||||
private Date payTime;
|
||||
@ApiModelProperty("付款截图")
|
||||
private String payPic;
|
||||
@ApiModelProperty("支付类型 2-装修款")
|
||||
private Integer payBusinessType;
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ public class OpeningOperationPlanListVO {
|
||||
private String shopName;
|
||||
|
||||
@ApiModelProperty("门店代码")
|
||||
private String shopCode;
|
||||
private String storeNum;
|
||||
|
||||
@ApiModelProperty("开店负责人")
|
||||
private String shopManagerName;
|
||||
|
||||
@@ -3,6 +3,7 @@ package com.cool.store.service;
|
||||
import com.cool.store.dto.decoration.ConstructionScheduleDTO;
|
||||
import com.cool.store.dto.decoration.DecorationModelDTO;
|
||||
import com.cool.store.request.DecorationPayRequest;
|
||||
import com.cool.store.request.LinePaySubmitRequest;
|
||||
import com.cool.store.vo.DesignInfoVo;
|
||||
import com.cool.store.vo.PartnerUserInfoVO;
|
||||
|
||||
@@ -26,23 +27,23 @@ public interface DecorationService {
|
||||
* @Date: 2024/4/28
|
||||
* @description:设计阶段信息
|
||||
*/
|
||||
DesignInfoVo DesignInfo(String shopCode);
|
||||
DesignInfoVo DesignInfo(Long shopId);
|
||||
/**
|
||||
* @Auther: wangshuo
|
||||
* @Date: 2024/4/28
|
||||
* @description:获取装修款和支付二维码
|
||||
*/
|
||||
DecorationModelDTO DecorationModel(String shopCode);
|
||||
DecorationModelDTO DecorationModel(Long shopId);
|
||||
/**
|
||||
* @Auther: wangshuo
|
||||
* @Date: 2024/4/28
|
||||
* @description:提交装修款付款凭证
|
||||
*/
|
||||
String submitDecorationModel(DecorationPayRequest decorationPayRequest, PartnerUserInfoVO partnerUserInfoVO);
|
||||
String submitDecorationModel(LinePaySubmitRequest LinePaySubmitRequest, PartnerUserInfoVO partnerUserInfoVO);
|
||||
/**
|
||||
* @Auther: wangshuo
|
||||
* @Date: 2024/4/28
|
||||
* @description:施工阶段
|
||||
*/
|
||||
List<ConstructionScheduleDTO> getConstruction(String shopCode);
|
||||
List<ConstructionScheduleDTO> getConstruction(Long shopId);
|
||||
}
|
||||
|
||||
@@ -3,17 +3,26 @@ package com.cool.store.service.impl;
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.cool.store.context.PartnerUserHolder;
|
||||
import com.cool.store.dao.LineInfoDAO;
|
||||
import com.cool.store.dao.LinePayDAO;
|
||||
import com.cool.store.dao.RegionQrcodeConfigDao;
|
||||
import com.cool.store.dao.ShopInfoDAO;
|
||||
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.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.request.DecorationPayRequest;
|
||||
import com.cool.store.request.LinePaySubmitRequest;
|
||||
import com.cool.store.service.DecorationService;
|
||||
import com.cool.store.service.LinePayService;
|
||||
import com.cool.store.service.YlfService;
|
||||
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.PartnerUserInfoVO;
|
||||
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.LoggerFactory;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.*;
|
||||
@@ -44,7 +54,10 @@ public class DecorationServiceImpl implements DecorationService {
|
||||
@Resource
|
||||
private ShopInfoDAO shopInfoDAO;
|
||||
@Resource
|
||||
private LinePayDAO linePayDAO;
|
||||
private LineInfoDAO lineInfoDAO;
|
||||
|
||||
@Resource
|
||||
private LinePayService linePayService;
|
||||
private static String MEASURING_THE_ROOM = "量房";
|
||||
private static String CONSTRUCTION_DRAWING = "施工图+预算";
|
||||
@Override
|
||||
@@ -53,10 +66,8 @@ public class DecorationServiceImpl implements DecorationService {
|
||||
}
|
||||
|
||||
@Override
|
||||
public DesignInfoVo DesignInfo(String shopCode) {
|
||||
ProjectDTO projectList = ylfService.getProjectList(shopCode);
|
||||
String projectId = projectList.getProjectId();
|
||||
DecorationDTO decoration = ylfService.getDecoration(Long.parseLong(projectId));
|
||||
public DesignInfoVo DesignInfo(Long shopId) {
|
||||
DecorationDTO decoration = getDecorationDTO(shopId);
|
||||
List<DesignSchemeDTO> designScheme = decoration.getDesignScheme();
|
||||
|
||||
List<ConstructionScheduleDTO> constructionSchedule = decoration.getConstructionSchedule();
|
||||
@@ -78,54 +89,61 @@ public class DecorationServiceImpl implements DecorationService {
|
||||
return designInfoVo;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public DecorationModelDTO DecorationModel(String shopCode) {
|
||||
if (StringUtils.isEmpty(shopCode)){
|
||||
public DecorationModelDTO DecorationModel(Long shopId) {
|
||||
if (shopId == null){
|
||||
log.error("DecorationModel shopCode is null");
|
||||
throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
|
||||
}
|
||||
ProjectDTO projectList = ylfService.getProjectList(shopCode);
|
||||
String projectId = projectList.getProjectId();
|
||||
DecorationDTO decoration = ylfService.getDecoration(Long.parseLong(projectId));
|
||||
DecorationDTO decoration = getDecorationDTO(shopId);
|
||||
//TODO 验证
|
||||
//预算
|
||||
List<BudgetDTO> proposedBookBudget = decoration.getProposedBookBudget();
|
||||
Collections.sort(decoration.getProposedBookBudget(),(x1,x2)->x2.getId().compareTo(x1.getId()));
|
||||
String totalAmount = proposedBookBudget.get(0).getTotalAmount();
|
||||
//支付二维码url
|
||||
Long regionId = shopInfoDAO.getRegionIdByShopCode(shopCode);
|
||||
Long regionId = shopInfoDAO.getRegionIdByid(shopId);
|
||||
String payPic = regionQrcodeConfigDao.getPayPicByRegionId(regionId);
|
||||
DecorationModelDTO decorationModelDTO = new DecorationModelDTO();
|
||||
decorationModelDTO.setPayUrl(payPic);
|
||||
decorationModelDTO.setTotalAmount(totalAmount);
|
||||
return decorationModelDTO;
|
||||
}
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
@Override
|
||||
public String submitDecorationModel(DecorationPayRequest decorationPayRequest, PartnerUserInfoVO partnerUserInfoVO) {
|
||||
LinePayDO linePayDO =new LinePayDO();
|
||||
BeanUtil.copyProperties(decorationPayRequest, linePayDO);
|
||||
linePayDO.setCreateTime(new Date());
|
||||
linePayDO.setUpdateTime(new Date());
|
||||
linePayDO.setLineId(partnerUserInfoVO.getLineId());
|
||||
linePayDO.setCreateUserId(partnerUserInfoVO.getUsername());
|
||||
linePayDO.setUpdateUserId(partnerUserInfoVO.getUsername());
|
||||
linePayDO.setPayBusinessType(2);
|
||||
linePayDO.setPayType(2);
|
||||
return "";
|
||||
public String submitDecorationModel(LinePaySubmitRequest request, PartnerUserInfoVO partnerUserInfoVO) {
|
||||
DecorationDTO decoration = getDecorationDTO(request.getShopId());
|
||||
if ( decoration.getPayment() != null && decoration.getPayment().size()>0){
|
||||
request.setPayStatus(WorkflowSubStageStatusEnum.PAY_DEPOSIT_50.getCode());
|
||||
}else {
|
||||
request.setPayStatus(WorkflowSubStageStatusEnum.PAY_DEPOSIT_45.getCode());
|
||||
}
|
||||
|
||||
Long payId = linePayService.submitPayInfo(request, partnerUserInfoVO);
|
||||
return payId.toString();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ConstructionScheduleDTO> getConstruction(String shopCode) {
|
||||
ProjectDTO projectList = ylfService.getProjectList(shopCode);
|
||||
String projectId = projectList.getProjectId();
|
||||
DecorationDTO decoration = ylfService.getDecoration(Long.parseLong(projectId));
|
||||
public List<ConstructionScheduleDTO> getConstruction(Long shopId) {
|
||||
DecorationDTO decoration = getDecorationDTO(shopId);
|
||||
List<ConstructionScheduleDTO> constructionSchedule = decoration.getConstructionSchedule();
|
||||
Map<String, ConstructionScheduleDTO> constructionScheduleMap = constructionSchedule.stream().collect(Collectors.toMap(ConstructionScheduleDTO::getName,
|
||||
dto -> dto));
|
||||
constructionScheduleMap.remove(MEASURING_THE_ROOM);
|
||||
constructionScheduleMap.remove(CONSTRUCTION_DRAWING);
|
||||
List<ConstructionScheduleDTO> collect = constructionScheduleMap.values().stream().collect(Collectors.toList());
|
||||
collect.sort(Comparator.comparing(ConstructionScheduleDTO::getId));
|
||||
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;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -11,6 +11,8 @@ import com.cool.store.entity.LinePayDO;
|
||||
import com.cool.store.enums.ErrorCodeEnum;
|
||||
import com.cool.store.enums.WorkflowSubStageEnum;
|
||||
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.mapper.FranchiseFeeMapper;
|
||||
import com.cool.store.mapper.LineInfoMapper;
|
||||
@@ -82,7 +84,10 @@ public class LinePayServiceImpl implements LinePayService {
|
||||
fillLinePay(false, linePayDO, request, partnerUser);
|
||||
linePayDAO.updateLinePay(linePayDO);
|
||||
}
|
||||
}else {
|
||||
}
|
||||
if(request.getPayBusinessType() != null
|
||||
&& request.getPayBusinessType() == 0
|
||||
&& request.getShopId() != null) {
|
||||
LinePayDO linePayDO = linePayDAO.getLinePayByLineIdAndPayType(request.getLineId(),0);
|
||||
if(linePayDO == null){
|
||||
linePayDO = new LinePayDO();
|
||||
@@ -98,6 +103,20 @@ public class LinePayServiceImpl implements LinePayService {
|
||||
lineInfoDAO.insertOrUpdate(lineInfo);
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
@@ -164,7 +164,7 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
|
||||
OpeningOperationPlanListVO openingOperationPlanListVO = new OpeningOperationPlanListVO();
|
||||
openingOperationPlanListVO.setShopId(x.getShopId());
|
||||
openingOperationPlanListVO.setShopName(x.getShopName());
|
||||
openingOperationPlanListVO.setShopCode(x.getShopCode());
|
||||
openingOperationPlanListVO.setStoreNum(x.getStoreNum());
|
||||
openingOperationPlanListVO.setPartnerName(x.getPartnerName());
|
||||
openingOperationPlanListVO.setMobile(x.getMobile());
|
||||
String[] split = regionNameMap.getOrDefault(x.getRegionId(), "").split("-");
|
||||
|
||||
@@ -53,6 +53,8 @@ public class SignValidateFilter implements Filter {
|
||||
"/xfsg/favicon.ico",
|
||||
"/xfsg/v2/api-docs","/**/test/**",
|
||||
"/xfsg/mini/program/oss/getUploadFileConfig",
|
||||
//
|
||||
"/xfsg/mini/decoration/**",
|
||||
"/xfsg/mini/program/v1/partnerManage/partner/getIdentityCardInfo",
|
||||
"/**/swagger*/**",
|
||||
"/**/webjars/**",
|
||||
|
||||
@@ -36,7 +36,7 @@ import java.util.List;
|
||||
* @注释:
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/pc/OpenPreparation")
|
||||
@RequestMapping("/pc/openPreparation")
|
||||
@Api(tags = "pc开业筹备")
|
||||
@Slf4j
|
||||
public class OpenPreparationController {
|
||||
@@ -71,7 +71,7 @@ public class OpenPreparationController {
|
||||
return ResponseResult.success(auditOpeningOperationPlanService.auditPlan(request));
|
||||
}
|
||||
|
||||
@GetMapping("/openingOperationPlan/planList")
|
||||
@PostMapping("/openingOperationPlan/planList")
|
||||
@ApiOperation("查询运营方案列表")
|
||||
public ResponseResult<PageInfo<OpeningOperationPlanListVO>> planList(@RequestBody PlanListRequest request) {
|
||||
return ResponseResult.success(openingOperationPlanService.getPlanListPage(request));
|
||||
|
||||
@@ -6,6 +6,7 @@ import com.cool.store.dto.decoration.ConstructionScheduleDTO;
|
||||
import com.cool.store.dto.decoration.DecorationDTO;
|
||||
import com.cool.store.dto.decoration.DecorationModelDTO;
|
||||
import com.cool.store.request.DecorationPayRequest;
|
||||
import com.cool.store.request.LinePaySubmitRequest;
|
||||
import com.cool.store.response.ResponseResult;
|
||||
import com.cool.store.service.CoolStoreStartFlowService;
|
||||
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.PartnerUserInfoVO;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
@@ -32,22 +34,19 @@ import java.util.List;
|
||||
public class PCDecorationController {
|
||||
@Resource
|
||||
private DecorationService decorationService;
|
||||
@ApiModelProperty("获取设计阶段信息")
|
||||
@GetMapping("/design")
|
||||
public ResponseResult<DesignInfoVo> get(@RequestParam String shopCode){
|
||||
return ResponseResult.success( decorationService.DesignInfo(shopCode)) ;
|
||||
public ResponseResult<DesignInfoVo> get(@RequestParam Long shopId){
|
||||
return ResponseResult.success( decorationService.DesignInfo(shopId)) ;
|
||||
}
|
||||
@ApiModelProperty("获取装修款信息,和二维码")
|
||||
@GetMapping("/getDecorationModel")
|
||||
public ResponseResult<DecorationModelDTO> getDecorationModel(@RequestParam String shopCode){
|
||||
return ResponseResult.success(decorationService.DecorationModel(shopCode)) ;
|
||||
}
|
||||
@PostMapping("/submitDecorationModel")
|
||||
public ResponseResult submitDecorationModel(@RequestBody DecorationPayRequest DecorationPayRequest){
|
||||
PartnerUserInfoVO user = PartnerUserHolder.getUser();
|
||||
decorationService.submitDecorationModel(DecorationPayRequest, user);
|
||||
return ResponseResult.success();
|
||||
public ResponseResult<DecorationModelDTO> getDecorationModel(@RequestParam Long shopId){
|
||||
return ResponseResult.success(decorationService.DecorationModel(shopId)) ;
|
||||
}
|
||||
@ApiModelProperty("获取施工阶段信息")
|
||||
@GetMapping("/getConstruction")
|
||||
public ResponseResult<List<ConstructionScheduleDTO>> getConstruction(@RequestParam String shopCode){
|
||||
return ResponseResult.success(decorationService.getConstruction(shopCode)) ;
|
||||
public ResponseResult<List<ConstructionScheduleDTO>> getConstruction(@RequestParam Long shopId){
|
||||
return ResponseResult.success(decorationService.getConstruction(shopId)) ;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
@@ -108,9 +108,9 @@ public class XxlJobHandler {
|
||||
log.info("------今日没有待更新数据------");
|
||||
return;
|
||||
}
|
||||
List<OpenPlanShopInfoDTO> openPlanShopInfoDTOS = shopInfoDAO.queryShopCodeListByid(shopIdListByStageStatus);
|
||||
List<OpenPlanShopInfoDTO> openPlanShopInfoDTOS = shopInfoDAO.queryStoreNumeListByid(shopIdListByStageStatus);
|
||||
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()){
|
||||
String shopCode = map.get(shopId);
|
||||
try {
|
||||
|
||||
Reference in New Issue
Block a user