diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/BusinessModelEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/BusinessModelEnum.java new file mode 100644 index 000000000..7fdeec748 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/BusinessModelEnum.java @@ -0,0 +1,37 @@ +package com.cool.store.enums; + +/** + * @Author: WangShuo + * @Date: 2025/04/07/18:23 + * @Version 1.0 + * @注释: + */ +public enum BusinessModelEnum { + NULL(0, "无"), + DIRECT_SALES(1, "直营"), + JOIN_SALES(2, "加盟"); + + private Integer code; + private String desc; + + BusinessModelEnum(Integer code, String desc) { + this.code = code; + this.desc = desc; + } + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + + public String getDesc() { + return desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } +} diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/DownSystemTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/DownSystemTypeEnum.java new file mode 100644 index 000000000..dc190f83a --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/DownSystemTypeEnum.java @@ -0,0 +1,24 @@ +package com.cool.store.enums; + +/** + * @Author: WangShuo + * @Date: 2025/04/07/17:03 + * @Version 1.0 + * @注释: + */ +public enum DownSystemTypeEnum { + XGJ(1,"新管家"), + POS(2,"POS"); + private Integer code; + private String desc; + DownSystemTypeEnum(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/UserRoleEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java index cd5dfdca9..dfc215f10 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java @@ -49,7 +49,7 @@ public enum UserRoleEnum { FINANCE(1735895867344L,"财务"), CHUAN_XIAO_MEI_MANAGER(1731635078802L,"串小妹大区执行总经理"), REGIONAL_MANAGER(420000000L,"大区经理"), - + LOGISTICS(430000000L,"物流") ; private Long code; 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 85cb64404..f3d7ffe6f 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 @@ -79,11 +79,9 @@ public class ShopInfoDAO { return shopInfoMapper.getShopList(lineId); } - public List getShopIdBySuccessOpen(Integer shopStatus){ - if (Objects.isNull(shopStatus)){ - return new ArrayList<>(); - } - return shopInfoMapper.getShopIdBySuccessOpen(shopStatus); + public List getShopIdBySuccessOpen(String eid){ + + return shopInfoMapper.getShopIdBySuccessOpen(eid); } public List getShopListByRegion(Long lineId,List regionIdList,String userId){ @@ -238,4 +236,14 @@ public class ShopInfoDAO { } return shopInfoMapper.getOpenName(eid,shopId); } + public Integer updateShopCode(String shopCode,Long shopId){ + return shopInfoMapper.updateShopCode(shopCode,shopId); + } + + public List getShopCodeList(Long lineId){ + if (lineId == null){ + return new ArrayList<>(); + } + return shopInfoMapper.getShopCodeList(lineId); + } } 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 fc09fb2eb..d39d956ba 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 @@ -121,9 +121,13 @@ public interface ShopInfoMapper extends Mapper { List selectByLines (@Param("list") List list,@Param("regionIds") List regionIds); - List getShopIdBySuccessOpen(@Param("shopStatus") Integer shopStatus); + List getShopIdBySuccessOpen(@Param("eid") String eid); List getShopListSuccessOpen(@Param("eid") String eid,@Param("lineId") Long lineId); String getOpenName(@Param("eid") String eid,@Param("shopId")Long shopId); + + Integer updateShopCode(@Param("shopCode") String shopCode,@Param("shopId") Long shopId); + + List getShopCodeList(@Param("lineId") Long lineId); } diff --git a/coolstore-partner-dao/src/main/resources/mapper/BuildInformationMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/BuildInformationMapper.xml index 6a494b5fa..c3b446171 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/BuildInformationMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/BuildInformationMapper.xml @@ -36,6 +36,8 @@ + + @@ -47,6 +49,6 @@ settler_id_card_front,settler_id_card_reverse,settler_in_hand_front_picture,settler_in_hand_back_picture,settler_id_card_no, settler_bank_number,settler_bank_mobile,settler_bank_name, create_time,update_time,create_user, - update_user + update_user,c_shop_name,settler_bank_back_photo_url diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml index 6a0669783..e93237dca 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml @@ -427,6 +427,11 @@ inner join store_${eid} b on a.shop_code = b.store_num where a.id = #{shopId} + @@ -441,4 +446,7 @@ WHERE id = #{item.id} + + update xfsg_shop_info set shop_code = #{shopCode} where id = #{shopId} + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/BuildInformationDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/BuildInformationDO.java index e9fac8509..a19ab09e8 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/BuildInformationDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/BuildInformationDO.java @@ -136,6 +136,10 @@ public class BuildInformationDO { @Column(name = "settler_bank_photo_url") private String settlerBankPhotoUrl; + //门店POS收款银行卡反面 + @Column(name = "settler_bank_back_photo_url") + private String settlerBankBackPhotoUrl; + /** * 结算人银行卡号 */ @@ -189,5 +193,7 @@ public class BuildInformationDO { */ @Column(name = "update_user") private String updateUser; - + //火码，点餐小程序店铺名称', + @Column(name = "c_shop_name") + private String cShopName; } \ No newline at end of file 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 4989a21a9..083de0be9 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 @@ -25,9 +25,6 @@ public class AddSignFranchiseRequest { private String detailAddress; - @ApiModelProperty("店铺编码") - @NotBlank(message = "店铺编码不能为空") - private String shopCode; @ApiModelProperty("店铺品牌") @NotBlank(message = "店铺品牌不能为空") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/BuildInformationRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/BuildInformationRequest.java index 59a99d479..22ea8e111 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/BuildInformationRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/BuildInformationRequest.java @@ -18,6 +18,11 @@ import java.util.Date; @Data public class BuildInformationRequest { + + @NotBlank(message = "点餐小程序店铺名称不能为空") + @ApiModelProperty(value = "点餐小程序店铺名称") + private String cShopName; + @NotNull private Long shopId; @NotBlank(message = "门店联系人姓名 不能为空") @@ -108,6 +113,11 @@ public class BuildInformationRequest { @ApiModelProperty("结算人银行卡照片") private String settlerBankPhotoUrl; + @NotBlank(message = "结算人银行卡背面照片 不能为空") + @Length(max = 250, message = "结算人银行卡背面照片 长度不能超过250") + @ApiModelProperty("结算人银行卡背面照片") + private String settlerBankBackPhotoUrl; + @NotBlank(message = "结算人银行卡号 不能为空") @Length(max = 64 , message = "结算人银行卡号 长度不能超过64") @ApiModelProperty("结算人银行卡号") @@ -174,12 +184,14 @@ public class BuildInformationRequest { buildInformationDO.setSettlerInHandBackPicture(this.settlerInHandBackPicture); buildInformationDO.setSettlerIdCardNo(this.settlerIdCardNo); buildInformationDO.setSettlerBankPhotoUrl(this.settlerBankPhotoUrl); + buildInformationDO.setSettlerBankBackPhotoUrl(this.settlerBankBackPhotoUrl); buildInformationDO.setSettlerBankNumber(this.settlerBankNumber); buildInformationDO.setSettlerBankMobile(this.settlerBankMobile); buildInformationDO.setSettlerBankName(this.settlerBankName); buildInformationDO.setAuthorizationUrl(this.authorizationUrl); buildInformationDO.setRelationshipProve(this.relationshipProve); buildInformationDO.setAccountOpeningPermit(this.accountOpeningPermit); + buildInformationDO.setCShopName(this.cShopName); return buildInformationDO; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java index 0b791a88b..dfe06c15a 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java @@ -4,6 +4,7 @@ import com.cool.store.entity.OrderSysInfoDO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.Date; @@ -12,7 +13,11 @@ public class OrderSysInfoRequest { @ApiModelProperty(hidden = true) private Integer type; - + + @ApiModelProperty(value = "店铺编码",required = true) + @NotBlank(message = "店铺编码不能为空") + private String shopCode; + @ApiModelProperty(value = "店铺ID" ,required = true) @NotNull(message = "门店id不能为空") private Long shopId; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java index 32a794065..c2169da68 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java @@ -36,7 +36,7 @@ public class ZxjpApiRequest { private String fxyAccount; @ApiModelProperty(value = "新掌柜") - private String xjzAccount; + private String xzjAccount; @ApiModelProperty(value = "云流水账号") private String ylsAccount; @@ -66,7 +66,7 @@ public class ZxjpApiRequest { private String shopSupervisorUserName; @ApiModelProperty(value = "门店类型（1-加盟公司、2-加盟部加盟店、3-自有加盟、4-强加盟、）") - private Integer joinModel; + private Integer joinMode; @ApiModelProperty(value = "经营模式（0 无 1直营 2加盟）") private Integer businessModel; @@ -114,7 +114,7 @@ public class ZxjpApiRequest { private String shopLatitude; @ApiModelProperty(value = "高德、百度定位截图") - private String shopLocationPictures; + private String shopLocationScreenshots; @ApiModelProperty(value = "门店详细地址") private String shopAddress; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java index df954e117..e7217986e 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java @@ -173,4 +173,10 @@ public class BuildInformationResponse { @ApiModelProperty(value = "总部订货收款修改人" ) private String receivingUpdateUser; + + @ApiModelProperty("结算人银行卡背面照片") + private String settlerBankBackPhotoUrl; + + @ApiModelProperty(value = "点餐小程序店铺名称") + private String cShopName; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/SyncDataService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/SyncDataService.java new file mode 100644 index 000000000..310c7cd81 --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/SyncDataService.java @@ -0,0 +1,20 @@ +package com.cool.store.service; + +import com.cool.store.enums.DownSystemTypeEnum; +import com.cool.store.request.ZxjpApiRequest; + +/** + * @Author: WangShuo + * @Date: 2025/04/07/15:11 + * @Version 1.0 + * @注释: + */ +public interface SyncDataService { + + /** + * @Auther: wangshuo + * @Date: 2025/4/7 + * @description: 获取组合数据 + */ + ZxjpApiRequest getData(Long shopId, DownSystemTypeEnum systemType); +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java index 1b4b50688..7f219aa23 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java @@ -120,6 +120,8 @@ public class BuildInformationServiceImpl implements BuildInformationService{ response.setAccountOpeningPermit(informationDO.getAccountOpeningPermit()); response.setSettlerInHandFrontPicture(informationDO.getSettlerInHandFrontPicture()); response.setSettlerInHandBackPicture(informationDO.getSettlerInHandBackPicture()); + response.setCShopName(informationDO.getCShopName()); + response.setSettlerBankBackPhotoUrl(informationDO.getSettlerBankBackPhotoUrl()); } @Override @@ -139,12 +141,12 @@ public class BuildInformationServiceImpl implements BuildInformationService{ map.put("partnerUsername",lineInfoDO.getUsername()); map.put("partnerMobile",lineInfoDO.getMobile()); map.put("storeName",shopInfoDO.getShopName()); - List itList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.IT_EMPLOYEE, shopInfoDO.getRegionId()); - List itUsers = new ArrayList<>(); - if (Objects.nonNull(itList)){ - itUsers.addAll(itList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + List logisticsList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.LOGISTICS, shopInfoDO.getRegionId()); + List logistics = new ArrayList<>(); + if (Objects.nonNull(logisticsList)){ + logistics.addAll(logisticsList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } - commonService.sendQWMessage(itUsers, + commonService.sendQWMessage(logistics, MessageEnum.MESSAGE_52, map); return buildInformationDAO.insertSelective(buildInformationDO); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java index 652ee96a7..e8462b937 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java @@ -17,6 +17,7 @@ import com.cool.store.service.OrderSysInfoService; import com.cool.store.service.UserAuthMappingService; import com.cool.store.utils.poi.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.*; @@ -48,7 +49,10 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService { @Override + @Transactional(rollbackFor = Exception.class) public Integer updateByShopId(OrderSysInfoRequest request, String userId) { + + shopInfoDAO.updateShopCode(request.getShopCode(),request.getShopId()); OrderSysInfoDO orderSysInfoDO = orderSysInfoDAO.selectByShopId(request.getShopId()); if (request.getType().equals(OrderSysTypeEnum.ORDER_SYS_TYPE_1.getType())) { orderSysInfoDO.setXgjVicePresident(request.getXgjVicePresident()); 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 9364e5c30..1247cbcd1 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 @@ -209,7 +209,6 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu shopInfoDO.setRegionId(request.getRegionId()); shopInfoDO.setShopName(request.getShopName()); shopInfoDO.setDetailAddress(request.getDetailAddress()); - shopInfoDO.setShopCode(request.getShopCode()); shopInfoDO.setJoinMode(request.getJoinMode()); shopInfoDO.setFranchiseBrand(request.getFranchiseBrand()); shopInfoDO.setUpdateTime(new Date()); 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 new file mode 100644 index 000000000..082c41afc --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java @@ -0,0 +1,194 @@ +package com.cool.store.service.impl; + +import com.cool.store.dao.*; +import com.cool.store.entity.*; +import com.cool.store.enums.DownSystemTypeEnum; +import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.FranchiseBrandEnum; +import com.cool.store.exception.ServiceException; +import com.cool.store.mapper.ApplyLicenseMapper; +import com.cool.store.mapper.SignFranchiseMapper; +import com.cool.store.request.ZxjpApiRequest; +import com.cool.store.service.SyncDataService; +import com.cool.store.utils.poi.constant.Constants; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +/** + * @Author: WangShuo + * @Date: 2025/04/07/15:12 + * @Version 1.0 + * @注释: + */ +@Service +public class SyncDataServiceImpl implements SyncDataService { + + @Resource + private ShopInfoDAO shopInfoDAO; + @Resource + private LineInfoDAO lineInfoDAO; + @Resource + private SignFranchiseMapper signFranchiseMapper; + @Resource + private HyPartnerUserInfoDAO hyPartnerUserInfoDAO; + @Resource + private OrderSysInfoDAO orderSysInfoDAO; + @Resource + private BuildInformationDAO buildInformationDAO; + @Resource + private AcceptanceInfoDAO acceptanceInfoDAO; + @Resource + private ApplyLicenseMapper applyLicenseMapper; + @Resource + private QualificationsInfoDAO qualificationsInfoDAO; + @Resource + private PointInfoDAO pointInfoDAO; + @Resource + private EnterpriseUserDAO enterpriseUserDAO; + + @Override + public ZxjpApiRequest getData(Long shopId, DownSystemTypeEnum systemType) { + ZxjpApiRequest request = new ZxjpApiRequest(); + ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); + if (shopInfo == null) { + throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); + } + Long lineId = shopInfo.getLineId(); + LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(lineId); + if (lineInfoDO == null) { + throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); + } + HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(shopInfo.getPartnerId()); + if (hyPartnerUserInfoDO == null) { + throw new ServiceException(ErrorCodeEnum.PARTNER_USER_NOT_EXIST); + } + //加盟合同 + SignFranchiseDO signFranchiseDO = signFranchiseMapper.selectByShopId(shopId); + //加盟商所有门店的门店编码 + List shopCodeList = shopInfoDAO.getShopCodeList(lineId); + //订货信息 & 总部订货收款账户 + OrderSysInfoDO orderSysInfoDO = orderSysInfoDAO.selectByShopId(shopId); + //建店资料 + BuildInformationDO buildInformationDO = buildInformationDAO.selectOneByShopId(shopId); + //铺位 + PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(shopInfo.getPointId()); + //营业执照 + LicenseTransactDO licenseTransactDO = applyLicenseMapper.selectByShopId(shopId); + //验收信息 + AcceptanceInfoDO acceptanceInfoDO = acceptanceInfoDAO.selectByShopId(shopId); + //资质信息 + QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(lineId); + //督导 + String investmentManager = enterpriseUserDAO.getUserName(shopInfo.getInvestmentManager()); + if (signFranchiseDO != null) { + List partnershipSignatory = new ArrayList<>(); + partnershipSignatory.add(signFranchiseDO.getPartnershipSignatoryFirst()); + partnershipSignatory.add(signFranchiseDO.getPartnershipSignatorySecond()); + request.setPartnershipSignatory(partnershipSignatory); + request.setBusinessModel(signFranchiseDO.getBusinessModel()); + } + request.setPartnerMobile(lineInfoDO.getMobile()); + if (qualificationsInfoDO != null) { + request.setPartnerIdCardNo(qualificationsInfoDO.getIdCardNo()); + request.setLegalName(qualificationsInfoDO.getLegalName()); + request.setLegalIdCardFront(qualificationsInfoDO.getLegalIdCardFront()); + request.setLegalIdCardBack(qualificationsInfoDO.getLegalIdCardBack()); + request.setLegalMobile(qualificationsInfoDO.getLegalMobile()); + } + request.setShopCode(shopInfo.getShopCode()); + request.setShopCodeList(shopCodeList); + request.setCrmAccount(lineInfoDO.getMobile()); + request.setDownstreamSystemPassword(hyPartnerUserInfoDO.getDownstreamSystemPassword()); + request.setDownstreamSystemSalt(hyPartnerUserInfoDO.getDownstreamSystemSalting()); + request.setCrmAccount(lineInfoDO.getMobile()); + request.setFxyAccount(lineInfoDO.getMobile()); + request.setXzjAccount(shopInfo.getShopCode()); + request.setYlsAccount(shopInfo.getShopCode()); + request.setWqfAccount(shopInfo.getShopCode()); + if (systemType.equals(DownSystemTypeEnum.XGJ)) { + //todo + } + if (systemType.equals(DownSystemTypeEnum.POS)) { + if (buildInformationDO != null) { + String brand = FranchiseBrandEnum.getDescByCode(shopInfo.getFranchiseBrand()); + request.setDownstreamSystemShopName(brand + "(" + buildInformationDO + ")"); + } + } + if (orderSysInfoDO != null) { + request.setXgjRegionId(orderSysInfoDO.getXgjRegionId()); + request.setXgjVicePresident(orderSysInfoDO.getXgjVicePresident()); + request.setAddresseeName(orderSysInfoDO.getAddresseeName()); + request.setAddresseeMobile(orderSysInfoDO.getAddresseeMobile()); + request.setAddresseeProvince(orderSysInfoDO.getAddresseeProvince()); + request.setAddresseeCity(orderSysInfoDO.getAddresseeCity()); + request.setAddresseeDistrict(orderSysInfoDO.getAddresseeDistrict()); + request.setAddresseeAddress(orderSysInfoDO.getAddresseeAddress()); + request.setDeclareGoodsLogisticsWarehouse(orderSysInfoDO.getDeclareGoodsLogisticsWarehouse()); + request.setDeclareGoodsDate(orderSysInfoDO.getDeclareGoodsDate()); + request.setWarehouseDeliveryDate(orderSysInfoDO.getWarehouseDeliveryDate()); + request.setReceivingFirmName(orderSysInfoDO.getReceivingFirmName()); + request.setReceivingMSBankAccount(orderSysInfoDO.getReceivingMsBankAccount()); + request.setReceivingMSBankBranch(orderSysInfoDO.getReceivingMsBankBranch()); + request.setBankUnionPayAccount(orderSysInfoDO.getBankUnionPayAccount()); + } + request.setShopSupervisorUserName(investmentManager); + request.setJoinMode(shopInfo.getJoinMode()); + if (acceptanceInfoDO != null) { + if (acceptanceInfoDO.getShopDoorwayPhoto() != null) { + List doorwayPhoto = Arrays.stream(acceptanceInfoDO.getShopDoorwayPhoto().split(",")) + .collect(Collectors.toList()); + request.setShopDoorwayPhoto(doorwayPhoto); + } + if (acceptanceInfoDO.getShopInteriorPhoto() != null) { + List interiorPhoto = Arrays.stream(acceptanceInfoDO.getShopInteriorPhoto().split(",")) + .collect(Collectors.toList()); + request.setShopInteriorPhoto(interiorPhoto); + } + request.setShopLocationScreenshots(acceptanceInfoDO.getShopLocationScreenshots()); + request.setVerificationMobile(acceptanceInfoDO.getVerificationMobile()); + request.setKsAccount(acceptanceInfoDO.getKsAccount()); + } + if (buildInformationDO!=null){ + request.setBusinessHours(buildInformationDO.getBusinessHours()); + request.setShopContactName(buildInformationDO.getShopContactName()); + request.setBusinessMobile(buildInformationDO.getBusinessMobile()); + request.setSettlerName(buildInformationDO.getSettlerName()); + request.setSettlerBankPhotoUrl(buildInformationDO.getSettlerBankPhotoUrl()); + request.setSettlerBankBackPhotoUrl(buildInformationDO.getSettlerBankBackPhotoUrl()); + request.setSettlerBankBranchName(buildInformationDO.getSettlerBankName()); + request.setSettlerBankNumber(buildInformationDO.getSettlerBankNumber()); + request.setSettlerBankMobile(buildInformationDO.getSettlerBankMobile()); + request.setSettlerIdCardFront(buildInformationDO.getSettlerIdCardFront()); + request.setSettlerIdCardReverse(buildInformationDO.getSettlerIdCardReverse()); + request.setSettlerInHandBackPicture(buildInformationDO.getSettlerInHandBackPicture()); + request.setSettlerInHandFrontPicture(buildInformationDO.getSettlerInHandFrontPicture()); + request.setSettlerIdCardNo(buildInformationDO.getSettlerIdCardNo()); + + } + if (licenseTransactDO != null){ + request.setCreditUrl(licenseTransactDO.getCreditUrl()); + //二证合一标识；0否 1 是 + if (Objects.equals(licenseTransactDO.getTwoCertificatesOne(), Constants.ONE_INTEGER)){ + request.setFoodBusinessLicenseUrl(licenseTransactDO.getCreditUrl()); + }else { + request.setFoodBusinessLicenseUrl(licenseTransactDO.getFoodBusinessLicenseUrl()); + } + } + if (pointInfo!=null){ + request.setShopProvinceCityDistrict(pointInfo.getProvince()+pointInfo.getCity()+pointInfo.getDistrict()); + request.setShopLongitude(pointInfo.getLongitude()); + request.setShopLatitude(pointInfo.getLatitude()); + request.setShopAddress(pointInfo.getAddress()); + request.setShopProvince(pointInfo.getProvince()); + request.setShopCity(pointInfo.getCity()); + } + + return request; + } +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TallyBookServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TallyBookServiceImpl.java index 8057465b1..0e98d5d65 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TallyBookServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TallyBookServiceImpl.java @@ -51,7 +51,7 @@ public class TallyBookServiceImpl implements TallyBookService { tallyBookDO.setStatus(TallyBookStatusEnum.IS_SUBMIT.getCode());; tallyBookDO.setUpdateUser(user.getPartnerId()); tallyBookDO.setTotal(request.getTotal()); - tallyBookDO.setUpdateTime(new Date());tallyBookDAO.updateByPrimaryKeySelective(tallyBookDO); + tallyBookDO.setUpdateTime(new Date()); tallyBookDO.setOperatorName(request.getOperatorName()); tallyBookDAO.updateByPrimaryKeySelective(tallyBookDO); tallyBookDetailDAO.batchDeleteByTallyBookId(request.getId()); 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 fa1352a7e..87ac3df71 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 @@ -318,7 +318,7 @@ public class XxlJobHandler { while (hasNext) { PageHelper.startPage(pageNum, pageSize); //获取成功开店的门店 - List shopList = shopInfoDAO.getShopIdBySuccessOpen(ShopStatusEnum.DONE.getCode()); + List shopList = shopInfoDAO.getShopIdBySuccessOpen(eid); if (CollectionUtils.isEmpty(shopList)) { log.info("------initTallyBook is empty------"); break;