支付

coolstore-partner-dao/src/main/java/com/cool/store/dao/LinePayDAO.java

@@ -23,10 +23,6 @@ public class LinePayDAO {
     @Resource
     private LinePayMapper linePayMapper;
 
-    public LinePayDO getLinePayByLineId(Long lineId) {
-        LinePayDO linePayDO = linePayMapper.getLinePayByLineId(lineId);
-        return linePayDO;
-    }
 
     public LinePayDO getByLineIdAndPayTypeAndShopId(Long lineId,Integer payBusinessType,Long shopId) {
         LinePayDO linePayDO = linePayMapper.getByLineIdAndPayTypeAndShopId(lineId,payBusinessType,shopId);

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

@@ -11,7 +11,7 @@ import com.cool.store.vo.PartnerUserInfoVO;
  */
 public interface LinePayService {
 
-    LinePayVO getLinePayInfo(Long lineId);
+    LinePayVO getLinePayInfo(Long lineId,Integer businessType,Long shopId);
 
     Long submitPayInfo(LinePaySubmitRequest followLog, PartnerUserInfoVO partnerUser);
 

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

@@ -10,6 +10,7 @@ import com.cool.store.dto.openPreparation.OpenPlanShopInfoDTO;
 import com.cool.store.dto.openPreparation.UserNameDTO;
 import com.cool.store.entity.*;
 import com.cool.store.enums.*;
+import com.cool.store.enums.point.PayBusinessTypeEnum;
 import com.cool.store.enums.point.ShopStageEnum;
 import com.cool.store.enums.point.ShopSubStageEnum;
 import com.cool.store.enums.point.ShopSubStageStatusEnum;
@@ -241,7 +242,7 @@ public class DecorationServiceImpl implements DecorationService {
         //Todo getLinePayInfo
         ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId);
         Long lineId = shopInfo.getLineId();
-        LinePayVO linePayInfo = linePayService.getLinePayInfo(lineId);
+        LinePayVO linePayInfo = linePayService.getLinePayInfo(lineId, PayBusinessTypeEnum.DECORATION_MODEL.getCode(), shopId);
         if (Objects.isNull(linePayInfo)) {
             log.error("LinePayInfo  is null");
             return null;

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

@@ -56,9 +56,9 @@ public class LinePayServiceImpl implements LinePayService {
     ShopStageInfoDAO shopStageInfoDAO;
 
     @Override
-    public LinePayVO getLinePayInfo(Long lineId) {
+    public LinePayVO getLinePayInfo(Long lineId,Integer businessType,Long shopId) {
         LinePayVO result = null;
-        LinePayDO linePayDO = linePayDAO.getLinePayByLineId(lineId);
+        LinePayDO linePayDO = linePayDAO.getByLineIdAndPayTypeAndShopId(lineId,businessType,shopId);
         if (linePayDO != null) {
             result = new LinePayVO();
             BeanUtil.copyProperties(linePayDO, result);

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

@@ -8,6 +8,7 @@ import com.cool.store.context.LoginUserInfo;
 import com.cool.store.dao.*;
 import com.cool.store.entity.*;
 import com.cool.store.enums.*;
+import com.cool.store.enums.point.PayBusinessTypeEnum;
 import com.cool.store.exception.ServiceException;
 import com.cool.store.mapper.IntentAgreementMapper;
 import com.cool.store.mapper.JoinIntentionMapper;
@@ -336,7 +337,7 @@ public class LineServiceImpl implements LineService {
         List<LineAuditInfoDO> lineAuditInfoList = lineAuditInfoDAO.getLineAuditInfoList(auditIds);
         Map<Long, Date> dateMap = lineAuditInfoList.stream().collect(Collectors.toMap(k -> k.getId(), v -> v.getCreateTime()));
 
-        LinePayDO linePay = linePayDAO.getLinePayByLineId(lineId);
+        LinePayDO linePay = linePayDAO.getByLineIdAndPayTypeAndShopId(lineId,PayBusinessTypeEnum.INTENT_MONEY.getCode(),null);
         SigningBaseInfoDO signingBaseInfoDO = intentAgreementMapper.selectByPartnerIdOrLineId(memberQuestionDO.getPartnerId(), lineId);
         LeaseBaseInfoDO trainingExperience = trainingExperienceService.getTrainingExperience(lineId);
 

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java

@@ -3,6 +3,7 @@ package com.cool.store.controller.webb;
 import com.cool.store.context.CurrentUserHolder;
 import com.cool.store.context.LoginUserInfo;
 import com.cool.store.dto.TransferLogDTO;
+import com.cool.store.enums.point.PayBusinessTypeEnum;
 import com.cool.store.request.*;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.LinePayService;
@@ -127,7 +128,7 @@ public class LineInfoController {
             @ApiImplicitParam(name = "lineId", value = "线索id", required = true)
     })
     public ResponseResult<LinePayVO> getLinePayInfo(@RequestParam("lineId")Long lineId) {
-        return ResponseResult.success(linePayService.getLinePayInfo(lineId));
+        return ResponseResult.success(linePayService.getLinePayInfo(lineId, PayBusinessTypeEnum.INTENT_MONEY.getCode(),null));
     }
 
     @ApiOperation("线索流程进度")

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

@@ -1,6 +1,7 @@
 package com.cool.store.controller.webc;
 
 import com.cool.store.context.PartnerUserHolder;
+import com.cool.store.enums.point.PayBusinessTypeEnum;
 import com.cool.store.request.LinePaySubmitRequest;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.LinePayService;
@@ -35,7 +36,7 @@ public class LinePayController {
             @ApiImplicitParam(name = "lineId", value = "线索id", required = true)
     })
     public ResponseResult<LinePayVO> getLinePayInfo(@RequestParam("lineId")Long lineId) {
-        return ResponseResult.success(linePayService.getLinePayInfo(lineId));
+        return ResponseResult.success(linePayService.getLinePayInfo(lineId, PayBusinessTypeEnum.INTENT_MONEY.getCode(),null));
     }
 
     @ApiOperation("缴纳意向金/加盟费")