fixBug

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

@@ -51,7 +51,7 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService {
     public Boolean submitLicense(FranchiseFeeRequest request) {
         log.info("submitLicense request：{}", JSONObject.toJSONString(request));
         FranchiseFeeDO franchiseFeeDO = request.toFranchiseFeeDO();
-        shopStageInfoDAO.updateShopStageInfo(request.getShopId(),ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_72);
+        shopStageInfoDAO.updateShopStageInfo(request.getShopId(),ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_71);
         return franchiseFeeMapper.insertSelective(franchiseFeeDO) == 1 ? true:false;
     }
 
@@ -59,7 +59,7 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService {
     public FranchiseFeeResponse getDetail(Long shopId) {
         FranchiseFeeDO franchiseFeeDO = new FranchiseFeeDO();
         franchiseFeeDO.setShopId(shopId);
-        FranchiseFeeDO result = franchiseFeeMapper.selectOneByExample(franchiseFeeDO);
+        FranchiseFeeDO result = franchiseFeeMapper.selectOne(franchiseFeeDO);
         LinePayDO linePayDO = linePayMapper.selectByPrimaryKey(result.getPayId());
         LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(linePayDO.getLineId());
         FranchiseFeeResponse resp = FranchiseFeeResponse.from(result);

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.cool.store.dao.HyPartnerUserInfoDAO;
 import com.cool.store.dao.LineInfoDAO;
 import com.cool.store.dao.LinePayDAO;
+import com.cool.store.dao.ShopStageInfoDAO;
 import com.cool.store.entity.FranchiseFeeDO;
 import com.cool.store.entity.HyPartnerUserInfoDO;
 import com.cool.store.entity.LineInfoDO;
@@ -13,6 +14,7 @@ import com.cool.store.enums.WorkflowSubStageEnum;
 import com.cool.store.enums.WorkflowSubStageStatusEnum;
 import com.cool.store.enums.point.PayBusinessTypeEnum;
 import com.cool.store.enums.point.PayTypeEnum;
+import com.cool.store.enums.point.ShopSubStageStatusEnum;
 import com.cool.store.exception.ServiceException;
 import com.cool.store.mapper.FranchiseFeeMapper;
 import com.cool.store.mapper.LineInfoMapper;
@@ -47,6 +49,9 @@ public class LinePayServiceImpl implements LinePayService {
     @Resource
     FranchiseFeeMapper franchiseFeeMapper;
 
+    @Resource
+    ShopStageInfoDAO shopStageInfoDAO;
+
     @Override
     public LinePayVO getLinePayInfo(Long lineId) {
         LinePayVO result = null;
@@ -84,6 +89,7 @@ public class LinePayServiceImpl implements LinePayService {
                 fillLinePay(false, linePayDO, request, partnerUser);
                 linePayDAO.updateLinePay(linePayDO);
             }
+            shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_72);
         }
         if(request.getPayBusinessType() != null
                 && request.getPayBusinessType() == 0

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

@@ -0,0 +1,33 @@
+package com.cool.store.controller.webc;
+
+
+import com.cool.store.request.AddSignFranchiseRequest;
+import com.cool.store.response.AddSignFranchiseResponse;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.SignFranchiseService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Api(tags = "pc加盟合同签约")
+@RestController
+@RequestMapping("/mini/signFranchise")
+public class MiniSignFranchiseController {
+    @Resource
+    SignFranchiseService signFranchiseService;
+
+    @ApiOperation("提交(更新)加盟合同签约")
+    @PostMapping("/submitOrUpdate")
+    public ResponseResult<Boolean> submitSignFranchise(@RequestBody AddSignFranchiseRequest request) {
+        return signFranchiseService.submitSignFranchise(request);
+    }
+
+    @ApiOperation("获取默认值")
+    @GetMapping("/default/get")
+    public ResponseResult<AddSignFranchiseResponse> getSignFranchise(@RequestParam("shopId") Long shopId) {
+        return ResponseResult.success(signFranchiseService.getSignFranchise(shopId));
+    }
+
+}