czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangw
2025-12-15 14:58:42 +08:00
parent 8dd6dfcd49 475ea0ec58
commit 37b6bda939
5 changed files with 59 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-api/market-server/src/main/java/com/czg/controller/admin/DrainageConfigController.java
View File

@@ -11,7 +11,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
/**
* 私域引流配置
* 管理端/私域引流配置
*
* @author Administrator
*/

26
cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDrainageConfigDTO.java
View File

@@ -1,17 +1,15 @@
package com.czg.market.dto;
import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.KeyType;
import jakarta.validation.constraints.Max;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.List;
/**
* @author yjjie
*/
@Data
public class MkDrainageConfigDTO implements Serializable {
@@ -19,9 +17,14 @@ public class MkDrainageConfigDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 堂食 dine-in 外带 take-out 外卖 take-away
* 订单页显示类型： 堂食 dine-in 外带 take-out 外卖 take-away
*/
private List<String> useType;
private List<String> orderType;
/**
* 首页显示类型：only 仅显示 1 次，day 每天显示一次，every 每次进入小程序
*/
private List<String> homeType;
/**
* 群二维码
@@ -45,8 +48,13 @@ public class MkDrainageConfigDTO implements Serializable {
private String note;
/**
* 是否开启
* 订单页是否开启
*/
private Integer isEnable;
private Integer orderEnable;
/**
* 首页是否开启
*/
private Integer homeEnable;
}

18
cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDrainageConfig.java
View File

@@ -34,9 +34,14 @@ public class MkDrainageConfig implements Serializable {
private Long id;
/**
* 堂食 dine-in 外带 take-out 外卖 take-away
* 订单页显示类型： 堂食 dine-in 外带 take-out 外卖 take-away
*/
private String useType;
private String orderType;
/**
* 首页显示类型：only 仅显示 1 次，day 每天显示一次，every 每次进入小程序
*/
private String homeType;
/**
* 群二维码
@@ -59,9 +64,14 @@ public class MkDrainageConfig implements Serializable {
private String note;
/**
* 是否开启
* 订单页是否开启
*/
private Integer isEnable;
private Integer orderEnable;
/**
* 首页是否开启
*/
private Integer homeEnable;
/**
* 主店id

19
cash-common/cash-common-service/src/main/java/com/czg/market/vo/MkDrainageConfigVO.java
View File

@@ -3,7 +3,6 @@ package com.czg.market.vo;
import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.KeyType;
import com.mybatisflex.annotation.Table;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -33,9 +32,14 @@ public class MkDrainageConfigVO implements Serializable {
private Long id;
/**
* 堂食 dine-in 外带 take-out 外卖 take-away
* 订单页显示类型： 堂食 dine-in 外带 take-out 外卖 take-away
*/
private List<String> useType;
private List<String> orderType;
/**
* 首页显示类型：only 仅显示 1 次，day 每天显示一次，every 每次进入小程序
*/
private List<String> homeType;
/**
* 群二维码
@@ -58,9 +62,14 @@ public class MkDrainageConfigVO implements Serializable {
private String note;
/**
* 是否开启
* 订单页是否开启
*/
private Integer isEnable;
private Integer orderEnable;
/**
* 首页是否开启
*/
private Integer homeEnable;
/**
* 主店id

21
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDrainageConfigServiceImpl.java
View File

@@ -3,15 +3,14 @@ package com.czg.service.market.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson2.JSONArray;
import com.czg.account.entity.ShopInfo;
import com.czg.account.service.ShopInfoService;
import com.czg.market.dto.MkDrainageConfigDTO;
import com.czg.market.vo.MkDrainageConfigVO;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.czg.market.entity.MkDrainageConfig;
import com.czg.market.service.MkDrainageConfigService;
import com.czg.market.vo.MkDrainageConfigVO;
import com.czg.service.market.mapper.MkDrainageConfigMapper;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
@@ -37,8 +36,11 @@ public class MkDrainageConfigServiceImpl extends ServiceImpl<MkDrainageConfigMap
config = getOne(new QueryWrapper().eq(MkDrainageConfig::getShopId, shopId));
}
MkDrainageConfigVO info = BeanUtil.copyProperties(config, MkDrainageConfigVO.class, "useType");
if (StrUtil.isNotBlank(config.getUseType())) {
info.setUseType(JSONArray.parseArray(config.getUseType()).toList(String.class));
if (StrUtil.isNotBlank(config.getOrderType())) {
info.setOrderType(JSONArray.parseArray(config.getOrderType()).toList(String.class));
}
if (StrUtil.isNotBlank(config.getHomeType())) {
info.setHomeType(JSONArray.parseArray(config.getHomeType()).toList(String.class));
}
return info;
@@ -48,8 +50,11 @@ public class MkDrainageConfigServiceImpl extends ServiceImpl<MkDrainageConfigMap
public Boolean edit(Long shopId, MkDrainageConfigDTO config) {
MkDrainageConfig info = getOne(new QueryWrapper().eq(MkDrainageConfig::getShopId, shopId));
BeanUtil.copyProperties(config, info);
if (config.getUseType() != null) {
info.setUseType(JSONArray.toJSONString(config.getUseType()));
if (config.getOrderType() != null) {
info.setOrderType(JSONArray.toJSONString(config.getOrderType()));
}
if (config.getHomeType() != null) {
info.setHomeType(JSONArray.toJSONString(config.getHomeType()));
}
return updateById(info);
}