add 信发系统 营帐通

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

@@ -8,7 +8,9 @@ package com.cool.store.enums;
  */
 public enum PosAndOrderEnum {
     POS(1, "pos"),
-    ORDER(2, "订货系统");
+    ORDER(2, "订货系统"),
+    XIN_FA_SYS(3,"信发系统"),
+    TENT_PASS(4,"营帐通");
     private int code;
     private String message;
 

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

@@ -39,6 +39,10 @@ public enum UserRoleEnum {
     E_L_ME_HEADQUARTERS_BUILD_CUSTOMER(340000000L,"饿了么总部建店客服"),
     MEI_TUAN_BUY_CUSTOMER(350000000L,"美团团购客服"),
     KUAI_SHOU_CUSTOMER(360000000L,"快手客服"),
+    XIN_FA_SYS_CUSTOMER(370000000L,"信发系统客服"),
+    TENT_PASS_CUSTOMER(380000000L,"营帐通客服"),
+    DESIGN_CUSTOMER(390000000L,"设计客服"),
+    CONSTRUCTION_CUSTOMER(400000000L,"施工客服"),
     ;
 
     private Long code;

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

@@ -26,6 +26,9 @@
         <result property="settlerBankNumber" column="settler_bank_number" jdbcType="VARCHAR"/>
         <result property="settlerBankMobile" column="settler_bank_mobile" jdbcType="VARCHAR"/>
         <result property="settlerBankName" column="settler_bank_name" jdbcType="VARCHAR"/>
+        <result property="authorizationUrl" column="authorization_url" jdbcType="VARCHAR"/>
+        <result property="relationshipProve" column="relationship_prove" jdbcType="VARCHAR"/>
+        <result property="accountOpeningPermit" column="account_opening_permit" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
         <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
         <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
@@ -36,7 +39,7 @@
         id
         ,shop_id,shop_contact_name,
         shop_contact_mobile,business_hours,business_mobile,settler_bank_photo_url,juridical_id_card_no,
-        door_photo,in_store_photo,juridical_id_card_front,
+        door_photo,in_store_photo,juridical_id_card_front,authorizationUrl,relationshipProve,accountOpeningPermit,
         juridical_id_card_reverse,juridical_handheld_id_card_front,juridical_handheld_id_card_reverse,
         settler_id_card_front,settler_id_card_reverse,settler_id_card_no,
         settler_bank_number,settler_bank_mobile,settler_bank_name,

coolstore-partner-model/src/main/java/com/cool/store/entity/BuildInformationDO.java

@@ -136,6 +136,18 @@ public class BuildInformationDO {
     @Column(name = "settler_bank_name")
     private String settlerBankName;
 
+    //非法人时候需要:授权书
+    @Column(name = "authorization_url")
+    private String authorizationUrl;
+
+    //非法人时候需要:商户关系证明
+    @Column(name = "relationship_prove")
+    private String relationshipProve;
+
+    //公司结算需要:开户许可证
+    @Column(name = "account_opening_permit")
+    private String accountOpeningPermit;
+
     /**
      * 创建时间
      */

coolstore-partner-model/src/main/java/com/cool/store/entity/PosAndOrderInfoDO.java

@@ -28,7 +28,7 @@ public class PosAndOrderInfoDO  {
     private Long shopId;
 
     /**
-     * 1-pos 2-订货系统
+     * 1-pos 2-订货系统，3-信发系统 4-营帐通
      */
     @Column(name = "type")
     private Integer type;
@@ -40,7 +40,7 @@ public class PosAndOrderInfoDO  {
     private String account;
 
     /**
-     * 密码
+     *密码 type为 3 时候，存授权码
      */
     @Column(name = "password")
     private String password;

coolstore-partner-model/src/main/java/com/cool/store/request/BuildInformationRequest.java

@@ -109,6 +109,18 @@ public class BuildInformationRequest {
     @ApiModelProperty("结算开户银行支行")
     private String settlerBankName;
 
+    @ApiModelProperty("非法人时候需要:授权书")
+    @Length(max =1024, message = "授权书 长度不能超过1024")
+    private String authorizationUrl;
+
+    @Length(max =1024, message = "商户关系证明 长度不能超过1024")
+    @ApiModelProperty("非法人时候需要:商户关系证明")
+    private String relationshipProve;
+
+    @Length(max =1024, message = "开户许可证 长度不能超过1024")
+    @ApiModelProperty("公司结算需要:开户许可证")
+    private String accountOpeningPermit;
+
     public BuildInformationDO toDO(){
         BuildInformationDO buildInformationDO = new BuildInformationDO();
         buildInformationDO.setShopId(this.shopId);
@@ -130,6 +142,9 @@ public class BuildInformationRequest {
         buildInformationDO.setSettlerBankNumber(this.settlerBankNumber);
         buildInformationDO.setSettlerBankMobile(this.settlerBankMobile);
         buildInformationDO.setSettlerBankName(this.settlerBankName);
+        buildInformationDO.setAuthorizationUrl(this.authorizationUrl);
+        buildInformationDO.setRelationshipProve(this.relationshipProve);
+        buildInformationDO.setAccountOpeningPermit(this.accountOpeningPermit);
         return buildInformationDO;
     }
 

coolstore-partner-model/src/main/java/com/cool/store/request/PostAndOrderRequest.java

@@ -19,7 +19,7 @@ public class PostAndOrderRequest {
 
     @NotNull
     private Long shopId;
-    @ApiModelProperty(value = "1-pos 2-订货系统",hidden = true)
+    @ApiModelProperty(value = "1-pos 2-订货系统，3-信发系统 4-营帐通",hidden = true)
     private Integer type;
     @NotBlank
     @ApiModelProperty("账号")

coolstore-partner-model/src/main/java/com/cool/store/response/BuildInformationResponse.java

@@ -92,5 +92,14 @@ public class BuildInformationResponse {
     @ApiModelProperty("结算开户银行支行")
     private String settlerBankName;
 
+    @ApiModelProperty("非法人时候需要:授权书")
+
+    private String authorizationUrl;
+
+    @ApiModelProperty("非法人时候需要:商户关系证明")
+    private String relationshipProve;
+
+    @ApiModelProperty("公司结算需要:开户许可证")
+    private String accountOpeningPermit;
 
 }

coolstore-partner-model/src/main/java/com/cool/store/response/PosAndOrderResponse.java

@@ -20,7 +20,7 @@ public class PosAndOrderResponse {
 
     private Long shopId;
 
-    @ApiModelProperty("1-pos 2-订货系统',")
+    @ApiModelProperty("1-pos 2-订货系统，3-信发系统 4-营帐通")
     private Integer type;
 
     @ApiModelProperty("账号")

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

@@ -15,6 +15,6 @@ public interface BuildInformationService  {
 
     Integer submitOrUpdate(BuildInformationRequest request);
 
-
+    Integer getJoinType(Long lineId);
 
 }

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

@@ -150,10 +150,18 @@ public interface DeskService {
      * @return
      */
     PageInfo<PreparationCommonPendingVO> firstOrderListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
+    /**
+     *  信发系统
+     */
+    PageInfo<PreparationCommonPendingVO> xinFaListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
     /**
      *  pos
      */
     PageInfo<PreparationCommonPendingVO> posListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
+    /**
+     *  营帐通
+     */
+    PageInfo<PreparationCommonPendingVO> tentPassListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
     /**
      *  orderSys
      */

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

@@ -1,12 +1,10 @@
 package com.cool.store.service.impl;
 
 
-import com.cool.store.dao.BuildInformationDAO;
+import com.cool.store.dao.*;
-import com.cool.store.dao.PointInfoDAO;
-import com.cool.store.dao.ShopInfoDAO;
-import com.cool.store.dao.ShopStageInfoDAO;
 import com.cool.store.entity.BuildInformationDO;
 import com.cool.store.entity.PointInfoDO;
+import com.cool.store.entity.QualificationsInfoDO;
 import com.cool.store.entity.ShopInfoDO;
 import com.cool.store.enums.ErrorCodeEnum;
 import com.cool.store.enums.point.ShopSubStageEnum;
@@ -43,6 +41,8 @@ public class BuildInformationServiceImpl   implements BuildInformationService{
     private ShopInfoDAO shopInfoDAO;
     @Resource
     PreparationService preparationService;
+    @Autowired
+    private QualificationsInfoDAO qualificationsInfoDAO;
 
     @Override
     public BuildInformationResponse getBuildInformation(Long shopId) {
@@ -81,6 +81,9 @@ public class BuildInformationServiceImpl   implements BuildInformationService{
             response.setSettlerBankNumber(informationDO.getSettlerBankNumber());
             response.setSettlerBankMobile(informationDO.getSettlerBankMobile());
             response.setSettlerBankName(informationDO.getSettlerBankName());
+            response.setAuthorizationUrl(informationDO.getAuthorizationUrl());
+            response.setRelationshipProve(informationDO.getRelationshipProve());
+            response.setAccountOpeningPermit(informationDO.getAccountOpeningPermit());
         }
         return response;
     }
@@ -96,6 +99,7 @@ public class BuildInformationServiceImpl   implements BuildInformationService{
             shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_153);
             //初始化数据
             preparationService.licenseCompleted(request.getShopId());
+            preparationService.sysStoreCompleted(request.getShopId());
             return buildInformationDAO.insertSelective(buildInformationDO);
         }else {
             buildInformationDO.setUpdateTime(new Date());
@@ -104,6 +108,15 @@ public class BuildInformationServiceImpl   implements BuildInformationService{
 
     }
 
+    @Override
+    public Integer getJoinType(Long lineId) {
+        QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(lineId);
+        if (Objects.isNull(qualificationsInfoDO)) {
+            return null;
+        }
+        return qualificationsInfoDO.getJoinType();
+    }
+
 
 }
 

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

@@ -370,29 +370,44 @@ public class DeskServiceImpl implements DeskService {
         return null;
     }
 
+    @Override
+    public PageInfo<PreparationCommonPendingVO> xinFaListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
+        return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_23,
+                Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_230.getShopSubStageStatus()), Boolean.FALSE);
+
+    }
+
     @Override
     public PageInfo<PreparationCommonPendingVO> posListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
-        return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_16,
+        return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_16,
-                Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_160.getShopSubStageStatus()), Boolean.TRUE);
+                Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_160.getShopSubStageStatus()), Boolean.FALSE);
+
+    }
+
+    @Override
+    public PageInfo<PreparationCommonPendingVO> tentPassListPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
+        return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_24,
+                Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_240.getShopSubStageStatus()), Boolean.FALSE);
 
     }
 
     @Override
     public PageInfo<PreparationCommonPendingVO> orderSysPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
-        return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_17,
+        return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_17,
-                Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_170.getShopSubStageStatus()), Boolean.TRUE);
+                Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_170.getShopSubStageStatus()), Boolean.FALSE);
     }
 
     @Override
     public PageInfo<PreparationCommonPendingVO> designPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
-        return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_9,
+        return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_9,
-                Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90.getShopSubStageStatus()), Boolean.FALSE);
+                Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90.getShopSubStageStatus()), Boolean.TRUE);
     }
 
     @Override
     public PageInfo<PreparationCommonPendingVO> constructionPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
-        return commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_11,
+        return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_11,
-                Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_110.getShopSubStageStatus(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus()), Boolean.FALSE);
+                Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_110.getShopSubStageStatus(),
+                        ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus()), Boolean.TRUE);
     }
 
     @Override

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

@@ -46,6 +46,10 @@ public class PosAndOrderInfoServiceImpl implements PosAndOrderInfoService {
                 shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_163);
             }else if (request.getType().equals(PosAndOrderEnum.ORDER.getCode())) {
                 shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_173);
+            }else    if (request.getType().equals(PosAndOrderEnum.XIN_FA_SYS.getCode())) {
+                shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_235);
+            }else if (request.getType().equals(PosAndOrderEnum.TENT_PASS.getCode())) {
+                shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_245);
             }
             return posAndOrderInfoDAO.insertSelective(posAndOrderInfo);
         }else{

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

@@ -140,6 +140,14 @@ public class DeskController {
         LoginUserInfo userInfo = CurrentUserHolder.getUser();
         return ResponseResult.success(deskService.firstOrderListPendingList(pageNumber,pageSize,userInfo));
     }
+
+    @ApiOperation("待处理-信发系统")
+    @GetMapping("/xinFaListPendingList")
+    public ResponseResult<PageInfo<PreparationCommonPendingVO>> xinFaListPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
+                                                                                   @RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
+        LoginUserInfo userInfo = CurrentUserHolder.getUser();
+        return ResponseResult.success(deskService.xinFaListPendingList(pageNumber,pageSize,userInfo));
+    }
     @ApiOperation("待处理-pos")
     @GetMapping("/posListPendingList")
     public ResponseResult<PageInfo<PreparationCommonPendingVO>> posListPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@@ -147,6 +155,13 @@ public class DeskController {
         LoginUserInfo userInfo = CurrentUserHolder.getUser();
         return ResponseResult.success(deskService.posListPendingList(pageNumber,pageSize,userInfo));
     }
+    @ApiOperation("待处理-营帐通")
+    @GetMapping("/tentPassListPendingList")
+    public ResponseResult<PageInfo<PreparationCommonPendingVO>> tentPassListPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
+                                                                                     @RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
+        LoginUserInfo userInfo = CurrentUserHolder.getUser();
+        return ResponseResult.success(deskService.tentPassListPendingList(pageNumber,pageSize,userInfo));
+    }
     @ApiOperation("待处理-订货系统")
     @GetMapping("/orderSysPendingList")
     public ResponseResult<PageInfo<PreparationCommonPendingVO>> orderSysPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,

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

@@ -0,0 +1,52 @@
+package com.cool.store.controller.webb;
+
+import com.cool.store.context.CurrentUserHolder;
+import com.cool.store.enums.PosAndOrderEnum;
+import com.cool.store.request.PostAndOrderRequest;
+import com.cool.store.response.PosAndOrderResponse;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.PosAndOrderInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2024/10/12/上午10:37
+ * @Version 1.0
+ * @注释:
+ */
+@RestController
+@RequestMapping("/pc/xFAndTP")
+@Api("PC信发系统和营帐通")
+public class XinFaSysAndTentPassController {
+
+    @Resource
+    private PosAndOrderInfoService posAndOrderInfoService;
+
+    @ApiOperation("获取信发系统详情")
+    @GetMapping("/getXinFaSys")
+    private ResponseResult<PosAndOrderResponse> getXinFaSys(@RequestParam("shopId") Long shopId) {
+        return ResponseResult.success(posAndOrderInfoService.get(shopId, PosAndOrderEnum.XIN_FA_SYS.getCode()));
+    }
+
+    @ApiOperation("获取营帐通详情")
+    @GetMapping("/getTentPass")
+    private ResponseResult<PosAndOrderResponse> TentPass(@RequestParam("shopId") Long shopId) {
+        return ResponseResult.success(posAndOrderInfoService.get(shopId, PosAndOrderEnum.TENT_PASS.getCode()));
+    }
+    @ApiOperation("提交或修改信发系统")
+    @PostMapping("/subOrUpdateXinFa")
+    private ResponseResult<Integer> subOrUpdateXinFa(@RequestBody PostAndOrderRequest request) {
+        request.setType(PosAndOrderEnum.XIN_FA_SYS.getCode());
+        return ResponseResult.success(posAndOrderInfoService.submitOrUpdate(request, CurrentUserHolder.getUserId()));
+    }
+    @ApiOperation("提交或修改营帐通")
+    @PostMapping("/subOrUpdateTentPass")
+    private ResponseResult<Integer> subOrUpdateTentPass(@RequestBody PostAndOrderRequest request) {
+        request.setType(PosAndOrderEnum.TENT_PASS.getCode());
+        return ResponseResult.success(posAndOrderInfoService.submitOrUpdate(request, CurrentUserHolder.getUserId()));
+    }
+}

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

@@ -36,6 +36,10 @@ public class MiniBuildInformationController {
         return ResponseResult.success(buildInformationService.submitOrUpdate(request));
     }
 
-
+    @ApiOperation("获取加盟类型 1 - 个人加盟 2- 企业加盟")
+    @GetMapping("/getJoinType")
+    public ResponseResult<Integer> getJoinType(@RequestParam(value = "lineId", required = true) Long lineId) {
+        return ResponseResult.success(buildInformationService.getJoinType(lineId));
+    }
 
 }

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

@@ -0,0 +1,41 @@
+package com.cool.store.controller.webc;
+
+import com.cool.store.context.CurrentUserHolder;
+import com.cool.store.enums.PosAndOrderEnum;
+import com.cool.store.request.PostAndOrderRequest;
+import com.cool.store.response.PosAndOrderResponse;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.PosAndOrderInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2024/10/12/上午10:37
+ * @Version 1.0
+ * @注释:
+ */
+@RestController
+@RequestMapping("/mini/xFAndTP")
+@Api("mini信发系统和营帐通")
+public class MiniXinFaSysAndTentPassController {
+
+    @Resource
+    private PosAndOrderInfoService posAndOrderInfoService;
+
+    @ApiOperation("获取信发系统详情")
+    @GetMapping("/getXinFaSys")
+    private ResponseResult<PosAndOrderResponse> getXinFaSys(@RequestParam("shopId") Long shopId) {
+        return ResponseResult.success(posAndOrderInfoService.get(shopId, PosAndOrderEnum.XIN_FA_SYS.getCode()));
+    }
+
+    @ApiOperation("获取营帐通详情")
+    @GetMapping("/getTentPass")
+    private ResponseResult<PosAndOrderResponse> TentPass(@RequestParam("shopId") Long shopId) {
+        return ResponseResult.success(posAndOrderInfoService.get(shopId, PosAndOrderEnum.TENT_PASS.getCode()));
+    }
+
+}