From 9539790a34c55a10dbfe70baac2decf1daf59f72 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 29 Apr 2024 15:40:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BA=97=E8=A3=85=E4=BF=AE=E9=98=B6?= =?UTF-8?q?=E6=AE=B52.0+=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E8=BF=90?= =?UTF-8?q?=E8=90=A5=E5=88=97=E8=A1=A8PSOT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/enums/ConstructionPhaseEnum.java | 1 + .../com/cool/store/enums/DesignPhaseEnum.java | 2 +- .../enums/WorkflowSubStageStatusEnum.java | 3 +- .../enums/point/PayBusinessTypeEnum.java | 31 + .../cool/store/enums/point/PayTypeEnum.java | 28 + .../java/com/cool/store/dao/ShopInfoDAO.java | 10 +- .../com/cool/store/mapper/BankdocMapper.java | 2 + .../com/cool/store/mapper/ShopInfoMapper.java | 6 +- .../main/resources/mapper/LinePayMapper.xml | 610 +++++++++--------- .../mapper/OpeningOperationPlanMapper.xml | 2 +- .../main/resources/mapper/ShopInfoMapper.xml | 10 +- .../openPreparation/OpenPlanShopInfoDTO.java | 4 +- .../store/request/DecorationPayRequest.java | 16 +- .../store/vo/OpeningOperationPlanListVO.java | 2 +- .../cool/store/service/DecorationService.java | 9 +- .../service/impl/DecorationServiceImpl.java | 74 ++- .../service/impl/LinePayServiceImpl.java | 21 +- .../impl/OpeningOperationPlanImpl.java | 2 +- .../cool/store/config/SignValidateFilter.java | 2 + .../webb/OpenPreparationController.java | 4 +- .../webb/PCDecorationController.java | 23 +- .../webc/MiniDecorationController.java | 37 ++ .../com/cool/store/job/XxlJobHandler.java | 4 +- 23 files changed, 531 insertions(+), 372 deletions(-) create mode 100644 coolstore-partner-common/src/main/java/com/cool/store/enums/point/PayBusinessTypeEnum.java create mode 100644 coolstore-partner-common/src/main/java/com/cool/store/enums/point/PayTypeEnum.java create mode 100644 coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ConstructionPhaseEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ConstructionPhaseEnum.java index a134f573d..95b952a70 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ConstructionPhaseEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ConstructionPhaseEnum.java @@ -7,6 +7,7 @@ package com.cool.store.enums; * @注释: */ public enum ConstructionPhaseEnum { + //施工阶段 NOT_SHOWN(-1,"不显示"), NOT_START(0,"未开工"), construction_ING(1,"施工中"), diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/DesignPhaseEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/DesignPhaseEnum.java index 8fc5a2412..21ff846b6 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/DesignPhaseEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/DesignPhaseEnum.java @@ -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,"审批中"), diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowSubStageStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowSubStageStatusEnum.java index a18364326..734e999f5 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowSubStageStatusEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/WorkflowSubStageStatusEnum.java @@ -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; diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/PayBusinessTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/PayBusinessTypeEnum.java new file mode 100644 index 000000000..df12f5be2 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/PayBusinessTypeEnum.java @@ -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; + } +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/PayTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/PayTypeEnum.java new file mode 100644 index 000000000..36b5967a2 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/PayTypeEnum.java @@ -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; + } +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java index 6b36b3ed9..ed6979ca7 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java @@ -148,17 +148,17 @@ public class ShopInfoDAO { /** * @Auther: wangshuo * @Date: 2024/4/25 - * @description: 根据idlist 获取shopcode + * @description: 根据idlist 获取storeNum */ - public List queryShopCodeListByid(@Param("shopIdList") List shopIdList){ - return shopInfoMapper.queryShopCodeListByid(shopIdList); + public List queryStoreNumeListByid(List shopIdList){ + return shopInfoMapper.queryStoreNumeListByid(shopIdList); } public List 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); } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/BankdocMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/BankdocMapper.java index e5746cd73..434e31df1 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/BankdocMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/BankdocMapper.java @@ -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 listBranchBank(BranchBankPageRequest request); + } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java index f656d9fe3..9b8c77342 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java @@ -76,14 +76,14 @@ public interface ShopInfoMapper extends Mapper { /** * @Auther: wangshuo * @Date: 2024/4/25 - * @description: 根据idlist 获取shopcode + * @description: 根据idlist 获取storenum */ - List queryShopCodeListByid(@Param("shopIdList") List shopIdList); + List queryStoreNumeListByid(@Param("shopIdList") List shopIdList); List getSelectedShopNum(@Param("lineIds") List lineIds); List ListByCondition(@Param("request") PreparationRequest request); - Long getRegionIdByShopCode(@Param("shopCode") String shopCode); + Long getRegionIdByid(@Param("shopId") Long shopId); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml index 849df60c3..1dfab2ff4 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml @@ -1,310 +1,318 @@ - - - - - - - - - - - - - - - - - - - - - - - - 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, update_time, create_user_id, update_user_id, deleted,pay_business_type - - - - delete from xfsg_line_pay - where id = #{id,jdbcType=BIGINT} - - - - SELECT LAST_INSERT_ID() - - insert into xfsg_line_pay - - - 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, - - - - - #{partnerId,jdbcType=VARCHAR}, - - - #{lineId,jdbcType=BIGINT}, - - - #{payStatus,jdbcType=TINYINT}, - - - #{payType,jdbcType=TINYINT}, - - - #{payUserName,jdbcType=VARCHAR}, - - - #{payAccount,jdbcType=VARCHAR}, - - - #{bankCode,jdbcType=VARCHAR}, - - - #{bankName,jdbcType=VARCHAR}, - - - #{branchBankCode,jdbcType=VARCHAR}, - - - #{branchBankName,jdbcType=VARCHAR}, - - - #{payTime,jdbcType=TIMESTAMP}, - - - #{payPic,jdbcType=VARCHAR}, - - - #{promisePic,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - #{createUserId,jdbcType=VARCHAR}, - - - #{updateUserId,jdbcType=VARCHAR}, - - - #{deleted,jdbcType=BIT}, - - - - - update xfsg_line_pay - - - partner_id = #{partnerId,jdbcType=VARCHAR}, - - - line_id = #{lineId,jdbcType=BIGINT}, - - - pay_status = #{payStatus,jdbcType=TINYINT}, - - - pay_type = #{payType,jdbcType=TINYINT}, - - - pay_user_name = #{payUserName,jdbcType=VARCHAR}, - - - pay_account = #{payAccount,jdbcType=VARCHAR}, - - - bank_code = #{bankCode,jdbcType=VARCHAR}, - - - bank_name = #{bankName,jdbcType=VARCHAR}, - - - branch_bank_code = #{branchBankCode,jdbcType=VARCHAR}, - - - branch_bank_name = #{branchBankName,jdbcType=VARCHAR}, - - - pay_time = #{payTime,jdbcType=TIMESTAMP}, - - - pay_pic = #{payPic,jdbcType=VARCHAR}, - - - promise_pic = #{promisePic,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - create_user_id = #{createUserId,jdbcType=VARCHAR}, - - - update_user_id = #{updateUserId,jdbcType=VARCHAR}, - - - deleted = #{deleted,jdbcType=BIT}, - - - where id = #{id,jdbcType=BIGINT} - - - update xfsg_line_pay - set audit_id = #{auditId} - where line_id = #{lineId} - and partner_id = #{partnerId} - - - - - and t.id = #{id,jdbcType=BIGINT} - - - and t.partner_id = #{partnerId,jdbcType=VARCHAR} - - - and t.line_id = #{lineId,jdbcType=BIGINT} - - - and t.pay_status = #{payStatus,jdbcType=TINYINT} - - - and t.pay_type = #{payType,jdbcType=TINYINT} - - - and t.pay_user_name = #{payUserName,jdbcType=VARCHAR} - - - and t.pay_account = #{payAccount,jdbcType=VARCHAR} - - - and t.bank_code = #{bankCode,jdbcType=VARCHAR} - - - and t.bank_name = #{bankName,jdbcType=VARCHAR} - - - and t.branch_bank_code = #{branchBankCode,jdbcType=VARCHAR} - - - and t.branch_bank_name = #{branchBankName,jdbcType=VARCHAR} - - - and t.pay_time = #{payTime,jdbcType=TIMESTAMP} - - - and t.pay_pic = #{payPic,jdbcType=VARCHAR} - - - and t.promise_pic = #{promisePic,jdbcType=VARCHAR} - - - and t.create_time = #{createTime,jdbcType=TIMESTAMP} - - - and t.update_time = #{updateTime,jdbcType=TIMESTAMP} - - - and t.create_user_id = #{createUserId,jdbcType=VARCHAR} - - - and t.update_user_id = #{updateUserId,jdbcType=VARCHAR} - - - and t.deleted = #{deleted,jdbcType=BIT} - - - + + + + delete + from xfsg_line_pay + where id = #{id,jdbcType=BIGINT} + + + + SELECT LAST_INSERT_ID() + + insert into xfsg_line_pay + + + 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 + + + + + #{partnerId,jdbcType=VARCHAR}, + + + #{lineId,jdbcType=BIGINT}, + + + #{payStatus,jdbcType=TINYINT}, + + + #{payType,jdbcType=TINYINT}, + + + #{payUserName,jdbcType=VARCHAR}, + + + #{payAccount,jdbcType=VARCHAR}, + + + #{bankCode,jdbcType=VARCHAR}, + + + #{bankName,jdbcType=VARCHAR}, + + + #{branchBankCode,jdbcType=VARCHAR}, + + + #{branchBankName,jdbcType=VARCHAR}, + + + #{payTime,jdbcType=TIMESTAMP}, + + + #{payPic,jdbcType=VARCHAR}, + + + #{promisePic,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{createUserId,jdbcType=VARCHAR}, + + + #{updateUserId,jdbcType=VARCHAR}, + + + #{deleted,jdbcType=BIT}, + + + #{payBusinessType,jdbcType=TINYINT} + + + + + update xfsg_line_pay + + + partner_id = #{partnerId,jdbcType=VARCHAR}, + + + line_id = #{lineId,jdbcType=BIGINT}, + + + pay_status = #{payStatus,jdbcType=TINYINT}, + + + pay_type = #{payType,jdbcType=TINYINT}, + + + pay_user_name = #{payUserName,jdbcType=VARCHAR}, + + + pay_account = #{payAccount,jdbcType=VARCHAR}, + + + bank_code = #{bankCode,jdbcType=VARCHAR}, + + + bank_name = #{bankName,jdbcType=VARCHAR}, + + + branch_bank_code = #{branchBankCode,jdbcType=VARCHAR}, + + + branch_bank_name = #{branchBankName,jdbcType=VARCHAR}, + + + pay_time = #{payTime,jdbcType=TIMESTAMP}, + + + pay_pic = #{payPic,jdbcType=VARCHAR}, + + + promise_pic = #{promisePic,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + create_user_id = #{createUserId,jdbcType=VARCHAR}, + + + update_user_id = #{updateUserId,jdbcType=VARCHAR}, + + + deleted = #{deleted,jdbcType=BIT}, + + + where id = #{id,jdbcType=BIGINT} + + + update xfsg_line_pay + set audit_id = #{auditId} + where line_id = #{lineId} + and partner_id = #{partnerId} + + + + + and t.id = #{id,jdbcType=BIGINT} + + + and t.partner_id = #{partnerId,jdbcType=VARCHAR} + + + and t.line_id = #{lineId,jdbcType=BIGINT} + + + and t.pay_status = #{payStatus,jdbcType=TINYINT} + + + and t.pay_type = #{payType,jdbcType=TINYINT} + + + and t.pay_user_name = #{payUserName,jdbcType=VARCHAR} + + + and t.pay_account = #{payAccount,jdbcType=VARCHAR} + + + and t.bank_code = #{bankCode,jdbcType=VARCHAR} + + + and t.bank_name = #{bankName,jdbcType=VARCHAR} + + + and t.branch_bank_code = #{branchBankCode,jdbcType=VARCHAR} + + + and t.branch_bank_name = #{branchBankName,jdbcType=VARCHAR} + + + and t.pay_time = #{payTime,jdbcType=TIMESTAMP} + + + and t.pay_pic = #{payPic,jdbcType=VARCHAR} + + + and t.promise_pic = #{promisePic,jdbcType=VARCHAR} + + + and t.create_time = #{createTime,jdbcType=TIMESTAMP} + + + and t.update_time = #{updateTime,jdbcType=TIMESTAMP} + + + and t.create_user_id = #{createUserId,jdbcType=VARCHAR} + + + and t.update_user_id = #{updateUserId,jdbcType=VARCHAR} + + + and t.deleted = #{deleted,jdbcType=BIT} + + + - + - + - + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/OpeningOperationPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/OpeningOperationPlanMapper.xml index 005b6600a..bff49fd53 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/OpeningOperationPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/OpeningOperationPlanMapper.xml @@ -47,7 +47,7 @@ - + select id as shopId,store_num as storeNum from xfsg_shop_info where 1=1 and id in - + #{shopId} @@ -149,11 +149,11 @@ - 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} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/OpenPlanShopInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/OpenPlanShopInfoDTO.java index 7603c0997..22063f80d 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/OpenPlanShopInfoDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/OpenPlanShopInfoDTO.java @@ -26,8 +26,8 @@ public class OpenPlanShopInfoDTO { @ApiModelProperty("门店名字") private String shopName; - @ApiModelProperty("门店代码") - private String shopCode; + @ApiModelProperty("门店编码") + private String storeNum; @ApiModelProperty("开店负责人id") private String shopManagerUserId; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/DecorationPayRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/DecorationPayRequest.java index 6afe557ef..66b65c8f9 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/DecorationPayRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/DecorationPayRequest.java @@ -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; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpeningOperationPlanListVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpeningOperationPlanListVO.java index 16f52f23a..955780cf1 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpeningOperationPlanListVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpeningOperationPlanListVO.java @@ -22,7 +22,7 @@ public class OpeningOperationPlanListVO { private String shopName; @ApiModelProperty("门店代码") - private String shopCode; + private String storeNum; @ApiModelProperty("开店负责人") private String shopManagerName; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationService.java index 91c27f5fc..eceea9e3e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationService.java @@ -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 getConstruction(String shopCode); + List getConstruction(Long shopId); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java index b3b7b9704..b97e4b22a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java @@ -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 designScheme = decoration.getDesignScheme(); List 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 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 getConstruction(String shopCode) { - ProjectDTO projectList = ylfService.getProjectList(shopCode); - String projectId = projectList.getProjectId(); - DecorationDTO decoration = ylfService.getDecoration(Long.parseLong(projectId)); + public List getConstruction(Long shopId) { + DecorationDTO decoration = getDecorationDTO(shopId); List constructionSchedule = decoration.getConstructionSchedule(); Map constructionScheduleMap = constructionSchedule.stream().collect(Collectors.toMap(ConstructionScheduleDTO::getName, dto -> dto)); constructionScheduleMap.remove(MEASURING_THE_ROOM); constructionScheduleMap.remove(CONSTRUCTION_DRAWING); List collect = constructionScheduleMap.values().stream().collect(Collectors.toList()); + collect.sort(Comparator.comparing(ConstructionScheduleDTO::getId)); return collect; } + private DecorationDTO getDecorationDTO(Long shopId) { + List shopIds =new ArrayList<>(); + shopIds.add(shopId); + List 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; + } + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java index dc6fa5e72..e289bc240 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java @@ -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; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java index e23c40baf..bc09fabd4 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java @@ -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("-"); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java index 21b531931..03c7bffa0 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java @@ -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/**", diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenPreparationController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenPreparationController.java index 5748263e9..2a3b05e5b 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenPreparationController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenPreparationController.java @@ -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> planList(@RequestBody PlanListRequest request) { return ResponseResult.success(openingOperationPlanService.getPlanListPage(request)); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java index 1e5a98ac5..cbdfa6fad 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java @@ -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 get(@RequestParam String shopCode){ - return ResponseResult.success( decorationService.DesignInfo(shopCode)) ; + public ResponseResult get(@RequestParam Long shopId){ + return ResponseResult.success( decorationService.DesignInfo(shopId)) ; } + @ApiModelProperty("获取装修款信息,和二维码") @GetMapping("/getDecorationModel") - public ResponseResult 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 getDecorationModel(@RequestParam Long shopId){ + return ResponseResult.success(decorationService.DecorationModel(shopId)) ; } + @ApiModelProperty("获取施工阶段信息") @GetMapping("/getConstruction") - public ResponseResult> getConstruction(@RequestParam String shopCode){ - return ResponseResult.success(decorationService.getConstruction(shopCode)) ; + public ResponseResult> getConstruction(@RequestParam Long shopId){ + return ResponseResult.success(decorationService.getConstruction(shopId)) ; } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java new file mode 100644 index 000000000..24a2bf85a --- /dev/null +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java @@ -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(); + } +} diff --git a/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java b/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java index 770de3a95..a5bdbae67 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java @@ -108,9 +108,9 @@ public class XxlJobHandler { log.info("------今日没有待更新数据------"); return; } - List openPlanShopInfoDTOS = shopInfoDAO.queryShopCodeListByid(shopIdListByStageStatus); + List openPlanShopInfoDTOS = shopInfoDAO.queryStoreNumeListByid(shopIdListByStageStatus); Map 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 {