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

Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
bianyadong
2024-05-09 19:06:10 +08:00
parent 481c555b4e 20110345c6
commit 63793429aa
4 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -229,7 +229,7 @@
</if>
<where>
<if test="shopIds != null and shopIds.size() > 0">
and a.id in
and a.shop_id in
<foreach collection="shopIds" item="shopId" index="index" open="(" separator="," close=")">
#{shopId}
</foreach>

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

@@ -71,7 +71,7 @@ public class CoolStoreStartFlowServiceImpl implements CoolStoreStartFlowService
String url = null;
if (Constants.ONE_INTEGER == type) {
url = xfsgUrl + Constants.FRANCHISE_AGREEMENT_COMPANY + "?timestamp=" + requestMap.get("timestamp") + "&signature=" + requestMap.get("signature");
} else if (Constants.ZERO_INTEGER == type) {
} else if (Constants.TWO_INTEGER == type) {
url = xfsgUrl + Constants.FRANCHISE_AGREEMENT_PERSON + "?timestamp=" + requestMap.get("timestamp") + "&signature=" + requestMap.get("signature");
}
InitiatingResponse initiatingResponse = httpRestTemplateService.postForObject(url, request, InitiatingResponse.class);

37
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
View File

@@ -27,10 +27,8 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.text.SimpleDateFormat;
import java.util.*;
@Service
@Slf4j
@@ -174,14 +172,15 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
temp.add("object");
Convert.digitToChinese(123);
FranchiseAgreementRequest buildResult = FranchiseAgreementRequest.builder()
.apply_user(user.getJobNumber())
// .apply_user(user.getJobNumber())
.apply_user("20230724")
.company(0)
.start1(DateUtils.dateTime(franchiseFeeDO.getFirstYearStartTime()))
.start2(DateUtils.dateTime(franchiseFeeDO.getSecondYearStartTime()))
.start3(DateUtils.dateTime(franchiseFeeDO.getThirdYearStartTime()))
.end1(DateUtils.dateTime(franchiseFeeDO.getFirstYearEndTime()))
.end2(DateUtils.dateTime(franchiseFeeDO.getSecondYearEndTime()))
.end3(DateUtils.dateTime(franchiseFeeDO.getThirdYearEndTime()))
.start1(getDateTimeFormat(Constants.TIME_STAMP_FLAG_TWO,franchiseFeeDO.getFirstYearStartTime()))
.start2(getDateTimeFormat(Constants.TIME_STAMP_FLAG_TWO,franchiseFeeDO.getSecondYearStartTime()))
.start3(getDateTimeFormat(Constants.TIME_STAMP_FLAG_TWO,franchiseFeeDO.getThirdYearStartTime()))
.end1(getDateTimeFormat(Constants.TIME_STAMP_FLAG_TWO,franchiseFeeDO.getFirstYearEndTime()))
.end2(getDateTimeFormat(Constants.TIME_STAMP_FLAG_TWO,franchiseFeeDO.getSecondYearEndTime()))
.end3(getDateTimeFormat(Constants.TIME_STAMP_FLAG_TWO,franchiseFeeDO.getThirdYearEndTime()))
.fjsc(temp)
.fqgsmc("鲜丰水果股份有限公司")
.fzzd1(0)
@@ -201,7 +200,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
.is_business_license(request.getIsBusinessLicense())
.is_deposit(1)
.is_food_license(request.getIsFoodLicense())
.jiaokuandate(DateUtils.dateTime(linePayDO.getPayTime()))
.jiaokuandate(getDateTimeFormat(Constants.TIME_STAMP_FLAG,linePayDO.getPayTime()))
.jkr(linePayDO.getPayUserName())
.jmd_area(pointInfoDO.getDistrict())
.jmd_city(pointInfoDO.getCity())
@@ -239,7 +238,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
.jmssfzhm(signingBaseInfoDO.getIdCardNo())
.jmsxm(lineInfoDO.getPartnerNum())
.jmsxm1(lineInfoDO.getUsername())
.jsrq(DateUtils.dateTime(request.getContractStartEndTime()))
.jsrq(getDateTimeFormat(Constants.TIME_STAMP_FLAG,request.getContractStartEndTime()))
.jszhhz(linePayDO.getPayAccount())
.kdzBusinessId(AuditEnum.SIGN_FRANCHISE + "_" + shopId + "_" + lineId)
.khhjzh(linePayDO.getBankName())
@@ -256,7 +255,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
.ppsyfbl(Double.valueOf(request.getBrandFee()))
.psfl("以实际结算为准")
.qsdz("PUBLIC_COMPANY")
.qsrq(DateUtils.dateTime(request.getContractStartTime()))
.qsrq(getDateTimeFormat(Constants.TIME_STAMP_FLAG,request.getContractStartTime()))
.qylx(SignTypeEnum.getWorkflowStageByCode(request.getSignType()).getCode())
.qys_dzyz("2731707107593166911")
.qys_htywfl("3051420203180101971")
@@ -264,12 +263,12 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
.remark(request.getRemark())
.remark2(systemBuildingShopDO.getReasons())
.sfbq__add(request.getResign())
.sj1(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_END, request.getBusinessStartHours()))
.sj2(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_END, request.getBusinessEndHours()))
.sj1(getDateTimeFormat(Constants.TIME_STAMP_FLAG_THREE,request.getBusinessStartHours()))
.sj2(getDateTimeFormat(Constants.TIME_STAMP_FLAG_THREE,request.getBusinessEndHours()))
.social_credit_code(licenseTransactDO.getCreditCode())
.spltxkz(temp)
.sqr_name(user.getName())
.sqrq(DateUtils.getDate())
.sqrq(getDateTimeFormat(Constants.TIME_STAMP_FLAG,new Date()))
.title("特许经营合同审批申请2023-" + lineInfoDO.getUsername() + "-" + DateUtils.getDate())
.wlyzbm("201905081151092R")
.yycs(Integer.valueOf(request.getImpressionNum()))
@@ -398,4 +397,8 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
}
return addSignFranchiseResponse;
}
public static String getDateTimeFormat(String pattern,Date date) {
return new SimpleDateFormat(pattern).format(date);
}
}

7
coolstore-partner-service/src/main/java/com/cool/store/utils/poi/constant/Constants.java
View File

@@ -193,12 +193,19 @@ public class Constants
public static final Integer ONE_INTEGER = 1;
public static final Integer TWO_INTEGER = 2;
public static final String INSERT_FLAG = "insert";
public static final String UPDATE_FLAG = "update";
public static final String TIME_STAMP_FLAG = "yyyy-MM-dd";
public static final String TIME_STAMP_FLAG_TWO = "yyyyMMdd";
public static final String TIME_STAMP_FLAG_THREE = "HH:mm";
public static final String GET_PROJECT_LIST = "https://hzly.cloudcubic.net/ajaxHandle/synchronization/JCallBackSynchronizationHandler.ashx?action=app&controller=GetProjectByCustomLable&remark=%s";
public static final String GET_PROJECT_DETAIL= "https://hzly.cloudcubic.net/ajaxHandle/synchronization/JCallBackSynchronizationHandler.ashx?action=app&controller=GetProjectDetails";