fix

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

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

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

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

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

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

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

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