springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopApi.java
@@ -1,5 +1,6 @@ package com.panzhihua.applets.api; import com.alibaba.fastjson.JSONObject; import com.panzhihua.applets.config.WxMaProperties; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.shop.*; @@ -39,6 +40,14 @@ @ApiOperation(value = "分页查询店铺" , response = PageShopStoreVO.class) @PostMapping("pageshopstore") public R pageShopStore(@RequestBody PageComShopStoreDTO comShopStoreDTO) { PageComShopSysConfDTO pageComShopSysConfDTO = new PageComShopSysConfDTO(); R conf = communityService.pageShopSysConf(pageComShopSysConfDTO); if(R.isOk(conf)&& conf.getData()!=null){ ComShopSysConfVO comShopSysConfVO = JSONObject.parseObject(JSONObject.toJSONString(conf.getData()), ComShopSysConfVO.class); if("1".equals(comShopSysConfVO.getVal()) && "1".equals(comShopSysConfVO.getEnabled())){ return R.ok(); } } return communityService.pageShopStore(comShopStoreDTO); } @@ -81,6 +90,14 @@ if(userId == null){ return R.fail("请重新登陆"); } PageComShopSysConfDTO pageComShopSysConfDTO = new PageComShopSysConfDTO(); R conf = communityService.pageShopSysConf(pageComShopSysConfDTO); if(R.isOk(conf)&& conf.getData()!=null){ ComShopSysConfVO comShopSysConfVO = JSONObject.parseObject(JSONObject.toJSONString(conf.getData()), ComShopSysConfVO.class); if("1".equals(comShopSysConfVO.getVal()) && "1".equals(comShopSysConfVO.getEnabled())){ return R.ok(0); } } return communityService.shopCartUserTotal(userId); }
@@ -350,11 +350,27 @@ } @ApiOperation(value = "配送完成") @PutMapping("/order/finishDeliver") public R finishDeliver(@RequestBody ComShopOrderDeliverDTO deliverDTO){ deliverDTO.setOperUserAccount(getLoginUserInfo().getPhone()); deliverDTO.setIsAdmin(true); return communityService.finishDeliverOrder(deliverDTO); @ApiOperation(value = "商家配置修改") @PutMapping("/conf") public R editConf(@RequestBody ComShopSysConfDTO comShopSysConfDTO){ return communityService.editShopSysConf(comShopSysConfDTO); } @ApiOperation(value = "商家配置查询", response = ComShopHiddenConfVO.class) @GetMapping("/conf") public R getConf(){ PageComShopSysConfDTO pageComShopSysConfDTO = new PageComShopSysConfDTO(); R r = communityService.pageShopSysConf(pageComShopSysConfDTO); if(R.isOk(r) && r.getData()!=null){ ComShopSysConfVO comShopSysConfVO = JSONObject.parseObject(JSONObject.toJSONString(r.getData()), ComShopSysConfVO.class); if(comShopSysConfVO!=null){ ComShopHiddenConfVO comShopHiddenConfVO = new ComShopHiddenConfVO(); comShopHiddenConfVO.setId(comShopSysConfVO.getId()); comShopHiddenConfVO.setHidden(comShopSysConfVO.getVal()); return R.ok(comShopHiddenConfVO); } } return r; } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopSysConfDTO.java
New file @@ -0,0 +1,21 @@ package com.panzhihua.common.model.dtos.shop; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * @ClasssName ComShopSysConfDTO * @Description 商家配置信息 * @Author cedoo * @Date 2021/05/11 * @Version 1.0 **/ @Data @ApiModel("商家系统配置") public class ComShopSysConfDTO { @ApiModelProperty(value = "id", required = true) private Long id; @ApiModelProperty(value = "是否隐藏 0 否 1是", required = true) private Integer hidden; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopSysConfDTO.java
New file @@ -0,0 +1,19 @@ package com.panzhihua.common.model.dtos.shop; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * @auther llming * @describe 分页查询商品 */ @ApiModel("分页查询商品") @Data public class PageComShopSysConfDTO { @ApiModelProperty(value = "分页-当前页数", example = "1", required = false) private Long pageNum = 1l; @ApiModelProperty(value = "分页-每页记录数", example = "10", required = false) private Long pageSize = 10l; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopHiddenConfVO.java
New file @@ -0,0 +1,16 @@ package com.panzhihua.common.model.vos.shop; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel("订单创建返回参数") public class ComShopHiddenConfVO { @ApiModelProperty(value = "id") private Long id; @ApiModelProperty(value = "是否隐藏 0 否 1是") private String hidden; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopSysConfVO.java
New file @@ -0,0 +1,25 @@ package com.panzhihua.common.model.vos.shop; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; import java.util.Date; @Data @ApiModel("订单创建返回参数") public class ComShopSysConfVO { @ApiModelProperty(value = "id") private Long id; @ApiModelProperty(value = "配置名称") private String name; @ApiModelProperty(value = "配置备注") private String note; @ApiModelProperty(value = "配置值") private String val; @ApiModelProperty(value = "是否生效(0 否 1 是)") private String enabled; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -2436,4 +2436,20 @@ */ @PostMapping("/editvillage/{villageId}") R editvillage(@PathVariable("villageId") Long villageId,@RequestBody ComMngVillageVO comMngVillageVO); /** * 商城系统配置 * @param comShopSysConfDTO * @return */ @PostMapping("/shop/conf/edit") R editShopSysConf(@RequestBody ComShopSysConfDTO comShopSysConfDTO); /** * 商城系统配置查询 * @param pageComShopSysConfDTO * @return */ @PostMapping("/shop/conf/get") R pageShopSysConf(@RequestBody PageComShopSysConfDTO pageComShopSysConfDTO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
@@ -1,5 +1,7 @@ package com.panzhihua.service_community.api; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO; import com.panzhihua.common.model.dtos.shop.*; import com.panzhihua.common.controller.BaseController; @@ -7,15 +9,15 @@ import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO; import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.shop.AddShopGoodsVO; import com.panzhihua.common.model.vos.shop.*; import com.panzhihua.service_community.model.dos.ComShopSysConfDO; import com.panzhihua.service_community.service.*; import com.panzhihua.common.model.vos.shop.ShopOperLogVO; import com.panzhihua.common.model.vos.shop.ShopStoreVO; import com.panzhihua.service_community.service.ComShopGoodsService; import com.panzhihua.service_community.service.ComShopOperLogService; import com.panzhihua.service_community.service.ComShopOrderService; import com.panzhihua.service_community.service.ComShopStoreService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -41,6 +43,8 @@ private ComShopCartService comShopCartService; @Resource private ComShopUserAddressService comShopUserAddressService; @Resource private ComShopSysConfService comShopSysConfService; /** * 店铺列表-分页查询 @@ -515,4 +519,51 @@ public R wxPay(@RequestBody OrderPayDTO orderPayDTO){ return comShopOrderService.wxPay(orderPayDTO); } /** * 商城系统配置 * @param comShopSysConfDTO * @return */ @PostMapping("/conf/edit") R editShopSysConf(@RequestBody ComShopSysConfDTO comShopSysConfDTO){ ComShopSysConfDO comShopSysConfDO = comShopSysConfService.getBaseMapper().selectById(comShopSysConfDTO.getId()); switch (comShopSysConfDTO.getHidden()){ case 0: comShopSysConfDO.setVal("0"); comShopSysConfDO.setEnabled("1"); break; case 1: comShopSysConfDO.setVal("1"); comShopSysConfDO.setEnabled("1"); break; default: break; } int updated = comShopSysConfService.getBaseMapper().updateById(comShopSysConfDO); if(updated==1){ return R.ok(); } return R.fail(); } /** * 商城系统配置查询 * @param pageComShopSysConfDTO * @return */ @PostMapping("/conf/get") R pageShopSysConf(@RequestBody PageComShopSysConfDTO pageComShopSysConfDTO){ List<ComShopSysConfDO> confList = comShopSysConfService.getBaseMapper().selectList(new LambdaQueryWrapper<ComShopSysConfDO>() .eq(ComShopSysConfDO::getName, "SHOP_HIDDEN") .orderByDesc(ComShopSysConfDO::getCreate_at)); ComShopSysConfVO comShopSysConfVO = new ComShopSysConfVO(); if(confList!=null && confList.size()>0){ ComShopSysConfDO firstConf = confList.get(0); BeanUtils.copyProperties(firstConf, comShopSysConfVO); return R.ok(comShopSysConfVO); } return R.ok(); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopSysConfDAO.java
New file @@ -0,0 +1,16 @@ package com.panzhihua.service_community.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.panzhihua.service_community.model.dos.ComShopCartDO; import com.panzhihua.service_community.model.dos.ComShopSysConfDO; import org.apache.ibatis.annotations.Mapper; /** * @auther lyq * @create 2021-04-14 15:02:14 * @describe 购物车表mapper类 */ @Mapper public interface ComShopSysConfDAO extends BaseMapper<ComShopSysConfDO> { } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopSysConfDO.java
New file @@ -0,0 +1,60 @@ package com.panzhihua.service_community.model.dos; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; /** * @auther lyq * @create 2021-04-14 15:03:01 * @describe 订单表实体类 */ @Data @TableName("com_shop_sys_conf") public class ComShopSysConfDO implements Serializable { private static final long serialVersionUID = 1L; /** * 订单id */ @TableId(type = IdType.AUTO) private Long id; /** * 配置名称 */ private String name; /** * 配置备注 */ private String note; /** * 配置值 */ private String val; /** * 是否生效(0 否 1 是) */ private String enabled; /** * 创建人 */ private String create_by; /** * 创建时间 */ private Date create_at; /** * 修改时间 */ private Date update_at; /** * 修改人 */ private String update_by; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopSysConfService.java
New file @@ -0,0 +1,14 @@ package com.panzhihua.service_community.service; import com.baomidou.mybatisplus.extension.service.IService; import com.panzhihua.service_community.model.dos.ComShopOrderPayDO; import com.panzhihua.service_community.model.dos.ComShopSysConfDO; /** * @author cedoo * @create 2021-5-11 10:47:50 * @describe */ public interface ComShopSysConfService extends IService<ComShopSysConfDO> { } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopSysConfServiceImpl.java
New file @@ -0,0 +1,19 @@ package com.panzhihua.service_community.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.service_community.dao.*; import com.panzhihua.service_community.model.dos.*; import com.panzhihua.service_community.service.ComShopSysConfService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; /** * @auther cedoo * @create 2021-5-11 12:20:37 * @describe 商品系统配置 */ @Slf4j @Service public class ComShopSysConfServiceImpl extends ServiceImpl<ComShopSysConfDAO, ComShopSysConfDO> implements ComShopSysConfService { }
