springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
@@ -169,7 +169,9 @@ */ @ApiOperation(value = "分页查询便民服务商家", response = ConvenientMerchantVO.class) @PostMapping("/merchant/page") public R pageMerchant(@RequestBody JinhuiPageConvenientMerchantDTO pageConvenientMerchantDTO) { public R pageMerchant(@RequestBody JinhuiPageConvenientMerchantDTO pageConvenientMerchantDTO) { pageConvenientMerchantDTO.setAuditType("2"); return jinhuiCommunityService.pageMerchant(pageConvenientMerchantDTO); } @@ -603,4 +605,20 @@ } @ApiOperation(value = "订单核销") @GetMapping("/orderCheck") public R orderEditData(@RequestParam("id") String id) { if(StringUtils.isEmpty(id)) { return R.fail("订单id不能为空"); } JinhuiShoppingOrderVO vo=new JinhuiShoppingOrderVO(); vo.setId(id); vo.setCancelType("1"); return jinhuiCommunityService.orderEditData(vo); } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/JinhuiPageConvenientMerchantDTO.java
@@ -44,4 +44,6 @@ private Long pageSize; private String areaCode; private String auditType; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiInterspaceApplyForVO.java
@@ -62,5 +62,12 @@ @ApiModelProperty(value = "图片") private String imgUrl; @ApiModelProperty(value = "空间地址") private String address; @ApiModelProperty(value = "经度") private String lon; @ApiModelProperty(value = "纬度") private String lat; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
@@ -6,6 +6,7 @@ import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO; import com.panzhihua.common.model.vos.community.convenient.JinhuiConvenientMerchantVO; import com.panzhihua.common.model.vos.jinhui.*; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.transaction.annotation.Transactional; @@ -241,6 +242,13 @@ @RequestParam("pageSize") int pageSize); @PostMapping("/jinhuiMerchant/addData") public R merchantAddData(@RequestBody JinhuiConvenientMerchantVO item); @PostMapping("/jinhuiMerchant/editData") public R merchantEditData(@RequestBody JinhuiConvenientMerchantVO item); /************************************************************************************************************** * * springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java
@@ -3,9 +3,12 @@ import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.community.ComActWorkGuideDTO; import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO; import com.panzhihua.common.model.dtos.community.convenient.JinhuiPageConvenientMerchantDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO; import com.panzhihua.common.model.vos.community.ComActWorkGuideVO; import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO; import com.panzhihua.common.model.vos.community.convenient.JinhuiConvenientMerchantVO; import com.panzhihua.common.model.vos.jinhui.*; import com.panzhihua.common.service.jinhui.JinhuiCommunityService; import io.swagger.annotations.Api; @@ -703,7 +706,6 @@ * 社区配置兑换地址 时间 * * ******************************************************************************************************* * @param item * @return */ @ApiOperation(value = "社区配置兑换地址详情", response = JinhuiConfigVO.class) @@ -738,5 +740,64 @@ } /******************************************************************************************************************* * * * 便民服务 * * ******************************************************************************************************************/ /** * 分页查询便民服务商家 运营后台 * * @param pageConvenientMerchantDTO * @return */ @ApiOperation(value = "分页查询便民服务商家", response = JinhuiConvenientMerchantVO.class) @PostMapping("/merchant/page") public R pageMerchant(@RequestBody JinhuiPageConvenientMerchantDTO pageConvenientMerchantDTO) { return jinhuiCommunityService.pageMerchant(pageConvenientMerchantDTO); } @ApiOperation(value = "便民服务商家入驻") @PostMapping("/jinhuiMerchant/addData") public R merchantAddData(@RequestBody JinhuiConvenientMerchantVO item) { item.setAuditType("1"); return jinhuiCommunityService.merchantAddData(item); } @ApiOperation(value = "便民服务商家编辑") @PostMapping("/jinhuiMerchant/editData") public R merchantEditData(@RequestBody JinhuiConvenientMerchantVO item) { return jinhuiCommunityService.merchantEditData(item); } @ApiOperation(value = "便民服务商家审核") @GetMapping("/jinhuiMerchant/audit") public R merchantAudit(@RequestParam("auditType") String auditType, @RequestParam("merchantId") String merchantId, @RequestParam(value = "auditOpinion", required = false) String auditOpinion) { if(StringUtils.isEmpty(merchantId)) { return R.fail("商家id不能为空"); } if(StringUtils.isEmpty(auditType)) { return R.fail("状态审核不能为空"); } JinhuiConvenientMerchantVO vo=new JinhuiConvenientMerchantVO(); vo.setId(Long.valueOf(merchantId)); vo.setAuditType(auditType); vo.setAuditOpinion(auditOpinion); return jinhuiCommunityService.merchantEditData(vo); } } springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiMerchantApi.java
@@ -4,6 +4,7 @@ import com.panzhihua.common.model.dtos.community.convenient.JinhuiPageConvenientMerchantDTO; import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.convenient.JinhuiConvenientMerchantVO; import com.panzhihua.service_jinhui_community.service.JinhuiComConvenientServiceCategoriesService; import com.panzhihua.service_jinhui_community.service.JinhuiConvenientMerchantService; import lombok.extern.slf4j.Slf4j; @@ -39,6 +40,21 @@ return jinhuiConvenientMerchantService.deleteMerchant(merchantId, operator); } @PostMapping("/addData") public R merchantAddData(@RequestBody JinhuiConvenientMerchantVO item) { return jinhuiConvenientMerchantService.addData(item); } @PostMapping("/editData") public R merchantEditData(@RequestBody JinhuiConvenientMerchantVO item) { return jinhuiConvenientMerchantService.editData(item); } /** * 分页查询便民服务商家 运营后台 * springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiConvenientMerchantDao.java
@@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.PageBaseDTO; import com.panzhihua.common.model.dtos.community.convenient.*; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.StatisticsCommVO; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenMerchantStatisticsInfo; import com.panzhihua.common.model.vos.community.convenient.*; import com.panzhihua.common.model.vos.jinhui.JinhuiShoppingVO; import com.panzhihua.service_jinhui_community.entity.JinhuiConvenientMerchant; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -52,4 +54,9 @@ JinhuiConvenientMerchantVO selectMerchantById(@Param("merchantId") String merchantId); R addData(@Param("item") JinhuiConvenientMerchantVO item); R editData(@Param("item") JinhuiConvenientMerchantVO item); } springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiInterspaceApplyFor.java
@@ -64,5 +64,13 @@ @ApiModelProperty(value = "图片") private String imgUrl; @ApiModelProperty(value = "空间地址") private String address; @ApiModelProperty(value = "经度") private String lon; @ApiModelProperty(value = "纬度") private String lat; } springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiConvenientMerchantService.java
@@ -4,7 +4,9 @@ import com.panzhihua.common.model.dtos.community.convenient.*; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO; import com.panzhihua.common.model.vos.community.convenient.JinhuiConvenientMerchantVO; import com.panzhihua.service_jinhui_community.entity.JinhuiConvenientMerchant; import org.apache.ibatis.annotations.Param; /** * @title: ConvenientMerchantService @@ -38,8 +40,9 @@ */ R getMerchant(String merchantId); R addData(JinhuiConvenientMerchantVO item); R editData(JinhuiConvenientMerchantVO item); } springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiConvenientMerchantServiceImpl.java
@@ -54,6 +54,15 @@ return R.ok(convenientMerchantVO); } @Override public R addData(JinhuiConvenientMerchantVO item) { return baseMapper.addData(item); } @Override public R editData(JinhuiConvenientMerchantVO item) { return baseMapper.editData(item); } } springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiComConvenientMerchantsMapper.xml
@@ -60,6 +60,9 @@ <if test="item.businessStatus != null"> AND ccm.business_status = #{item.businessStatus} </if> <if test="item.auditType != null and item.auditType != ''"> AND ccm.audit_type = #{item.auditType} </if> <if test="item.keyword != null and item.keyword != """> AND ( ccm.name LIKE CONCAT('%', #{item.keyword}, '%') springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiInterspaceApplyForMapper.xml
@@ -24,6 +24,9 @@ jiaf.interspace_id, ji.title as interspaceName, ji.img_url, ji.address, ji.lon, ji.lat, jiaf.interspace_time, jiaf.subscribe_time_frame, jiaf.user_name, @@ -62,7 +65,10 @@ jiaf.id, jiaf.interspace_id, ji.title as interspaceName, ji.img_url as imgUrl, ji.img_url, ji.address, ji.lon, ji.lat, jiaf.interspace_time, jiaf.subscribe_time_frame, jiaf.user_name,
