From 53ed63596ef1595ef321acf007baea897018bfa9 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 12 Jun 2025 16:09:10 +0800 Subject: [PATCH 1/8] =?UTF-8?q?mini=E5=8A=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/controller/webc/MiniShopController.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java index 90c808b14..1075ab6a3 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java @@ -2,6 +2,7 @@ package com.cool.store.controller.webc; import com.cool.store.context.PartnerUserHolder; import com.cool.store.request.*; +import com.cool.store.response.BranchShopDetailResponse; import com.cool.store.response.MiniShopsResponse; import com.cool.store.response.ResponseResult; import com.cool.store.response.ShopResponse; @@ -144,4 +145,10 @@ public class MiniShopController { return ResponseResult.success(shopService.getShopStageStatus(shopId, subStage)); } + @ApiOperation("开店详情/左边小窗") + @GetMapping("/getBranchShopDetail") + public ResponseResult getBranchShopDetail(@RequestParam("shopId") Long shopId) { + return ResponseResult.success(shopService.getBranchShopDetail(shopId)); + } + } From c8a50f3350db74a3648132a4c6dbda4690274fbe Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 13 Jun 2025 16:17:44 +0800 Subject: [PATCH 2/8] =?UTF-8?q?fix=E5=8A=A0=E7=9B=9F=E5=90=88=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/dto/PartnerBankInfoDTO.java | 20 +++++++++++ .../request/AddSignFranchiseRequest.java | 2 +- .../response/AddSignFranchiseResponse.java | 12 +++---- .../impl/SignFranchiseServiceImpl.java | 33 +++++++++++-------- 4 files changed, 46 insertions(+), 21 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/PartnerBankInfoDTO.java diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/PartnerBankInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/PartnerBankInfoDTO.java new file mode 100644 index 000000000..ed12a86bf --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/PartnerBankInfoDTO.java @@ -0,0 +1,20 @@ +package com.cool.store.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author: WangShuo + * @Date: 2025/06/13/15:47 + * @Version 1.0 + * @注释: + */ +@Data +public class PartnerBankInfoDTO { + @ApiModelProperty("加盟商结算账户") + private String bankCardNo; + @ApiModelProperty("开户行") + private String bank; + @ApiModelProperty("支行") + private String subBank; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java index a3b6dbbcf..951fa0636 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java @@ -90,7 +90,7 @@ public class AddSignFranchiseRequest { @ApiModelProperty("合同金额") @NotBlank(message = "合同金额不能为空") private String contractAmount; - @ApiModelProperty("合伙签约人1//废弃") + @ApiModelProperty("合伙签约人1") private String partnershipSignatoryFirst; @ApiModelProperty("合伙签约人2") private String partnershipSignatorySecond; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java index 2a6fce18d..f2656a004 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java @@ -1,5 +1,6 @@ package com.cool.store.response; +import com.cool.store.dto.PartnerBankInfoDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -7,6 +8,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.Date; +import java.util.List; @Data public class AddSignFranchiseResponse { @@ -86,7 +88,7 @@ public class AddSignFranchiseResponse { private String franchiseeType; @ApiModelProperty("交款人") - private String payName; + private List payName; @ApiModelProperty("营业执照名称") private String licenseName; @@ -107,12 +109,8 @@ public class AddSignFranchiseResponse { @ApiModelProperty("加盟商身份证号") private String idCardNo; - @ApiModelProperty("加盟商结算账户") - private String bankCardNo; - @ApiModelProperty("开户行") - private String bank; - @ApiModelProperty("支行") - private String subBank; + @ApiModelProperty("加盟商付款资料") + private List partnerPayData; @ApiModelProperty("身份证地址") private String idCardAddress; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index c23198b4c..9f806c127 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.cool.store.constants.CommonConstants; import com.cool.store.context.LoginUserInfo; import com.cool.store.dao.*; +import com.cool.store.dto.PartnerBankInfoDTO; import com.cool.store.entity.*; import com.cool.store.enums.*; import com.cool.store.enums.point.ShopSubStageEnum; @@ -453,7 +454,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu //线索id Long lineId = shopInfoDO.getLineId(); //缴款信息 - LinePayDO linePayDO = linePayMapper.getByLineIdAndPayTypeAndShopId(lineId, 1, shopId); + List linePayList = linePayMapper.getFranchiseFeePayInfoByShopId(shopId); // //铺位信息 // PointInfoDO pointInfoDO = pointInfoMapper.getDataByShopIdAndLineId(lineId, shopId); //证照办理 @@ -524,19 +525,25 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu addSignFranchiseResponse.setRegionId(shopInfoDO.getRegionId()); addSignFranchiseResponse.setRegionName(regionInfo.getName()); } - - if (Objects.nonNull(linePayDO)) { - addSignFranchiseResponse.setPayName(linePayDO.getPayUserName()); - addSignFranchiseResponse.setBankCardNo(linePayDO.getPayAccount()); - addSignFranchiseResponse.setBank(linePayDO.getBankName()); - addSignFranchiseResponse.setSubBank(linePayDO.getBranchBankName()); - if (Objects.nonNull(linePayDO.getPayTime())) { - addSignFranchiseResponse.setPayDate(linePayDO.getPayTime()); - } else { - List payTimeList = JsonToDate(linePayDO.getCombinedField()); - Collections.sort(payTimeList); - addSignFranchiseResponse.setPayDate(payTimeList.get(0)); + if(CollectionUtils.isNotEmpty(linePayList)){ + Set payNameSet = new HashSet<>(); + List payTimeList = new ArrayList<>(); + List partnerPayData = new ArrayList<>(); + for (LinePayDO linePayDO : linePayList){ + payNameSet.add(linePayDO.getPayUserName()); + payTimeList.add(linePayDO.getPayTime()); + PartnerBankInfoDTO dto = new PartnerBankInfoDTO(); + dto.setBankCardNo(linePayDO.getPayAccount()); + dto.setBank(linePayDO.getBankName()); + dto.setSubBank(linePayDO.getBranchBankName()); + partnerPayData.add(dto); } + addSignFranchiseResponse.setPayName(new ArrayList<>(payNameSet)); + addSignFranchiseResponse.setPartnerPayData(partnerPayData); + Date earliestPayTime = payTimeList.stream() + .min(Comparator.naturalOrder()) + .orElse(null); + addSignFranchiseResponse.setPayDate(earliestPayTime); } if (Objects.nonNull(licenseTransactDO)) { addSignFranchiseResponse.setLicenseName(licenseTransactDO.getBusinessLicense()); From 637078730d20a4ce7699c663ac2df8f71f6afe67 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 16 Jun 2025 10:05:40 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix=E5=8A=A0=E7=9B=9F=E5=90=88=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/request/AddSignFranchiseRequest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java index 951fa0636..8cace17df 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java @@ -90,6 +90,7 @@ public class AddSignFranchiseRequest { @ApiModelProperty("合同金额") @NotBlank(message = "合同金额不能为空") private String contractAmount; + @NotBlank(message = "合伙签约人1不能为空") @ApiModelProperty("合伙签约人1") private String partnershipSignatoryFirst; @ApiModelProperty("合伙签约人2") From 87ae0108fa38a82e90960e489572fdad942b592b Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 16 Jun 2025 14:42:08 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=96=B0=E7=AE=A1=E5=AE=B6=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=BA=97=E5=90=8D=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/service/impl/SyncDataServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java index 9ab1d320c..45a988710 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java @@ -310,6 +310,10 @@ public class SyncDataServiceImpl implements SyncDataService { ? "S" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")" : "S" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")"; } + // ZX0001 + if (shopCode.matches("ZX\\d*")) { + return "ZX" + shopInfoDO.getShopName(); + } } if (String.valueOf(FranchiseBrandEnum.MZG.getCode()).equals(shopInfoDO.getFranchiseBrand())) { if (shopCode.matches("MZGM\\d*")) { From 529e41a0af8c0ac9e6faacbe377c6ec5a71ec61b Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 16 Jun 2025 15:24:50 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=B8=88=E5=92=8C=E8=AE=BE=E8=AE=A1=E7=BB=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/ErrorCodeEnum.java | 3 +- .../com/cool/store/enums/MessageEnum.java | 1 + .../store/dao/DecorationDesignInfoDAO.java | 35 ++++++++---- .../mapper/DecorationDesignInfoMapper.java | 7 +++ .../mapper/DecorationDesignInfoMapper.xml | 11 ++++ .../cool/store/service/DecorationService.java | 4 ++ .../impl/DecorationMeasureServiceImpl.java | 2 +- .../service/impl/DecorationServiceImpl.java | 53 ++++++++++++++++++- .../webb/PCDecorationController.java | 14 +++++ 9 files changed, 116 insertions(+), 14 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 3e1d5a217..7f25c923e 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -243,7 +243,8 @@ public enum ErrorCodeEnum { QUOTATION_URL_REQUIRED(131010,"请等待报价单提交",null), DESIGN_URL_REQUIRED(131011,"请等待设计图提交",null), LEGAL_PERSON_NAME_NOT_SAME(131012,"法人姓名与加盟商姓名不一致",null), - + UPDATE_DESIGN_LEADER(131019,"设计阶段状态不支持修改设计组",null), + UPDATE_DESIGN_USER(131022,"设计阶段状态不支持修改设计师",null), TALLY_BOOK_NOT_EXIST(180001, "记账本数据不存在", null), THIRD_API_ERROR(151001,"第三方服务异常->{0}",null), diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java index 73cc708e8..ec011a3c1 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java @@ -88,6 +88,7 @@ public enum MessageEnum { MESSAGE_59("您有一个门店设计阶段报价任务待领取，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), MESSAGE_60("您有一个门店已提交京东建店资料，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), MESSAGE_61("您有一个门店京东外卖初审已通过，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), + MESSAGE_62("您有一个门店设计阶段设计图待提交，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), ; diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/DecorationDesignInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/DecorationDesignInfoDAO.java index 46eb2bc58..cb65f938a 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/DecorationDesignInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/DecorationDesignInfoDAO.java @@ -24,14 +24,15 @@ public class DecorationDesignInfoDAO { @Resource DecorationDesignInfoMapper decorationDesignInfoMapper; - public DecorationDesignInfoDO getById(Long id){ - if(id == null){ + public DecorationDesignInfoDO getById(Long id) { + if (id == null) { return null; } return decorationDesignInfoMapper.selectByPrimaryKey(id); } - public List getByIds(List shopIds){ - if(CollectionUtils.isEmpty(shopIds)){ + + public List getByIds(List shopIds) { + if (CollectionUtils.isEmpty(shopIds)) { return new ArrayList<>(); } Example example = new Example(DecorationDesignInfoDO.class); @@ -39,29 +40,41 @@ public class DecorationDesignInfoDAO { return decorationDesignInfoMapper.selectByExample(example); } - public Integer insertSelective(DecorationDesignInfoDO decorationDesignInfoDO){ + public Integer insertSelective(DecorationDesignInfoDO decorationDesignInfoDO) { return decorationDesignInfoMapper.insertSelective(decorationDesignInfoDO); } - public Integer updateByPrimaryKeySelective(DecorationDesignInfoDO decorationDesignInfoDO){ + public Integer updateByPrimaryKeySelective(DecorationDesignInfoDO decorationDesignInfoDO) { return decorationDesignInfoMapper.updateByPrimaryKeySelective(decorationDesignInfoDO); } - public DecorationDesignInfoDO getByShopId(Long shopId){ - if(shopId == null){ + public DecorationDesignInfoDO getByShopId(Long shopId) { + if (shopId == null) { return null; } return decorationDesignInfoMapper.selectByShopId(shopId); } // 根据设计师人员id和店铺阶段 SHOP_SUB_STAGE_STATUS_901 查询店铺信息 - public List getByDesignUserIdAndShopStage(String userId, String keyword){ - if(userId == null){ + public List getByDesignUserIdAndShopStage(String userId, String keyword) { + if (userId == null) { return new ArrayList<>(); } - return decorationDesignInfoMapper.getByDesignUserIdAndShopStage(userId, keyword); + return decorationDesignInfoMapper.getByDesignUserIdAndShopStage(userId, keyword); } + public Integer updateDesignLeaderIdAndDesignUserIdInteger(Long shopId, String designLeaderId) { + if (shopId == null|| StringUtil.isEmpty(designLeaderId)){ + return 0; + } + return decorationDesignInfoMapper.updateDesignLeaderIdAndDesignUserIdInteger(shopId, designLeaderId); + } + public Integer updateDesignUserId(Long shopId, String designUserId) { + if (shopId == null|| StringUtil.isEmpty(designUserId)){ + return 0; + } + return decorationDesignInfoMapper.updateDesignUserId(shopId, designUserId); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/DecorationDesignInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/DecorationDesignInfoMapper.java index 604e913e4..5c143728b 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/DecorationDesignInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/DecorationDesignInfoMapper.java @@ -18,5 +18,12 @@ public interface DecorationDesignInfoMapper extends Mapper getByDesignUserIdAndShopStage(@Param("userId") String userId,@Param("keyword") String keyword); + /** + * @Auther: wangshuo + * @Date: 2025/6/16 + * @description:DesignUserId置空 + */ + Integer updateDesignLeaderIdAndDesignUserIdInteger(@Param("shopId") Long shopId,@Param("designLeaderId") String designLeaderId); + Integer updateDesignUserId(@Param("shopId") Long shopId,@Param("designUserId") String designUserId); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml index 2141ae8c4..71bff903a 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml @@ -27,6 +27,17 @@ + + update xfsg_decoration_design_info + set design_leader_id = #{designLeaderId}, + design_user_id = null + where shop_id = #{shopId} + + + update xfsg_decoration_design_info + set design_user_id = #{designUserId} + where shop_id = #{shopId} +