Commit 0df29002 by zhiwj

Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer
parents 3952fee8 c3d5d221
......@@ -5,19 +5,19 @@ import java.util.Date;
public class UserMessageDTO implements Serializable {
private Integer messageId;
private String classifyName;
private String classify;
private String title;
private String content;
private Date createTime;
private Integer status;
private Integer sign;
public String getClassifyName() {
return classifyName;
public String getClassify() {
return classify;
}
public void setClassifyName(String classifyName) {
this.classifyName = classifyName;
public void setClassify(String classify) {
this.classify = classify;
}
public String getTitle() {
......
package com.gic.enterprise.dto.data;
import java.io.Serializable;
import java.util.Date;
/**
* 实付配置
* @ClassName: DataActuallyPaidConfigDTO

* @Description: 

* @author guojuxing

* @date 2020/4/17 10:27 AM

*/
public class DataActuallyPaidConfigDTO implements Serializable{
private static final long serialVersionUID = -5443298335953111361L;
/**
*
*/
private Integer actuallyPaidConfigId;
/**
*
*/
private Integer enterpriseId;
/**
* 1:会员业务(积分计算)2:会员业务(等级升降条件(如单笔消费满XX元、当天消费满XX元)3:基础业绩 4:会员消费 5:单效
*/
private Integer classify;
/**
* 1:已配置 默认全关,走应付流程
*/
private Integer configStatus;
/**
* 1:有效
*/
private Integer status;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
public DataActuallyPaidConfigDTO() {
}
public Integer getActuallyPaidConfigId() {
return actuallyPaidConfigId;
}
public DataActuallyPaidConfigDTO setActuallyPaidConfigId(Integer actuallyPaidConfigId) {
this.actuallyPaidConfigId = actuallyPaidConfigId;
return this;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public DataActuallyPaidConfigDTO setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
return this;
}
public Integer getClassify() {
return classify;
}
public DataActuallyPaidConfigDTO setClassify(Integer classify) {
this.classify = classify;
return this;
}
public Integer getConfigStatus() {
return configStatus;
}
public DataActuallyPaidConfigDTO setConfigStatus(Integer configStatus) {
this.configStatus = configStatus;
return this;
}
public Integer getStatus() {
return status;
}
public DataActuallyPaidConfigDTO setStatus(Integer status) {
this.status = status;
return this;
}
public Date getCreateTime() {
return createTime;
}
public DataActuallyPaidConfigDTO setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
public Date getUpdateTime() {
return updateTime;
}
public DataActuallyPaidConfigDTO setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
return this;
}
}
package com.gic.enterprise.dto.data;
import java.io.Serializable;
import java.util.Date;
/**
* 会员消费配置
* @ClassName: DataMemberConsumeConfigDTO

* @Description: 

* @author guojuxing

* @date 2020/4/16 3:26 PM

*/
public class DataMemberConsumeConfigDTO implements Serializable{
private static final long serialVersionUID = -8285427103409771318L;
/**
*
*/
private Integer memberConsumeConfigId;
/**
*
*/
private Integer enterpriseId;
/**
* 会员消费统计粒度 1:会员 + 渠道 + 线上店铺/线下门店品牌 (按订单统计) 2:会员 + 渠道 + 线上店铺/线下门店品牌 + 商品品牌 (按订单项统计)
*/
private Integer memberConsumeCount;
/**
* 最高单笔配置 1:最高ERP单笔应付』 2:『最高单笔销售应付』 3:『最高有效单笔应付』 4:『最高成交单笔应付』
*/
private Integer memberConsumeMax;
/**
* 消费次数 1:消费单次数』2:『有效消费次数』
*/
private Integer memberConsumeTimes;
/**
* 1:有效
*/
private Integer status;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
public Integer getMemberConsumeConfigId() {
return memberConsumeConfigId;
}
public DataMemberConsumeConfigDTO setMemberConsumeConfigId(Integer memberConsumeConfigId) {
this.memberConsumeConfigId = memberConsumeConfigId;
return this;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public DataMemberConsumeConfigDTO setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
return this;
}
public Integer getMemberConsumeCount() {
return memberConsumeCount;
}
public DataMemberConsumeConfigDTO setMemberConsumeCount(Integer memberConsumeCount) {
this.memberConsumeCount = memberConsumeCount;
return this;
}
public Integer getMemberConsumeMax() {
return memberConsumeMax;
}
public DataMemberConsumeConfigDTO setMemberConsumeMax(Integer memberConsumeMax) {
this.memberConsumeMax = memberConsumeMax;
return this;
}
public Integer getMemberConsumeTimes() {
return memberConsumeTimes;
}
public DataMemberConsumeConfigDTO setMemberConsumeTimes(Integer memberConsumeTimes) {
this.memberConsumeTimes = memberConsumeTimes;
return this;
}
public Integer getStatus() {
return status;
}
public DataMemberConsumeConfigDTO setStatus(Integer status) {
this.status = status;
return this;
}
public Date getCreateTime() {
return createTime;
}
public DataMemberConsumeConfigDTO setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
public Date getUpdateTime() {
return updateTime;
}
public DataMemberConsumeConfigDTO setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
return this;
}
}
package com.gic.enterprise.dto.data;
import java.io.Serializable;
import java.util.Date;
/**
* 微信会员配置
* @ClassName: DataWechatMemberConfigDTO

* @Description: 

* @author guojuxing

* @date 2020/4/17 9:47 AM

*/
public class DataWechatMemberConfigDTO implements Serializable{
private static final long serialVersionUID = 1683486475553056809L;
/**
*
*/
private Integer wechatMemberConfigId;
/**
*
*/
private Integer enterpriseId;
/**
* 会员卡ID
*/
private String memberCardArea;
/**
* 关联服务号,可以多选,英文逗号给开
*/
private String relateService;
/**
* 关联小程序,可以多选,英文逗号隔开,与关联服务号是或的关系
*/
private String relateWechat;
/**
* 1:有效
*/
private Integer status;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
public Integer getWechatMemberConfigId() {
return wechatMemberConfigId;
}
public DataWechatMemberConfigDTO setWechatMemberConfigId(Integer wechatMemberConfigId) {
this.wechatMemberConfigId = wechatMemberConfigId;
return this;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public DataWechatMemberConfigDTO setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
return this;
}
public String getMemberCardArea() {
return memberCardArea;
}
public DataWechatMemberConfigDTO setMemberCardArea(String memberCardArea) {
this.memberCardArea = memberCardArea;
return this;
}
public String getRelateService() {
return relateService;
}
public DataWechatMemberConfigDTO setRelateService(String relateService) {
this.relateService = relateService;
return this;
}
public String getRelateWechat() {
return relateWechat;
}
public DataWechatMemberConfigDTO setRelateWechat(String relateWechat) {
this.relateWechat = relateWechat;
return this;
}
public Integer getStatus() {
return status;
}
public DataWechatMemberConfigDTO setStatus(Integer status) {
this.status = status;
return this;
}
public Date getCreateTime() {
return createTime;
}
public DataWechatMemberConfigDTO setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
public Date getUpdateTime() {
return updateTime;
}
public DataWechatMemberConfigDTO setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
return this;
}
}
......@@ -15,6 +15,10 @@ public interface CustomStoreApiService {
ServiceResponse<Integer> openCustomStore(Integer enterpriseId, String appid, Integer customStoreId);
ServiceResponse<Integer> closeCustomStore(Integer enterpriseId, String appid);
ServiceResponse<Integer> closeCustomStore(Integer customStoreId);
ServiceResponse<CustomStoreDTO> getCustomStore(Integer enterpriseId, String appid);
ServiceResponse<Void> customSettingHasCommpleted(Integer enterpriseId);
......
package com.gic.enterprise.service;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.enterprise.dto.data.DataActuallyPaidConfigDTO;
import com.gic.enterprise.dto.data.DataMemberConsumeConfigDTO;
import java.util.List;
public interface DataConfigApiService {
/**
* 会员消费配置
* @Title: configMemberConsumeConfig

* @Description:

* @author guojuxing
* @param dto

* @return com.gic.api.base.commons.ServiceResponse<java.lang.Integer>


*/
ServiceResponse<Integer> configMemberConsume(DataMemberConsumeConfigDTO dto);
ServiceResponse<DataMemberConsumeConfigDTO> getMemberConsumeConfigByEnterpriseId(Integer enterpriseId);
/**
* 新增
* @Title: configActuallyPaid

* @Description:

* @author guojuxing
* @param dtoList

* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>


*/
ServiceResponse<Void> configActuallyPaid(List<DataActuallyPaidConfigDTO> dtoList);
ServiceResponse<List<DataActuallyPaidConfigDTO>> listActuallyPaidConfig(Integer enterpriseId);
/**
* 新增商户的时候设置实付配置默认数据
* @Title: initActuallyPaidData

* @Description:

* @author guojuxing
* @param enterpriseId

* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>


*/
ServiceResponse<Void> initActuallyPaidData(Integer enterpriseId);
}
......@@ -70,6 +70,8 @@ public interface PushMessageApiService {
*/
ServiceResponse<PushMessageDTO> getPushMessageById(Integer messageId);
ServiceResponse<UserMessageDTO> getUserMessageDetail(Integer messageId);
/** @Description: 删除通知消息
* @author taogs
* @Date 16:54 2019/11/27
......@@ -120,7 +122,8 @@ public interface PushMessageApiService {
* @Param
* @return
*/
ServiceResponse<Integer> totalUserMessage(Integer userId, Integer status);
ServiceResponse<Integer> totalUserMessage(Integer userId, String search, Integer status,
Date startTime, Date endTime, Integer pushClassifyId);
/** @Description: 推送消息接口
* @author taogs
......@@ -154,5 +157,6 @@ public interface PushMessageApiService {
* @Param
* @return
*/
ServiceResponse<Integer> readMessage(Integer messageId, Integer userId);
ServiceResponse<Integer> readMessage(Integer messageId);
}
package com.gic.enterprise.dao.mapper;
import com.gic.enterprise.entity.TabDataActuallyPaidConfig;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface TabDataActuallyPaidConfigMapper {
/**
* 根据主键删除
*
* @param actuallyPaidConfigId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer actuallyPaidConfigId);
/**
* 插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insert(TabDataActuallyPaidConfig record);
/**
* 动态插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insertSelective(TabDataActuallyPaidConfig record);
/**
* 根据主键查询
*
* @param actuallyPaidConfigId 主键
* @return 实体对象
*/
TabDataActuallyPaidConfig selectByPrimaryKey(Integer actuallyPaidConfigId);
/**
* 根据主键动态更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKeySelective(TabDataActuallyPaidConfig record);
/**
* 根据主键更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKey(TabDataActuallyPaidConfig record);
List<TabDataActuallyPaidConfig> listByEnterpriseId(Integer enterpriseId);
int delete(@Param("enterpriseId") Integer enterpriseId, @Param("classify") Integer classify);
}
\ No newline at end of file
package com.gic.enterprise.dao.mapper;
import com.gic.enterprise.entity.TabDataMemberConsumeConfig;
public interface TabDataMemberConsumeConfigMapper {
/**
* 根据主键删除
*
* @param memberConsumeConfigId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer memberConsumeConfigId);
/**
* 插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insert(TabDataMemberConsumeConfig record);
/**
* 动态插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insertSelective(TabDataMemberConsumeConfig record);
/**
* 根据主键查询
*
* @param memberConsumeConfigId 主键
* @return 实体对象
*/
TabDataMemberConsumeConfig selectByPrimaryKey(Integer memberConsumeConfigId);
/**
* 根据主键动态更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKeySelective(TabDataMemberConsumeConfig record);
/**
* 根据主键更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKey(TabDataMemberConsumeConfig record);
TabDataMemberConsumeConfig getByEnterpriseId(Integer enterpriseId);
}
\ No newline at end of file
package com.gic.enterprise.dao.mapper;
import com.gic.enterprise.entity.TabDataWechatMemberConfig;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface TabDataWechatMemberConfigMapper {
/**
* 根据主键删除
*
* @param wechatMemberConfigId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer wechatMemberConfigId);
/**
* 插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insert(TabDataWechatMemberConfig record);
/**
* 动态插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insertSelective(TabDataWechatMemberConfig record);
/**
* 根据主键查询
*
* @param wechatMemberConfigId 主键
* @return 实体对象
*/
TabDataWechatMemberConfig selectByPrimaryKey(Integer wechatMemberConfigId);
/**
* 根据主键动态更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKeySelective(TabDataWechatMemberConfig record);
/**
* 根据主键更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKey(TabDataWechatMemberConfig record);
TabDataWechatMemberConfig getByMemberCardId(@Param("enterpriseId") Integer enterpriseId, @Param("memberCardId") String memberCardId);
List<TabDataWechatMemberConfig> listByEnterpriseId(Integer enterpriseId);
}
\ No newline at end of file
......@@ -66,7 +66,7 @@ public interface TabPushMessageMapper {
@Param("status") Integer status,
@Param("startTime") Date startTime,
@Param("endTime") Date endTime,
@Param("pushClassifyId") Integer pushClassifyId,
@Param("classify") String classify,
@Param("userId") Integer userId);
int readCount(@Param("messageId") Integer messageId);
......
......@@ -3,6 +3,7 @@ package com.gic.enterprise.dao.mapper;
import com.gic.enterprise.entity.TabPushUserMessage;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
public interface TabPushUserMessageMapper {
......@@ -56,11 +57,14 @@ public interface TabPushUserMessageMapper {
int recallMessage(@Param("messageId") Integer messageId);
List<Integer> totalUserMessage(@Param("userId") Integer userId,
@Param("status") Integer status);
List<Integer> totalUserMessage(@Param("search") String search,
@Param("status") Integer status,
@Param("startTime") Date startTime,
@Param("endTime") Date endTime,
@Param("classify") String classify,
@Param("userId") Integer userId);
int readAll(@Param("userId") Integer userId);
int readMessage(@Param("messageId") Integer messageId,
@Param("userId") Integer userId);
int readMessage(@Param("messageId") Integer messageId);
}
\ No newline at end of file
package com.gic.enterprise.entity;
import java.util.Date;
/**
* tab_data_actually_paid_config
*/
public class TabDataActuallyPaidConfig {
/**
*
*/
private Integer actuallyPaidConfigId;
/**
*
*/
private Integer enterpriseId;
/**
* 1:会员业务(积分计算)2:会员业务(等级升降条件(如单笔消费满XX元、当天消费满XX元)3:基础业绩 4:会员消费 5:单效
*/
private Integer classify;
/**
* 1:已配置 默认全关,走应付流程
*/
private Integer configStatus;
/**
* 1:有效
*/
private Integer status;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
public Integer getActuallyPaidConfigId() {
return actuallyPaidConfigId;
}
public TabDataActuallyPaidConfig setActuallyPaidConfigId(Integer actuallyPaidConfigId) {
this.actuallyPaidConfigId = actuallyPaidConfigId;
return this;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public TabDataActuallyPaidConfig setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
return this;
}
public Integer getClassify() {
return classify;
}
public TabDataActuallyPaidConfig setClassify(Integer classify) {
this.classify = classify;
return this;
}
public Integer getConfigStatus() {
return configStatus;
}
public TabDataActuallyPaidConfig setConfigStatus(Integer configStatus) {
this.configStatus = configStatus;
return this;
}
public Integer getStatus() {
return status;
}
public TabDataActuallyPaidConfig setStatus(Integer status) {
this.status = status;
return this;
}
public Date getCreateTime() {
return createTime;
}
public TabDataActuallyPaidConfig setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
public Date getUpdateTime() {
return updateTime;
}
public TabDataActuallyPaidConfig setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
return this;
}
}
\ No newline at end of file
package com.gic.enterprise.entity;
import java.util.Date;
/**
* tab_data_member_consume_config
*/
public class TabDataMemberConsumeConfig {
/**
*
*/
private Integer memberConsumeConfigId;
/**
*
*/
private Integer enterpriseId;
/**
* 会员消费统计粒度 1:会员 + 渠道 + 线上店铺/线下门店品牌 (按订单统计) 2:会员 + 渠道 + 线上店铺/线下门店品牌 + 商品品牌 (按订单项统计)
*/
private Integer memberConsumeCount;
/**
* 最高单笔配置 1:最高ERP单笔应付』 2:『最高单笔销售应付』 3:『最高有效单笔应付』 4:『最高成交单笔应付』
*/
private Integer memberConsumeMax;
/**
* 消费次数 1:消费单次数』2:『有效消费次数』
*/
private Integer memberConsumeTimes;
/**
* 1:有效
*/
private Integer status;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
public Integer getMemberConsumeConfigId() {
return memberConsumeConfigId;
}
public TabDataMemberConsumeConfig setMemberConsumeConfigId(Integer memberConsumeConfigId) {
this.memberConsumeConfigId = memberConsumeConfigId;
return this;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public TabDataMemberConsumeConfig setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
return this;
}
public Integer getMemberConsumeCount() {
return memberConsumeCount;
}
public TabDataMemberConsumeConfig setMemberConsumeCount(Integer memberConsumeCount) {
this.memberConsumeCount = memberConsumeCount;
return this;
}
public Integer getMemberConsumeMax() {
return memberConsumeMax;
}
public TabDataMemberConsumeConfig setMemberConsumeMax(Integer memberConsumeMax) {
this.memberConsumeMax = memberConsumeMax;
return this;
}
public Integer getMemberConsumeTimes() {
return memberConsumeTimes;
}
public TabDataMemberConsumeConfig setMemberConsumeTimes(Integer memberConsumeTimes) {
this.memberConsumeTimes = memberConsumeTimes;
return this;
}
public Integer getStatus() {
return status;
}
public TabDataMemberConsumeConfig setStatus(Integer status) {
this.status = status;
return this;
}
public Date getCreateTime() {
return createTime;
}
public TabDataMemberConsumeConfig setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
public Date getUpdateTime() {
return updateTime;
}
public TabDataMemberConsumeConfig setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
return this;
}
}
\ No newline at end of file
package com.gic.enterprise.entity;
import java.util.Date;
/**
* tab_data_wechat_member_config
*/
public class TabDataWechatMemberConfig {
/**
*
*/
private Integer wechatMemberConfigId;
/**
*
*/
private Integer enterpriseId;
/**
* 会员卡ID
*/
private String memberCardArea;
/**
* 关联服务号,可以多选,英文逗号给开
*/
private String relateService;
/**
* 关联小程序,可以多选,英文逗号隔开,与关联服务号是或的关系
*/
private String relateWechat;
/**
* 1:有效
*/
private Integer status;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
public Integer getWechatMemberConfigId() {
return wechatMemberConfigId;
}
public TabDataWechatMemberConfig setWechatMemberConfigId(Integer wechatMemberConfigId) {
this.wechatMemberConfigId = wechatMemberConfigId;
return this;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public TabDataWechatMemberConfig setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
return this;
}
public String getMemberCardArea() {
return memberCardArea;
}
public TabDataWechatMemberConfig setMemberCardArea(String memberCardArea) {
this.memberCardArea = memberCardArea;
return this;
}
public String getRelateService() {
return relateService;
}
public TabDataWechatMemberConfig setRelateService(String relateService) {
this.relateService = relateService;
return this;
}
public String getRelateWechat() {
return relateWechat;
}
public TabDataWechatMemberConfig setRelateWechat(String relateWechat) {
this.relateWechat = relateWechat;
return this;
}
public Integer getStatus() {
return status;
}
public TabDataWechatMemberConfig setStatus(Integer status) {
this.status = status;
return this;
}
public Date getCreateTime() {
return createTime;
}
public TabDataWechatMemberConfig setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
public Date getUpdateTime() {
return updateTime;
}
public TabDataWechatMemberConfig setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
return this;
}
}
\ No newline at end of file
......@@ -16,5 +16,7 @@ public interface CustomStoreService {
int openCustomStore(Integer customStoreId);
int closeCustomStore(Integer customStoreId);
TabCustomStore getCustomStore(Integer enterpriseId, String appid);
}
package com.gic.enterprise.service;
import com.gic.enterprise.dto.data.DataActuallyPaidConfigDTO;
import com.gic.enterprise.entity.TabDataActuallyPaidConfig;
import java.util.List;
public interface DataActuallyPaidConfigService {
/**
* 新增实付配置
* @Title: saveActuallyPaidConfig

* @Description:

* @author guojuxing
* @param dto

* @return java.lang.Integer


*/
Integer saveActuallyPaidConfig(DataActuallyPaidConfigDTO dto);
/**
* @Title: listByEnterpriseId

* @Description:

* @author guojuxing
* @param enterpriseId

* @return java.util.List<com.gic.enterprise.entity.TabDataActuallyPaidConfig>


*/
List<TabDataActuallyPaidConfig> listByEnterpriseId(Integer enterpriseId);
/**
* 逻辑删除
* @Title: delete

* @Description:

* @author guojuxing
* @param enterpriseId
* @param classify

* @return int


*/
int delete(Integer enterpriseId, Integer classify);
}
package com.gic.enterprise.service;
import com.gic.enterprise.dto.data.DataMemberConsumeConfigDTO;
import com.gic.enterprise.entity.TabDataMemberConsumeConfig;
public interface DataMemberConsumeConfigService {
/**
* 新增会员消费配置
* @param dto
* @return
*/
Integer saveMemberConsumeConfig(DataMemberConsumeConfigDTO dto);
/**
* 更新配置信息
* @Title: editMemberConsumeConfig

* @Description:

* @author guojuxing
* @param dto

* @return void


*/
void editMemberConsumeConfig(DataMemberConsumeConfigDTO dto);
TabDataMemberConsumeConfig getByEnterpriseId(Integer enterpriseId);
}
package com.gic.enterprise.service;
import com.gic.enterprise.dto.data.DataWechatMemberConfigDTO;
import com.gic.enterprise.entity.TabDataWechatMemberConfig;
import java.util.List;
public interface DataWechatMemberConfigService {
/**
* 新增微信会员配置
* @Title: saveWechatMemberConfig

* @Description:

* @author guojuxing
* @param dto

* @return java.lang.Integer


*/
Integer saveWechatMemberConfig(DataWechatMemberConfigDTO dto);
/**
*
* @Title: getByMemberCardId

* @Description:

* @author guojuxing
* @param enterpriseId
* @param memberCardId
会员卡ID
* @return com.gic.enterprise.entity.TabDataWechatMemberConfig


*/
TabDataWechatMemberConfig getByMemberCardId(Integer enterpriseId, String memberCardId);
List<TabDataWechatMemberConfig> listByEnterpriseId(Integer enterpriseId);
}
......@@ -13,9 +13,11 @@ public interface PushMessageService {
int delete(Integer id);
Page<TabPushMessage> pagePushMesage(String search, Integer pushStatus, Date startTime, Date endTime, Integer pushClassifyId);
Page<TabPushMessage> pagePushMesage(String search, Integer pushStatus, Date startTime, Date endTime,
Integer pushClassifyId);
Page<UserMessageDTO> pageUserMessage(String search, Integer status, Date startTime, Date endTime, Integer pushClassifyId, Integer userId);
Page<UserMessageDTO> pageUserMessage(String search, Integer status, Date startTime, Date endTime,
Integer pushClassifyId, Integer userId, Integer pageNum, Integer pageSize);
int readCount(Integer messageId);
}
......@@ -16,4 +16,6 @@ public interface PushTypeService {
TabPushClassify getById(Integer id);
List<TabPushClassify> listPushTypeByName(String name);
boolean saveClassify(String classify);
}
package com.gic.enterprise.service;
import com.gic.enterprise.entity.TabPushUserMessage;
import java.util.Date;
public interface PushUserMessageService {
int save(Integer enterpriseId, Integer userId, Integer messageId, String classify, String title, String content);
int reCallMessage(Integer messageId);
int totalUserMessage(Integer userId, int status);
int totalUserMessage(Integer userId, String search, Integer status,
Date startTime, Date endTime, Integer pushClassifyId);
int readAll(Integer userId);
int readMessage(Integer messageId, Integer userId);
int readMessage(Integer messageId);
TabPushUserMessage getById(Integer id);
}
......@@ -58,6 +58,15 @@ public class CustomStoreServiceImpl implements CustomStoreService {
}
@Override
public int closeCustomStore(Integer customStoreId) {
TabCustomStore store = new TabCustomStore();
store.setCustomStoreId(customStoreId);
store.setStatus(2);
return this.tabCustomStoreMapper.updateByPrimaryKeySelective(store);
}
@Override
public TabCustomStore getCustomStore(Integer enterpriseId, String appid) {
List<TabCustomStore> list = this.tabCustomStoreMapper.getCustomStore(enterpriseId, appid);
if(CollectionUtils.isNotEmpty(list)){
......
......@@ -39,6 +39,6 @@ public class CustomThemeServiceImpl implements CustomThemeService {
if(CollectionUtils.isNotEmpty(list)){
return list.get(0).getTheme();
}
return 0;
return 1;
}
}
package com.gic.enterprise.service.impl;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.dao.mapper.TabDataActuallyPaidConfigMapper;
import com.gic.enterprise.dto.data.DataActuallyPaidConfigDTO;
import com.gic.enterprise.entity.TabDataActuallyPaidConfig;
import com.gic.enterprise.service.DataActuallyPaidConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
@Service("dataActuallyPaidConfigService")
public class DataActuallyPaidConfigServiceImpl implements DataActuallyPaidConfigService{
@Autowired
private TabDataActuallyPaidConfigMapper tabDataActuallyPaidConfigMapper;
@Override
public Integer saveActuallyPaidConfig(DataActuallyPaidConfigDTO dto) {
Date now = new Date();
dto.setCreateTime(now);
dto.setUpdateTime(now);
dto.setStatus(1);
TabDataActuallyPaidConfig record = EntityUtil.changeEntityNew(TabDataActuallyPaidConfig.class, dto);
tabDataActuallyPaidConfigMapper.insert(record);
return record.getActuallyPaidConfigId();
}
@Override
public List<TabDataActuallyPaidConfig> listByEnterpriseId(Integer enterpriseId) {
return tabDataActuallyPaidConfigMapper.listByEnterpriseId(enterpriseId);
}
@Override
public int delete(Integer enterpriseId, Integer classify) {
return tabDataActuallyPaidConfigMapper.delete(enterpriseId, classify);
}
}
package com.gic.enterprise.service.impl;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.dao.mapper.TabDataMemberConsumeConfigMapper;
import com.gic.enterprise.dto.data.DataMemberConsumeConfigDTO;
import com.gic.enterprise.entity.TabDataMemberConsumeConfig;
import com.gic.enterprise.service.DataMemberConsumeConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
@Service("dataMemberConsumeConfigService")
public class DataMemberConsumeConfigServiceImpl implements DataMemberConsumeConfigService{
@Autowired
private TabDataMemberConsumeConfigMapper tabDataMemberConsumeConfigMapper;
@Override
public Integer saveMemberConsumeConfig(DataMemberConsumeConfigDTO dto) {
Date now = new Date();
dto.setCreateTime(now);
dto.setUpdateTime(now);
dto.setStatus(1);
TabDataMemberConsumeConfig record = EntityUtil.changeEntityNew(TabDataMemberConsumeConfig.class, dto);
tabDataMemberConsumeConfigMapper.insertSelective(record);
return record.getMemberConsumeConfigId();
}
@Override
public void editMemberConsumeConfig(DataMemberConsumeConfigDTO dto) {
dto.setUpdateTime(new Date());
TabDataMemberConsumeConfig record = EntityUtil.changeEntityNew(TabDataMemberConsumeConfig.class, dto);
tabDataMemberConsumeConfigMapper.updateByPrimaryKeySelective(record);
}
@Override
public TabDataMemberConsumeConfig getByEnterpriseId(Integer enterpriseId) {
return tabDataMemberConsumeConfigMapper.getByEnterpriseId(enterpriseId);
}
}
package com.gic.enterprise.service.impl;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.dao.mapper.TabDataWechatMemberConfigMapper;
import com.gic.enterprise.dto.data.DataWechatMemberConfigDTO;
import com.gic.enterprise.entity.TabDataWechatMemberConfig;
import com.gic.enterprise.service.DataWechatMemberConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
@Service("dataWechatMemberConfigService")
public class DataWechatMemberConfigServiceImpl implements DataWechatMemberConfigService{
@Autowired
private TabDataWechatMemberConfigMapper tabDataWechatMemberConfigMapper;
@Override
public Integer saveWechatMemberConfig(DataWechatMemberConfigDTO dto) {
Date now = new Date();
dto.setCreateTime(now);
dto.setUpdateTime(now);
dto.setStatus(1);
TabDataWechatMemberConfig record = EntityUtil.changeEntityNew(TabDataWechatMemberConfig.class, dto);
tabDataWechatMemberConfigMapper.insert(record);
return record.getWechatMemberConfigId();
}
@Override
public TabDataWechatMemberConfig getByMemberCardId(Integer enterpriseId, String memberCardId) {
return tabDataWechatMemberConfigMapper.getByMemberCardId(enterpriseId, memberCardId);
}
@Override
public List<TabDataWechatMemberConfig> listByEnterpriseId(Integer enterpriseId) {
return tabDataWechatMemberConfigMapper.listByEnterpriseId(enterpriseId);
}
}
......@@ -51,6 +51,6 @@ public class HelpCenterServiceImpl implements HelpCenterService {
@Override
public Integer countHelpCenterByIsShow() {
return null;
return listHelpCenter().size();
}
}
......@@ -2,9 +2,12 @@ package com.gic.enterprise.service.impl;
import com.gic.enterprise.dao.mapper.TabPushMessageMapper;
import com.gic.enterprise.dto.UserMessageDTO;
import com.gic.enterprise.entity.TabPushClassify;
import com.gic.enterprise.entity.TabPushMessage;
import com.gic.enterprise.service.PushMessageService;
import com.gic.enterprise.service.PushTypeService;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -14,6 +17,8 @@ import java.util.Date;
public class PushMessageServiceImpl implements PushMessageService {
@Autowired
private TabPushMessageMapper tabPushMessageMapper;
@Autowired
private PushTypeService pushTypeService;
@Override
public int savePushMesasge(TabPushMessage tabPushMessage) {
......@@ -39,14 +44,17 @@ public class PushMessageServiceImpl implements PushMessageService {
}
@Override
public Page<TabPushMessage> pagePushMesage(String search, Integer pushStatus, Date startTime, Date endTime, Integer pushClassifyId) {
public Page<TabPushMessage> pagePushMesage(String search, Integer pushStatus, Date startTime, Date endTime,
Integer pushClassifyId) {
return this.tabPushMessageMapper.pagePushMesage(search, pushStatus, startTime, endTime, pushClassifyId);
}
@Override
public Page<UserMessageDTO> pageUserMessage(String search, Integer status, Date startTime, Date endTime,
Integer pushClassifyId, Integer userId) {
return this.tabPushMessageMapper.pageUserMessage(search, status, startTime, endTime, pushClassifyId, userId);
Integer pushClassifyId, Integer userId, Integer pageNum, Integer pageSize) {
TabPushClassify byId = this.pushTypeService.getById(pushClassifyId);
PageHelper.startPage(pageNum, pageSize);
return this.tabPushMessageMapper.pageUserMessage(search, status, startTime, endTime, byId == null ? null : byId.getClassifyName(), userId);
}
@Override
......
......@@ -4,6 +4,7 @@ import com.gic.enterprise.dao.mapper.TabPushClassifyMapper;
import com.gic.enterprise.entity.TabPushClassify;
import com.gic.enterprise.service.PushTypeService;
import com.github.pagehelper.Page;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -47,4 +48,18 @@ public class PushTypeServiceImpl implements PushTypeService {
public List<TabPushClassify> listPushTypeByName(String name) {
return this.tabPushClassifyMapper.listPushTypeByName(name);
}
@Override
public boolean saveClassify(String classify) {
List<TabPushClassify> list = this.listPushTypeByName(classify);
if(CollectionUtils.isNotEmpty(list)){
return true;
}else {
TabPushClassify tabPushType = new TabPushClassify();
tabPushType.setClassifyName(classify);
tabPushType.setClassifyDesc(classify);
this.savePushType(tabPushType);
}
return false;
}
}
package com.gic.enterprise.service.impl;
import com.gic.enterprise.dao.mapper.TabPushUserMessageMapper;
import com.gic.enterprise.entity.TabPushClassify;
import com.gic.enterprise.entity.TabPushUserMessage;
import com.gic.enterprise.service.PushTypeService;
import com.gic.enterprise.service.PushUserMessageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -13,6 +15,8 @@ import java.util.List;
public class PushUserMessageServiceImpl implements PushUserMessageService {
@Autowired
private TabPushUserMessageMapper tabPushUserMessageMapper;
@Autowired
private PushTypeService pushTypeService;
@Override
public int save(Integer enterpriseId, Integer userId, Integer messageId, String classify, String title, String content) {
......@@ -35,8 +39,10 @@ public class PushUserMessageServiceImpl implements PushUserMessageService {
}
@Override
public int totalUserMessage(Integer userId, int status) {
List<Integer> list = this.tabPushUserMessageMapper.totalUserMessage(userId, status);
public int totalUserMessage(Integer userId, String search, Integer status,
Date startTime, Date endTime, Integer pushClassifyId) {
TabPushClassify byId = this.pushTypeService.getById(pushClassifyId);
List<Integer> list = this.tabPushUserMessageMapper.totalUserMessage(search, status, startTime, endTime, byId == null ? null : byId.getClassifyName(), userId);
return list.get(0);
}
......@@ -46,7 +52,12 @@ public class PushUserMessageServiceImpl implements PushUserMessageService {
}
@Override
public int readMessage(Integer messageId, Integer userId) {
return this.tabPushUserMessageMapper.readMessage(messageId, userId);
public int readMessage(Integer messageId) {
return this.tabPushUserMessageMapper.readMessage(messageId);
}
@Override
public TabPushUserMessage getById(Integer id) {
return this.tabPushUserMessageMapper.selectByPrimaryKey(id);
}
}
......@@ -241,7 +241,7 @@ public class AuditLogApiServiceImpl implements AuditLogApiService {
String url = config.getHost() + "/damo-system/examine-logs";
String result = auditLogDTO.getAuditResult() == 1? "已通过" : "未通过";
String content = "您的操作"+ result +"审核,可以在<a href='"+url+"'>审核日志</a>查看到本次审核记录";
this.pushMessageApiService.pushUserMessage(auditLogDTO.getEnterpriseId(), auditLogDTO.getApplyUserId(),"审核通知", "审核结果", content);
this.pushMessageApiService.pushUserMessage(auditLogDTO.getEnterpriseId(), auditLogDTO.getApplyUserId(),"系统消息", "审核结果", content);
return EnterpriseServiceResponse.success();
}
......
......@@ -15,6 +15,7 @@ import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.response.EnterpriseServiceResponse;
import com.gic.enterprise.service.*;
import com.gic.redis.data.util.RedisUtil;
import org.apache.logging.log4j.core.pattern.AbstractStyleNameConverter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -25,6 +26,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@Service("billingAccountApiService")
public class BillingAccountApiServiceImpl implements BillingAccountApiService {
......@@ -206,11 +208,14 @@ public class BillingAccountApiServiceImpl implements BillingAccountApiService {
if (i > 0) {
TabBillingAccount account = this.billingAccountService.getByEnterpriseId(enterpriseId);
if(account.getAccountBalance() <= 0){
String content = "您的GIC商户余额已欠费"+(-account.getAccountBalance())+"元,为了不影响业务的开展,请及时<a href='"+config.getHost()+"cost-center/billing-center/recharge'>充值</a>";
this.pushMessageApiService.pushMessage(enterpriseId, "产品通知", "商户欠费", content);
// 待办事项
sendTotoItem(enterpriseId);
Object cache = RedisUtil.getCache("message:" + enterpriseId);
if(cache == null){
String content = "您的GIC商户余额已欠费"+(-account.getAccountBalance())+"元,为了不影响业务的开展,请及时<a href='"+config.getHost()+"cost-center/billing-center/recharge'>充值</a>";
this.pushMessageApiService.pushMessage(enterpriseId, "系统消息", "商户欠费", content);
// 待办事项
sendTotoItem(enterpriseId);
RedisUtil.setCache("message:" + enterpriseId, 1, 1l, TimeUnit.DAYS);
}
}
return ServiceResponse.success(i);
} else {
......
......@@ -53,6 +53,7 @@ public class CustomGuideApiServiceImpl implements CustomGuideApiService {
@Override
public ServiceResponse<List<CustomGuideDTO>> listGuide(Integer enterpriseId, Integer version, String appid) {
List<TabCustomGuide> list = this.customGuideService.listGuide(enterpriseId, version, appid);
log.info("导航数据:{}", JSON.toJSONString(list));
return ServiceResponse.success(EntityUtil.changeEntityListByJSON(CustomGuideDTO.class, list));
}
......
......@@ -65,6 +65,18 @@ public class CustomStoreApiServiceImpl implements CustomStoreApiService {
}
@Override
public ServiceResponse<Integer> closeCustomStore(Integer enterpriseId, String appid) {
int i = this.customStoreService.closeCustomStore(enterpriseId, appid);
return ServiceResponse.success(i);
}
@Override
public ServiceResponse<Integer> closeCustomStore(Integer customStoreId) {
int i = this.customStoreService.closeCustomStore(customStoreId);
return ServiceResponse.success(i);
}
@Override
public ServiceResponse<CustomStoreDTO> getCustomStore(Integer enterpriseId, String appid) {
TabCustomStore customStore = this.customStoreService.getCustomStore(enterpriseId, appid);
return ServiceResponse.success(EntityUtil.changeEntityByJSON(CustomStoreDTO.class, customStore));
......
package com.gic.enterprise.service.outer.impl;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.dto.data.DataActuallyPaidConfigDTO;
import com.gic.enterprise.dto.data.DataMemberConsumeConfigDTO;
import com.gic.enterprise.entity.TabDataActuallyPaidConfig;
import com.gic.enterprise.entity.TabDataMemberConsumeConfig;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.service.DataActuallyPaidConfigService;
import com.gic.enterprise.service.DataConfigApiService;
import com.gic.enterprise.service.DataMemberConsumeConfigService;
import com.gic.enterprise.service.DataWechatMemberConfigService;
@Service("dataConfigApiService")
public class DataConfigApiServiceImpl implements DataConfigApiService {
@Autowired
private DataMemberConsumeConfigService dataMemberConsumeConfigService;
@Autowired
private DataWechatMemberConfigService dataWechatMemberConfigService;
@Autowired
private DataActuallyPaidConfigService dataActuallyPaidConfigService;
@Override
public ServiceResponse<Integer> configMemberConsume(DataMemberConsumeConfigDTO dto) {
if (dto.getEnterpriseId() == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "商户ID不能为空");
}
TabDataMemberConsumeConfig record = dataMemberConsumeConfigService.getByEnterpriseId(dto.getEnterpriseId());
if (record == null) {
//还未配置,新增
return ServiceResponse.success(dataMemberConsumeConfigService.saveMemberConsumeConfig(dto));
}
dto.setMemberConsumeConfigId(record.getMemberConsumeConfigId());
dataMemberConsumeConfigService.editMemberConsumeConfig(dto);
return ServiceResponse.success(record.getMemberConsumeConfigId());
}
@Override
public ServiceResponse<DataMemberConsumeConfigDTO> getMemberConsumeConfigByEnterpriseId(Integer enterpriseId) {
TabDataMemberConsumeConfig record = dataMemberConsumeConfigService.getByEnterpriseId(enterpriseId);
if (record == null) {
//还未配置,新增
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "还未配置会员消费规则");
}
return ServiceResponse.success(EntityUtil.changeEntityNew(DataMemberConsumeConfigDTO.class, record));
}
@Override
public ServiceResponse<Void> configActuallyPaid(List<DataActuallyPaidConfigDTO> dtoList) {
if (CollectionUtils.isEmpty(dtoList)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "实付配置内容为空");
}
for (DataActuallyPaidConfigDTO dto : dtoList) {
if (dto.getClassify() == null) {
dto.setClassify(1);
}
dataActuallyPaidConfigService.delete(dto.getEnterpriseId(), dto.getClassify());
dto.setConfigStatus(Optional.ofNullable(dto.getConfigStatus()).orElse(0));
dataActuallyPaidConfigService.saveActuallyPaidConfig(dto);
}
return ServiceResponse.success();
}
@Override
public ServiceResponse<List<DataActuallyPaidConfigDTO>> listActuallyPaidConfig(Integer enterpriseId) {
List<TabDataActuallyPaidConfig> list = dataActuallyPaidConfigService.listByEnterpriseId(enterpriseId);
if (CollectionUtils.isEmpty(list)) {
//如果没有配置,默认数据
return ServiceResponse.success(EntityUtil.changeEntityListNew(DataActuallyPaidConfigDTO.class,
dataActuallyPaidConfigService.listByEnterpriseId(-1)));
}
return ServiceResponse.success(EntityUtil.changeEntityListNew(DataActuallyPaidConfigDTO.class, list));
}
@Override
public ServiceResponse<Void> initActuallyPaidData(Integer enterpriseId) {
List<TabDataActuallyPaidConfig> list = dataActuallyPaidConfigService.listByEnterpriseId(-1);
list = list
.stream()
.map(e -> e.setEnterpriseId(enterpriseId))
.map(e -> e.setActuallyPaidConfigId(null))
.collect(Collectors.toList());
configActuallyPaid(EntityUtil.changeEntityListNew(DataActuallyPaidConfigDTO.class, list));
return ServiceResponse.success();
}
}
......@@ -97,8 +97,8 @@ public class DownloadReportApiServiceImpl implements DownloadReportApiService {
TabDownloadReport downloadReport = this.downloadReportService.getById(downloadReportId);
if(downloadReport != null){
String url = config.getHost() + "damo-system/report-list";
String content = "您的"+ downloadReport.getDataContent() +"已生成,请前往<a href='"+ url +"'>下载中心</a>查看";
this.pushMessageApiService.pushUserMessage(downloadReport.getEnterpriseId(), downloadReport.getApplyUserId(), "下载通知", "下载通知", content);
String content = "您的"+ downloadReport.getDataContent() +"已生成,请前往<a href='"+ url +"' style='color:#2f54ed'>下载中心</a>查看";
this.pushMessageApiService.pushUserMessage(downloadReport.getEnterpriseId(), downloadReport.getApplyUserId(), "系统消息", "下载通知", content);
}
return EnterpriseServiceResponse.success(line);
}
......
......@@ -83,6 +83,8 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
private BusinessFrontResApiService businessFrontResApiService;
@Autowired
private PushMessageApiService pushMessageApiService;
@Autowired
private DataConfigApiService dataConfigApiService;
@Override
@Transactional(rollbackFor = Exception.class)
......@@ -142,6 +144,9 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
//初始化计费中心账户
billingAccountService.createBillingAccount(enterpriseId);
//数据配置:实付配置默认数据
dataConfigApiService.initActuallyPaidData(enterpriseId);
UserDTO userDTO = EntityUtil.changeEntityNew(UserDTO.class, enterpriseDTO);
//新增超级管理员
userDTO.setEnterpriseId(enterpriseId);
......@@ -567,7 +572,7 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
Date auditTime = enterpriseDTO.getAuditTime();
long days = (sdf.parse(sdf.format(auditTime)).getTime() - sdf.parse(sdf.format(now)).getTime())/(1000 * 60 * 60 * 24);
if(days <= 7){
this.pushMessageApiService.pushMessage(enterpriseDTO.getEnterpriseId(), "产品通知",
this.pushMessageApiService.pushMessage(enterpriseDTO.getEnterpriseId(), "系统消息",
"GIC版本即将过期", "您的GIC版本即将在"+ days +"天到期,为了不影响业务的开展,请及时续费");
}
}catch (Exception e){
......
......@@ -6,6 +6,7 @@ import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.PageHelperUtils;
import com.gic.enterprise.dto.HelpCenterDTO;
import com.gic.enterprise.entity.TabHelpCenter;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.service.HelpCenterApiService;
import com.gic.enterprise.service.HelpCenterService;
import com.github.pagehelper.PageHelper;
......@@ -38,6 +39,12 @@ public class HelpCenterApiServiceImpl implements HelpCenterApiService {
tabHelpCenter.setIsShow(0);
}
}
if(tabHelpCenter.getIsShow() == 1){
Integer integer = this.helpCenterService.countHelpCenterByIsShow();
if(integer >=5){
return ServiceResponse.failure(ErrorCode.SYSTEM_ERROR.getCode(), "显示数量超过5个了");
}
}
Integer i = this.helpCenterService.saveHelpCenter(tabHelpCenter);
return ServiceResponse.success(i);
}
......
......@@ -14,6 +14,7 @@ import com.gic.enterprise.dto.PushTypeDTO;
import com.gic.enterprise.dto.UserMessageDTO;
import com.gic.enterprise.entity.TabPushClassify;
import com.gic.enterprise.entity.TabPushMessage;
import com.gic.enterprise.entity.TabPushUserMessage;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.service.*;
import com.gic.mq.sdk.GicMQClient;
......@@ -147,9 +148,8 @@ public class PushMessageApiServiceImpl implements PushMessageApiService {
public ServiceResponse<Page<UserMessageDTO>> pageUserMessage(Integer userId, String search, Integer status,
Date startTime, Date endTime, Integer pushClassifyId,
Integer pageNum, Integer pageSize) {
PageHelper.startPage(pageNum, pageSize);
com.github.pagehelper.Page<UserMessageDTO> page = this.pushMessageService.pageUserMessage(search, status,
startTime, endTime, pushClassifyId, userId);
startTime, endTime, pushClassifyId, userId, pageNum, pageSize);
Page<UserMessageDTO> userMessageDTOPage = PageHelperUtils.changePageHelperToCurrentPage(page);
return ServiceResponse.success(userMessageDTOPage);
}
......@@ -165,8 +165,9 @@ public class PushMessageApiServiceImpl implements PushMessageApiService {
}
@Override
public ServiceResponse<Integer> totalUserMessage(Integer userId, Integer status) {
return ServiceResponse.success(this.pushUserMessageService.totalUserMessage(userId, status));
public ServiceResponse<Integer> totalUserMessage(Integer userId, String search, Integer status,
Date startTime, Date endTime, Integer pushClassifyId) {
return ServiceResponse.success(this.pushUserMessageService.totalUserMessage(userId, search, status, startTime, endTime, pushClassifyId));
}
@Override
......@@ -175,6 +176,7 @@ public class PushMessageApiServiceImpl implements PushMessageApiService {
if(enterpriseId == null || userId == null || StringUtils.isBlank(title) || StringUtils.isBlank(content)){
return ServiceResponse.failure(ErrorCode.MISS_PARAMETER.getCode(), ErrorCode.MISS_PARAMETER.getErrorMsg());
}
this.pushTypeService.saveClassify(classify);
int i = this.pushUserMessageService.save(enterpriseId, userId, null, classify, title, content);
if(i > 0){
return ServiceResponse.success(i);
......@@ -201,8 +203,8 @@ public class PushMessageApiServiceImpl implements PushMessageApiService {
}
@Override
public ServiceResponse<Integer> readMessage(Integer messageId, Integer userId) {
int i = this.pushUserMessageService.readMessage(messageId, userId);
public ServiceResponse<Integer> readMessage(Integer messageId) {
int i = this.pushUserMessageService.readMessage(messageId);
if(i > 0){
this.pushMessageService.readCount(messageId);
}
......@@ -225,6 +227,12 @@ public class PushMessageApiServiceImpl implements PushMessageApiService {
}
@Override
public ServiceResponse<UserMessageDTO> getUserMessageDetail(Integer messageId){
TabPushUserMessage message = this.pushUserMessageService.getById(messageId);
return ServiceResponse.success(EntityUtil.changeEntityByJSON(UserMessageDTO.class, message));
}
@Override
public ServiceResponse<Integer> deletePushMessage(Integer messageId) {
int i = this.pushMessageService.delete(messageId);
return ServiceResponse.success(i);
......
......@@ -113,7 +113,7 @@ public class WxPayStrategy implements PayStrategy {
case 1:
// 商户余额充值
billingRechargeRecordService.updateBySerialNumber(resData.getEnterpriseId(), billingPayInfo.getOrderSerialNumber(), resData.getTotalFeePaid(), resData.getTotalFeePaid(), BillingAuditStatusEnum.PASS.getCode(), resData.getTimeEnd());
this.pushMessageApiService.pushMessage(resData.getEnterpriseId(), "产品通知", "余额充值", "您的商户成功充值"+resData.getTotalFeePaid()+"元!感谢您的支持和使用!");
this.pushMessageApiService.pushMessage(resData.getEnterpriseId(), "系统通知", "余额充值", "您的商户成功充值"+resData.getTotalFeePaid()+"元!感谢您的支持和使用!");
break;
case 2:
// 短信套餐包购买
......
......@@ -126,6 +126,8 @@
<dubbo:service interface="com.gic.enterprise.service.WmStoreApiService" ref="wmStoreApiService" timeout="6000" />
<dubbo:service interface="com.gic.enterprise.service.DataConfigApiService" ref="dataConfigApiService" timeout="6000" />
<dubbo:reference interface="com.gic.mall.share.api.service.ShopApiService" id="shopApiService" timeout="6000" />
......
......@@ -143,7 +143,7 @@
select
<include refid="Base_Column_List" />
from tab_custom_store
where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and status=1
where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and (status=1 or status=2)
<if test="appid != null and appid != ''">
and appid= #{appid}
</if>
......@@ -155,7 +155,7 @@
update tab_custom_store
set status = 2
where enterprise_id = #{enterpriseId,jdbcType=INTEGER}
and appid = #{appid,jdbcType=VARCHAR}
and appid = #{appid,jdbcType=VARCHAR} and status=1
</update>
<select id="getCustomStore" resultMap="BaseResultMap">
select
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gic.enterprise.dao.mapper.TabDataActuallyPaidConfigMapper">
<resultMap id="BaseResultMap" type="com.gic.enterprise.entity.TabDataActuallyPaidConfig">
<id column="actually_paid_config_id" jdbcType="INTEGER" property="actuallyPaidConfigId" />
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="classify" jdbcType="INTEGER" property="classify" />
<result column="config_status" jdbcType="INTEGER" property="configStatus" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
actually_paid_config_id, enterprise_id, classify, config_status, status, create_time,
update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_data_actually_paid_config
where actually_paid_config_id = #{actuallyPaidConfigId,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from tab_data_actually_paid_config
where actually_paid_config_id = #{actuallyPaidConfigId,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.gic.enterprise.entity.TabDataActuallyPaidConfig" useGeneratedKeys="true" keyProperty="actuallyPaidConfigId">
insert into tab_data_actually_paid_config (actually_paid_config_id, enterprise_id,
classify, config_status, status,
create_time, update_time)
values (#{actuallyPaidConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER},
#{classify,jdbcType=INTEGER}, #{configStatus,jdbcType=INTEGER}, #{status,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabDataActuallyPaidConfig">
insert into tab_data_actually_paid_config
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="actuallyPaidConfigId != null">
actually_paid_config_id,
</if>
<if test="enterpriseId != null">
enterprise_id,
</if>
<if test="classify != null">
classify,
</if>
<if test="configStatus != null">
config_status,
</if>
<if test="status != null">
status,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="actuallyPaidConfigId != null">
#{actuallyPaidConfigId,jdbcType=INTEGER},
</if>
<if test="enterpriseId != null">
#{enterpriseId,jdbcType=INTEGER},
</if>
<if test="classify != null">
#{classify,jdbcType=INTEGER},
</if>
<if test="configStatus != null">
#{configStatus,jdbcType=INTEGER},
</if>
<if test="status != null">
#{status,jdbcType=INTEGER},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.enterprise.entity.TabDataActuallyPaidConfig">
update tab_data_actually_paid_config
<set>
<if test="enterpriseId != null">
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
</if>
<if test="classify != null">
classify = #{classify,jdbcType=INTEGER},
</if>
<if test="configStatus != null">
config_status = #{configStatus,jdbcType=INTEGER},
</if>
<if test="status != null">
status = #{status,jdbcType=INTEGER},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
</set>
where actually_paid_config_id = #{actuallyPaidConfigId,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabDataActuallyPaidConfig">
update tab_data_actually_paid_config
set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
classify = #{classify,jdbcType=INTEGER},
config_status = #{configStatus,jdbcType=INTEGER},
status = #{status,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where actually_paid_config_id = #{actuallyPaidConfigId,jdbcType=INTEGER}
</update>
<select id="listByEnterpriseId" resultMap="BaseResultMap">
select <include refid="Base_Column_List"></include>
from tab_data_actually_paid_config
where enterprise_id = #{enterpriseId}
and status = 1
order by classify
</select>
<update id="delete">
update tab_data_actually_paid_config set status = 0
where enterprise_id = #{enterpriseId}
and classify = #{classify}
and status = 1
</update>
</mapper>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gic.enterprise.dao.mapper.TabDataMemberConsumeConfigMapper">
<resultMap id="BaseResultMap" type="com.gic.enterprise.entity.TabDataMemberConsumeConfig">
<id column="member_consume_config_id" jdbcType="INTEGER" property="memberConsumeConfigId" />
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="member_consume_count" jdbcType="INTEGER" property="memberConsumeCount" />
<result column="member_consume_max" jdbcType="INTEGER" property="memberConsumeMax" />
<result column="member_consume_times" jdbcType="INTEGER" property="memberConsumeTimes" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
member_consume_config_id, enterprise_id, member_consume_count, member_consume_max,
member_consume_times, status, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_data_member_consume_config
where member_consume_config_id = #{memberConsumeConfigId,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from tab_data_member_consume_config
where member_consume_config_id = #{memberConsumeConfigId,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.gic.enterprise.entity.TabDataMemberConsumeConfig">
insert into tab_data_member_consume_config (member_consume_config_id, enterprise_id,
member_consume_count, member_consume_max, member_consume_times,
status, create_time, update_time
)
values (#{memberConsumeConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER},
#{memberConsumeCount,jdbcType=INTEGER}, #{memberConsumeMax,jdbcType=INTEGER}, #{memberConsumeTimes,jdbcType=INTEGER},
#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
)
</insert>
<insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabDataMemberConsumeConfig" useGeneratedKeys="true" keyProperty="memberConsumeConfigId">
insert into tab_data_member_consume_config
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="memberConsumeConfigId != null">
member_consume_config_id,
</if>
<if test="enterpriseId != null">
enterprise_id,
</if>
<if test="memberConsumeCount != null">
member_consume_count,
</if>
<if test="memberConsumeMax != null">
member_consume_max,
</if>
<if test="memberConsumeTimes != null">
member_consume_times,
</if>
<if test="status != null">
status,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="memberConsumeConfigId != null">
#{memberConsumeConfigId,jdbcType=INTEGER},
</if>
<if test="enterpriseId != null">
#{enterpriseId,jdbcType=INTEGER},
</if>
<if test="memberConsumeCount != null">
#{memberConsumeCount,jdbcType=INTEGER},
</if>
<if test="memberConsumeMax != null">
#{memberConsumeMax,jdbcType=INTEGER},
</if>
<if test="memberConsumeTimes != null">
#{memberConsumeTimes,jdbcType=INTEGER},
</if>
<if test="status != null">
#{status,jdbcType=INTEGER},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.enterprise.entity.TabDataMemberConsumeConfig">
update tab_data_member_consume_config
<set>
<if test="enterpriseId != null">
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
</if>
<if test="memberConsumeCount != null">
member_consume_count = #{memberConsumeCount,jdbcType=INTEGER},
</if>
<if test="memberConsumeMax != null">
member_consume_max = #{memberConsumeMax,jdbcType=INTEGER},
</if>
<if test="memberConsumeTimes != null">
member_consume_times = #{memberConsumeTimes,jdbcType=INTEGER},
</if>
<if test="status != null">
status = #{status,jdbcType=INTEGER},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
</set>
where member_consume_config_id = #{memberConsumeConfigId,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabDataMemberConsumeConfig">
update tab_data_member_consume_config
set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
member_consume_count = #{memberConsumeCount,jdbcType=INTEGER},
member_consume_max = #{memberConsumeMax,jdbcType=INTEGER},
member_consume_times = #{memberConsumeTimes,jdbcType=INTEGER},
status = #{status,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where member_consume_config_id = #{memberConsumeConfigId,jdbcType=INTEGER}
</update>
<select id="getByEnterpriseId" resultMap="BaseResultMap">
select <include refid="Base_Column_List"></include>
from tab_data_member_consume_config
where status = 1
and enterprise_id = #{enterpriseId}
</select>
</mapper>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gic.enterprise.dao.mapper.TabDataWechatMemberConfigMapper">
<resultMap id="BaseResultMap" type="com.gic.enterprise.entity.TabDataWechatMemberConfig">
<id column="wechat_member_config_id" jdbcType="INTEGER" property="wechatMemberConfigId" />
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="member_card_area" jdbcType="VARCHAR" property="memberCardArea" />
<result column="relate_service" jdbcType="VARCHAR" property="relateService" />
<result column="relate_wechat" jdbcType="VARCHAR" property="relateWechat" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
wechat_member_config_id, enterprise_id, member_card_area, relate_service, relate_wechat,
status, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_data_wechat_member_config
where wechat_member_config_id = #{wechatMemberConfigId,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from tab_data_wechat_member_config
where wechat_member_config_id = #{wechatMemberConfigId,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.gic.enterprise.entity.TabDataWechatMemberConfig" useGeneratedKeys="true" keyProperty="wechatMemberConfigId">
insert into tab_data_wechat_member_config (wechat_member_config_id, enterprise_id,
member_card_area, relate_service, relate_wechat,
status, create_time, update_time
)
values (#{wechatMemberConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER},
#{memberCardArea,jdbcType=VARCHAR}, #{relateService,jdbcType=VARCHAR}, #{relateWechat,jdbcType=VARCHAR},
#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
)
</insert>
<insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabDataWechatMemberConfig">
insert into tab_data_wechat_member_config
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="wechatMemberConfigId != null">
wechat_member_config_id,
</if>
<if test="enterpriseId != null">
enterprise_id,
</if>
<if test="memberCardArea != null">
member_card_area,
</if>
<if test="relateService != null">
relate_service,
</if>
<if test="relateWechat != null">
relate_wechat,
</if>
<if test="status != null">
status,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="wechatMemberConfigId != null">
#{wechatMemberConfigId,jdbcType=INTEGER},
</if>
<if test="enterpriseId != null">
#{enterpriseId,jdbcType=INTEGER},
</if>
<if test="memberCardArea != null">
#{memberCardArea,jdbcType=VARCHAR},
</if>
<if test="relateService != null">
#{relateService,jdbcType=VARCHAR},
</if>
<if test="relateWechat != null">
#{relateWechat,jdbcType=VARCHAR},
</if>
<if test="status != null">
#{status,jdbcType=INTEGER},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.enterprise.entity.TabDataWechatMemberConfig">
update tab_data_wechat_member_config
<set>
<if test="enterpriseId != null">
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
</if>
<if test="memberCardArea != null">
member_card_area = #{memberCardArea,jdbcType=VARCHAR},
</if>
<if test="relateService != null">
relate_service = #{relateService,jdbcType=VARCHAR},
</if>
<if test="relateWechat != null">
relate_wechat = #{relateWechat,jdbcType=VARCHAR},
</if>
<if test="status != null">
status = #{status,jdbcType=INTEGER},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
</set>
where wechat_member_config_id = #{wechatMemberConfigId,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabDataWechatMemberConfig">
update tab_data_wechat_member_config
set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
member_card_area = #{memberCardArea,jdbcType=VARCHAR},
relate_service = #{relateService,jdbcType=VARCHAR},
relate_wechat = #{relateWechat,jdbcType=VARCHAR},
status = #{status,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where wechat_member_config_id = #{wechatMemberConfigId,jdbcType=INTEGER}
</update>
<select id="getByMemberCardId" resultMap="BaseResultMap">
select <include refid="Base_Column_List"></include>
from tab_data_wechat_member_config
where enterprise_id = #{enterpriseId}
and member_card_area = #{memberCardId}
and status = 1
</select>
<select id="listByEnterpriseId" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List"></include>
from tab_data_wechat_member_config
where enterprise_id = #{enterpriseId}
and status = 1
order by create_time desc
</select>
</mapper>
\ No newline at end of file
......@@ -20,8 +20,8 @@
<result column="push_status" jdbcType="INTEGER" property="pushStatus" />
</resultMap>
<resultMap id="userMessageResult" type="com.gic.enterprise.dto.UserMessageDTO">
<id column="message_id" jdbcType="INTEGER" property="messageId" />
<result column="classify" jdbcType="VARCHAR" property="classifyName" />
<id column="id" jdbcType="INTEGER" property="messageId" />
<result column="classify" jdbcType="VARCHAR" property="classify" />
<result column="title" jdbcType="VARCHAR" property="title" />
<result column="content" jdbcType="VARCHAR" property="content" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
......@@ -260,7 +260,7 @@
</select>
<select id="pageUserMessage" resultMap="userMessageResult">
select
t1.classify,t1.title,t1.content,t1.message_id,t1.create_time,t1.status, t3.sign
t1.classify,t1.title,t1.content,t1.id,t1.create_time,t1.status, t3.sign
from tab_push_user_message t1 left join tab_push_message t3 on t1.message_id = t3.message_id
where t1.user_id=#{userId}
and (t1.status = 1 or t1.status = 2)
......@@ -276,8 +276,8 @@
<if test="endTime != null">
and (t1.create_time &lt;= #{endTime})
</if>
<if test="pushClassifyId != null">
and t3.push_classify_id = #{pushClassifyId}
<if test="classify != null and classify !=''">
and t1.classify = #{classify}
</if>
order by t1.status asc,t1.create_time desc
</select>
......
......@@ -156,10 +156,25 @@
where message_id = #{messageId,jdbcType=INTEGER} and status!=0
</update>
<select id="totalUserMessage" resultType="integer">
select
count(1)
from tab_push_user_message
where user_id=#{userId} and status = #{status}
select count(1)
from tab_push_user_message t1 left join tab_push_message t3 on t1.message_id = t3.message_id
where t1.user_id=#{userId}
and (t1.status = 1 or t1.status = 2)
<if test="search != null and search != ''">
and (t1.title like concat('%', #{search}, '%') or t1.content like concat('%', #{search}, '%'))
</if>
<if test="status != null">
and t1.status = #{status}
</if>
<if test="startTime != null">
and (t1.create_time &gt;= #{startTime})
</if>
<if test="endTime != null">
and (t1.create_time &lt;= #{endTime})
</if>
<if test="classify != null and classify !=''">
and t1.classify = #{classify}
</if>
</select>
<update id="readAll">
update tab_push_user_message
......@@ -169,6 +184,6 @@
<update id="readMessage">
update tab_push_user_message
set status=2
where user_id = #{userId,jdbcType=INTEGER} and status=1 and message_id=#{messageId}
where status=1 and id=#{messageId}
</update>
</mapper>
\ No newline at end of file
......@@ -35,6 +35,7 @@ public class CustomStoreController {
dto.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
dto.setStoreWidgetId(customStoreQO.getStorewidgetId());
if(customStoreQO.getSaveType() == 2){
this.customStoreApiService.closeCustomStore(UserDetailUtils.getUserDetail().getEnterpriseId(), customStoreQO.getAppId());
dto.setStatus(1);
}else {
if(customStoreQO.getCustomStoreId() == null){
......@@ -86,8 +87,14 @@ public class CustomStoreController {
}
@RequestMapping("open-custom-store")
public RestResponse updateCustomStoreStatus(Integer customStoreId, String appId){
this.customStoreApiService.openCustomStore(UserDetailUtils.getUserDetail().getEnterpriseId(), appId, customStoreId);
public RestResponse updateCustomStoreStatus(Integer customStoreId, String appid){
this.customStoreApiService.openCustomStore(UserDetailUtils.getUserDetail().getEnterpriseId(), appid, customStoreId);
return RestResponse.success();
}
@RequestMapping("close-custom-store")
public RestResponse updateCustomStoreStatus(Integer customStoreId){
this.customStoreApiService.closeCustomStore(customStoreId);
return RestResponse.success();
}
}
package com.gic.enterprise.web.controller;
import com.alibaba.fastjson.JSON;
import com.gic.commons.util.StringUtil;
import com.gic.enterprise.dto.data.DataActuallyPaidConfigDTO;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.web.vo.data.ActuallyPaidConfigVO;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.download.utils.OperationResultUtils;
import com.gic.enterprise.dto.data.DataMemberConsumeConfigDTO;
import com.gic.enterprise.service.DataConfigApiService;
import com.gic.enterprise.utils.ResultControllerUtils;
import com.gic.enterprise.utils.UserDetailUtils;
import java.util.List;
import java.util.stream.Collectors;
@RestController
@RequestMapping("/data-config")
public class DataConfigController {
private final static Logger LOGGER = LogManager.getLogger(DataConfigController.class);
@Autowired
private DataConfigApiService dataConfigApiService;
@RequestMapping("/config-member-consume")
public RestResponse configMemberConsume(DataMemberConsumeConfigDTO dto) {
dto.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
return OperationResultUtils.operationResult(dataConfigApiService.configMemberConsume(dto),
OperationResultUtils.LOG_EDIT + "数据统计配置-会员消费配置",
UserDetailUtils.getUserDetail().getEnterpriseInfo().getEnterpriseName());
}
@RequestMapping("/get-member-consume-config")
public RestResponse getMemberConsumeConfig() {
return ResultControllerUtils.commonResult(dataConfigApiService
.getMemberConsumeConfigByEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId()));
}
@RequestMapping("/config-actually-paid")
public RestResponse configActuallyPaid(String jsonArr) {
if (StringUtil.isBlank(jsonArr)) {
return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "实付配置内容为空");
}
Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
List<DataActuallyPaidConfigDTO> dtoList = JSON.parseArray(jsonArr, DataActuallyPaidConfigDTO.class);
dtoList = dtoList
.stream()
.map(e -> e.setEnterpriseId(enterpriseId))
.collect(Collectors.toList());
return OperationResultUtils.operationResult(dataConfigApiService.configActuallyPaid(dtoList),
OperationResultUtils.LOG_EDIT + "数据统计配置-实付配置",
UserDetailUtils.getUserDetail().getEnterpriseInfo().getEnterpriseName());
}
@RequestMapping("/get-actually-paid-config")
public RestResponse getActuallyPaidConfig() {
return ResultControllerUtils.commonResult(dataConfigApiService
.listActuallyPaidConfig(UserDetailUtils.getUserDetail().getEnterpriseId()), ActuallyPaidConfigVO.class);
}
}
......@@ -59,7 +59,8 @@ public class IndexModuleController {
try {
ServiceResponse<Page<UserMessageDTO>> response = this.pushMessageApiService.pageUserMessage(userId, search, status, StringUtils.isBlank(startTime) ? null : sdf.parse(startTime+" 00:00:00"),
StringUtils.isBlank(endTime) ? null : sdf.parse(endTime+" 23:59:59"), pushClassifyId, pageQO.getCurrentPage(), pageQO.getPageSize());
ServiceResponse<Integer> unReadResponse = this.pushMessageApiService.totalUserMessage(UserDetailUtils.getUserDetail().getUserId(), 1);
ServiceResponse<Integer> unReadResponse = this.pushMessageApiService.totalUserMessage(userId, search, 1, StringUtils.isBlank(startTime) ? null : sdf.parse(startTime+" 00:00:00"),
StringUtils.isBlank(endTime) ? null : sdf.parse(endTime+" 23:59:59"), pushClassifyId);
Map<String, Object> result = new HashMap<>();
result.put("page", response.getResult());
result.put("unReadCount", unReadResponse.getResult());
......@@ -72,7 +73,8 @@ public class IndexModuleController {
@RequestMapping("total-message")
public RestResponse totalMessage(){
ServiceResponse<Integer> response = this.pushMessageApiService.totalUserMessage(UserDetailUtils.getUserDetail().getUserId(), 1);
ServiceResponse<Integer> response = this.pushMessageApiService.totalUserMessage(UserDetailUtils.getUserDetail().getUserId(), null, null, null,
null, null);
return RestResponse.success(response.getResult());
}
......@@ -84,9 +86,9 @@ public class IndexModuleController {
@RequestMapping("message-detail")
public RestResponse messageDetail(Integer messageId){
ServiceResponse<PushMessageDTO> response = this.pushMessageApiService.getPushMessageById(messageId);
this.pushMessageApiService.readMessage(messageId, UserDetailUtils.getUserDetail().getUserId());
return RestResponse.success(response.getResult());
ServiceResponse<UserMessageDTO> userMessageDetail = this.pushMessageApiService.getUserMessageDetail(messageId);
this.pushMessageApiService.readMessage(messageId);
return RestResponse.success(userMessageDetail.getResult());
}
@RequestMapping("message-classify")
......
......@@ -38,4 +38,12 @@ public class CustomStoreVO {
public void setAppType(Integer appType) {
this.appType = appType;
}
public Integer getStoreWidgetId() {
return storeWidgetId;
}
public void setStoreWidgetId(Integer storeWidgetId) {
this.storeWidgetId = storeWidgetId;
}
}
package com.gic.enterprise.web.vo.data;
import java.io.Serializable;
/**
* 实付配置
* @ClassName: ActuallyPaidConfigVO

* @Description: 

* @author guojuxing

* @date 2020/4/20 9:36 AM

*/
public class ActuallyPaidConfigVO implements Serializable{
private static final long serialVersionUID = -8440208273270132555L;
/**
* 1:会员业务(积分计算)2:会员业务(等级升降条件(如单笔消费满XX元、当天消费满XX元)3:基础业绩 4:会员消费 5:单效
*/
private Integer classify;
/**
* 1:已配置 默认全关,走应付流程
*/
private Integer configStatus;
public Integer getClassify() {
return classify;
}
public ActuallyPaidConfigVO setClassify(Integer classify) {
this.classify = classify;
return this;
}
public Integer getConfigStatus() {
return configStatus;
}
public ActuallyPaidConfigVO setConfigStatus(Integer configStatus) {
this.configStatus = configStatus;
return this;
}
}
......@@ -112,6 +112,7 @@
<dubbo:reference interface="com.gic.enterprise.service.ProjectItemApiService" id="projectItemApiService" timeout="6000"/>
<dubbo:reference interface="com.gic.enterprise.service.WmStoreApiService" id="wmStoreApiService" timeout="6000"/>
<dubbo:reference interface="com.gic.enterprise.service.DataConfigApiService" id="dataConfigApiService" timeout="6000"/>
<dubbo:reference interface="com.gic.marketing.api.service.coupon.CouponShelfApiService" id="couponShelfApiService" timeout="6000"/>
......
......@@ -5,6 +5,7 @@ import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.enterprise.dto.HelpCenterDTO;
import com.gic.enterprise.response.EnterpriseRestResponse;
import com.gic.enterprise.service.HelpCenterApiService;
import com.gic.operation.web.qo.PageQO;
import com.gic.operation.web.vo.HelpCenterVO;
......@@ -27,7 +28,10 @@ public class HelpCenterController {
@RequestMapping("save-help-center")
public RestResponse saveHelpCenter(HelpCenterVO vo){
ServiceResponse<Integer> response = this.helpCenterApiService.saveHelpCenter(EntityUtil.changeEntityByJSON(HelpCenterDTO.class, vo));
return RestResponse.success(response.getResult());
if(response.isSuccess()){
return RestResponse.success();
}
return EnterpriseRestResponse.failure(response);
}
@RequestMapping("help-center-detail")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment