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

fix

Browse Source
This commit is contained in:
guohb
2024-05-07 14:55:18 +08:00
parent f363c93ca9
commit f3d5a3eb99
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
View File

@@ -172,6 +172,8 @@ public enum ErrorCodeEnum {
STORE_NUM_NOT_FOUND(109008, "未找到门店编码", null), STORE_NUM_NOT_FOUND(109008, "未找到门店编码", null),
SIGN_FRANCHISE_NOT_FOUND(109009, "加盟合同签约信息为空", null),
INSERT_OPENING_OPERATION_PLAN_AUDIT_FALSE(103001,"插入运营方案审核信息失败",null), INSERT_OPENING_OPERATION_PLAN_AUDIT_FALSE(103001,"插入运营方案审核信息失败",null),
INSERT_OPENING_OPERATION_PLAN_FALSE(103002,"插入运营方案失败",null), INSERT_OPENING_OPERATION_PLAN_FALSE(103002,"插入运营方案失败",null),

4
coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml
View File

@@ -300,13 +300,13 @@
</select> </select>
<select id="getByLineIdAndPayTypeAndShopId" resultMap="BaseResultMap"> <select id="getByLineIdAndPayTypeAndShopId" resultMap="BaseResultMap">
select * select <include refid="Base_Column_List"/>
from xfsg_line_pay from xfsg_line_pay
<where> <where>
line_id = #{lineId} line_id = #{lineId}
and deleted = '0' and deleted = '0'
and pay_business_type = #{payBusinessType} and pay_business_type = #{payBusinessType}
<if test="shop_id != null and shopId != ''"> <if test="shopId != null and shopId != ''">
and shop_id = #{shopId} and shop_id = #{shopId}
</if> </if>
</where> </where>

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

@@ -283,16 +283,21 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
@Override @Override
public AddSignFranchiseResponse getSignFranchise(Long shopId) { public AddSignFranchiseResponse getSignFranchise(Long shopId) {
SignFranchiseDO signFranchiseDO = signFranchiseMapper.selectByShopId(shopId); SignFranchiseDO signFranchiseDO = signFranchiseMapper.selectByShopId(shopId);
if (Objects.isNull(signFranchiseDO)){
throw new ServiceException(ErrorCodeEnum.SIGN_FRANCHISE_NOT_FOUND);
}
AddSignFranchiseResponse response = from(signFranchiseDO, shopId); AddSignFranchiseResponse response = from(signFranchiseDO, shopId);
if (Objects.nonNull(signFranchiseDO)){ if (Objects.nonNull(signFranchiseDO)){
ShopAuditInfoDO shopAuditInfoDO = shopAuditInfoMapper.selectByPrimaryKey(signFranchiseDO.getAuditId()); ShopAuditInfoDO shopAuditInfoDO = shopAuditInfoMapper.selectByPrimaryKey(signFranchiseDO.getAuditId());
response.setStatus(shopAuditInfoDO.getResultType()); if (Objects.nonNull(shopAuditInfoDO)){
if (shopAuditInfoDO.getResultType() == 0){ response.setStatus(shopAuditInfoDO.getResultType());
response.setResult(shopAuditInfoDO.getPassReason()); if (shopAuditInfoDO.getResultType() == 0){
}else { response.setResult(shopAuditInfoDO.getPassReason());
response.setResult(shopAuditInfoDO.getRejectReason()); }else {
response.setResult(shopAuditInfoDO.getRejectReason());
}
response.setResultTime(shopAuditInfoDO.getCreateTime());
} }
response.setResultTime(shopAuditInfoDO.getCreateTime());
} }
return response; return response;
} }

2
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/OcrController.java
View File

@@ -20,7 +20,7 @@ import javax.annotation.Resource;
/** /**
* https://ocr.console.aliyun.com/overview?spm=5176.6660585.ocr_enterprisecard_public_cn-top.i1.3d657992vcDnCC * https://ocr.console.aliyun.com/overview?spm=5176.6660585.ocr_enterprisecard_public_cn-top.i1.3d657992vcDnCC
* 目前接入了身份证识别、营业执照识别 * 目前接入了身份证识别、营业执照识别、食品经营许可证
*/ */
@RestController @RestController
@RequestMapping({"/mini/orc"}) @RequestMapping({"/mini/orc"})