diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/merch/ShopMerchEntry.java b/mall-common/src/main/java/com/suisung/mall/common/modules/merch/ShopMerchEntry.java index bf6d08c3..a0c4c2ac 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/modules/merch/ShopMerchEntry.java +++ b/mall-common/src/main/java/com/suisung/mall/common/modules/merch/ShopMerchEntry.java @@ -44,9 +44,12 @@ public class ShopMerchEntry implements Serializable { @ApiModelProperty(value = "入驻商家的联系人姓名") private String contact_name; - @ApiModelProperty(value = "商家经营的类目，用数字表示不同类目") + @ApiModelProperty(value = "商家一级主营类目，用数字表示不同类目") private Integer biz_category; + @ApiModelProperty(value = "商家二级主营类目，用数字表示不同类目") + private Integer biz_second_category; + @ApiModelProperty(value = "除去运费的商家分成比列，如：95.00，最大100，最小0") private String split_ratio; diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/esign/controller/admin/EsignController.java b/mall-shop/src/main/java/com/suisung/mall/shop/esign/controller/admin/EsignController.java index abd1b5e3..d455a8ed 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/esign/controller/admin/EsignController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/esign/controller/admin/EsignController.java @@ -10,6 +10,7 @@ package com.suisung.mall.shop.esign.controller.admin; import com.suisung.mall.common.service.impl.BaseControllerImpl; import com.suisung.mall.shop.esign.service.EsignContractFillingFileService; +import com.suisung.mall.shop.esign.service.EsignContractService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.RequestMapping; @@ -26,6 +27,9 @@ public class EsignController extends BaseControllerImpl { @Resource private EsignContractFillingFileService esignContractFillingFileService; + @Resource + private EsignContractService esignContractService; + @ApiOperation(value = "店铺基础信息表-查找所有店铺编号和名称", notes = "店铺基础信息表-查找所有店铺编号和名称") @RequestMapping(value = "/testcase", method = RequestMethod.POST) public Object testCase() { @@ -35,6 +39,6 @@ public class EsignController extends BaseControllerImpl { @ApiOperation(value = "基于文件发起签署电子合同", notes = "基于文件发起签署电子合同") @RequestMapping(value = "/sign-flow/create-by-file", method = RequestMethod.POST) public Object signFlowCreateByFile() { - return esignContractFillingFileService.fillDocTemplate("11", "11"); + return esignContractService.signFlowCreateByFile(); } } diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/esign/mapper/EsignContractMapper.java b/mall-shop/src/main/java/com/suisung/mall/shop/esign/mapper/EsignContractMapper.java new file mode 100644 index 00000000..3b78ab19 --- /dev/null +++ b/mall-shop/src/main/java/com/suisung/mall/shop/esign/mapper/EsignContractMapper.java @@ -0,0 +1,15 @@ +/* + * Copyright (c) 2025. Lorem ipsum dolor sit amet, consectetur adipiscing elit. + * Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan. + * Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna. + * Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus. + * Vestibulum commodo. Ut rhoncus gravida arcu. + */ + +package com.suisung.mall.shop.esign.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.suisung.mall.common.modules.esign.EsignContract; + +public interface EsignContractMapper extends BaseMapper { +} diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/EsignContractService.java b/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/EsignContractService.java new file mode 100644 index 00000000..9bcfeb9d --- /dev/null +++ b/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/EsignContractService.java @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2025. Lorem ipsum dolor sit amet, consectetur adipiscing elit. + * Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan. + * Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna. + * Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus. + * Vestibulum commodo. Ut rhoncus gravida arcu. + */ + +package com.suisung.mall.shop.esign.service; + +public interface EsignContractService { + + Object signFlowCreateByFile(); +} diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/impl/EsignContractServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/impl/EsignContractServiceImpl.java new file mode 100644 index 00000000..c8129239 --- /dev/null +++ b/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/impl/EsignContractServiceImpl.java @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2025. Lorem ipsum dolor sit amet, consectetur adipiscing elit. + * Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan. + * Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna. + * Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus. + * Vestibulum commodo. Ut rhoncus gravida arcu. + */ + +package com.suisung.mall.shop.esign.service.impl; + +import com.suisung.mall.common.modules.esign.EsignContract; +import com.suisung.mall.core.web.service.impl.BaseServiceImpl; +import com.suisung.mall.shop.esign.mapper.EsignContractMapper; +import com.suisung.mall.shop.esign.service.EsignContractService; +import org.springframework.stereotype.Service; + +@Service +public class EsignContractServiceImpl extends BaseServiceImpl implements EsignContractService { + /** + * @param s + * @param s1 + * @return + */ + @Override + public Object signFlowCreateByFile() { + return null; + } +} diff --git a/mall-shop/src/main/resources/mapper/esign/EsignContractMapper.xml b/mall-shop/src/main/resources/mapper/esign/EsignContractMapper.xml new file mode 100644 index 00000000..36aed066 --- /dev/null +++ b/mall-shop/src/main/resources/mapper/esign/EsignContractMapper.xml @@ -0,0 +1,8 @@ + + + + + + * + +