Skip to content

G
gic-platform-enterprise
Commit 63c101ac by 陶光胜
Options

Merge branch 'developer' into 'master' 

Developer

See merge request !24
parents 28859562 e6a307a8
Showing with 545 additions and 79 deletions
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/constant/WechatServiceFieldEnum.java 0 → 100644
package com.gic.enterprise.constant;
/**
* 小程序客服页面udesk的系统字段
* @ClassName: WechatServiceFieldEnum

* @Description: 

* @author guojuxing

* @date 2020/7/20 4:04 PM

*/
public enum WechatServiceFieldEnum {
NAME(1, "姓名", 1),
GENDER(2, "性别", 1),
PHONE(3, "手机号码", 1),
AGE(4, "年龄", 1),
BIRTHDAY(5, "生日",1 ),
CITY(6, "常驻城市", 1),
USER_INFO(7, "用户信息", 1),
LAST_CONSUME_TIME(8, "最近消费时间", 1),
MEMBER_CARD(9, "会员卡号", 2),
MEMBER_GRADE(10, "会员卡等级", 2),
INTEGRAL_BALANCE(11, "积分余额", 2),
ORDER_NUM(12, "订单号", 3),
PAY_TIME(13, "支付时间", 3),
ORDER_TIME(14, "下单时间", 3),
ORDER_GOODS_LINK(15, "订单商品链接", 3),
SHOPMENT_NUMBER(16, "物流单号",3 )
;
WechatServiceFieldEnum(int code, String message, int fieldType) {
this.code = code;
this.message = message;
this.fieldType = fieldType;
}
private int code;
private String message;
/**
* 1:用户信息 2：会员卡信息 3：物流信息
*/
private int fieldType;
public int getCode() {
return code;
}
public String getMessage() {
return message;
}
public int getFieldType() {
return fieldType;
}
public WechatServiceFieldEnum setFieldType(int fieldType) {
this.fieldType = fieldType;
return this;
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/CustomChatFiledDTO.java
......@@ -5,13 +5,18 @@ import java.io.Serializable;
public class CustomChatFiledDTO implements Serializable {
private String key;
private String value;
/**
* 1:用户信息 2：会员卡信息 3：物流信息
*/
private Integer type;
public CustomChatFiledDTO(){
}
public CustomChatFiledDTO(String key, String value){
public CustomChatFiledDTO(String key, String value, Integer type){
this.key = key;
this.value = value;
this.type = type;
}
public String getKey() {
return key;
......@@ -28,4 +33,13 @@ public class CustomChatFiledDTO implements Serializable {
public void setValue(String value) {
this.value = value;
}
public Integer getType() {
return type;
}
public CustomChatFiledDTO setType(Integer type) {
this.type = type;
return this;
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/CustomUdeskFieldDTO.java
......@@ -7,6 +7,7 @@ import java.util.Date;
* tab_custom_udesk_field
*/
public class CustomUdeskFieldDTO implements Serializable {
private static final long serialVersionUID = 3629705521334915819L;
/**
*
*/
......@@ -20,7 +21,7 @@ public class CustomUdeskFieldDTO implements Serializable {
/**
*
*/
private String gicFieldId;
private Integer gicFieldId;
/**
*
......@@ -32,6 +33,13 @@ public class CustomUdeskFieldDTO implements Serializable {
*/
private Integer status;
private String appId;
/**
* 1:用户信息 2：会员卡信息 3：物流信息
*/
private Integer fieldType;
/**
*
*/
......@@ -51,63 +59,89 @@ public class CustomUdeskFieldDTO implements Serializable {
return id;
}
public void setId(Integer id) {
public CustomUdeskFieldDTO setId(Integer id) {
this.id = id;
return this;
}
public String getUdeskFieldId() {
return udeskFieldId;
}
public void setUdeskFieldId(String udeskFieldId) {
public CustomUdeskFieldDTO setUdeskFieldId(String udeskFieldId) {
this.udeskFieldId = udeskFieldId;
return this;
}
public String getGicFieldId() {
public Integer getGicFieldId() {
return gicFieldId;
}
public void setGicFieldId(String gicFieldId) {
public CustomUdeskFieldDTO setGicFieldId(Integer gicFieldId) {
this.gicFieldId = gicFieldId;
return this;
}
public String getGicFieldName() {
return gicFieldName;
}
public void setGicFieldName(String gicFieldName) {
public CustomUdeskFieldDTO setGicFieldName(String gicFieldName) {
this.gicFieldName = gicFieldName;
return this;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
public CustomUdeskFieldDTO setStatus(Integer status) {
this.status = status;
return this;
}
public String getAppId() {
return appId;
}
public CustomUdeskFieldDTO setAppId(String appId) {
this.appId = appId;
return this;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(Integer enterpriseId) {
public CustomUdeskFieldDTO setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
return this;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
public CustomUdeskFieldDTO setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
public CustomUdeskFieldDTO setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
return this;
}
public Integer getFieldType() {
return fieldType;
}
public CustomUdeskFieldDTO setFieldType(Integer fieldType) {
this.fieldType = fieldType;
return this;
}
}
\ No newline at end of file
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/EnterpriseListDTO.java
package com.gic.enterprise.dto;
import com.gic.enterprise.constant.LicenseTypeEnum;
import com.gic.enterprise.utils.LicenseUtils;
import java.io.Serializable;
import java.util.Arrays;
......@@ -65,6 +66,11 @@ public class EnterpriseListDTO implements Serializable{
*/
private Integer isInitComplete;
/**
* 商品license数量
*/
private Integer goodsCount;
public Integer getEnterpriseId() {
return enterpriseId;
}
......@@ -162,10 +168,14 @@ public class EnterpriseListDTO implements Serializable{
Map<String, Object> map = Arrays.stream(licenseUpperLimitStr.split("-"))
.map(e -> e.split(":"))
.collect(Collectors.toMap(e -> e[0], e -> e[1]));
Object memberCard = map.get("会员卡");
Object serviceCard = map.get("服务号");
Object weChat = map.get("小程序");
Object store = map.get("门店");
Object memberCard = map.get(LicenseUtils.MEMBER_CARD_LICENSE_NAME);
Object serviceCard = map.get(LicenseUtils.SERVICE_CARD_LICENSE_NAME);
Object weChat = map.get(LicenseUtils.WECHAT_LICENSE_NAME);
Object store = map.get(LicenseUtils.STORE_LICENSE_NAME);
//商品license，用于前端license扩容的时候判断：商品数量不变,不提交商品license数据给接口
Object goods = map.get(LicenseUtils.GOODS_LICENSE_NAME);
setGoodsCount(goods == null ? 0 : Integer.parseInt(goods.toString()));
return (memberCard == null ? "0" : memberCard.toString()) + "-"
+ (serviceCard == null ? "0" : serviceCard.toString()) + "-"
+ (weChat == null ? "0" : weChat.toString()) + "-"
......@@ -184,4 +194,13 @@ public class EnterpriseListDTO implements Serializable{
public void setIsInitComplete(Integer isInitComplete) {
this.isInitComplete = isInitComplete;
}
public Integer getGoodsCount() {
return goodsCount;
}
public EnterpriseListDTO setGoodsCount(Integer goodsCount) {
this.goodsCount = goodsCount;
return this;
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/data/DataWechatMemberConfigDTO.java
......@@ -39,6 +39,11 @@ public class DataWechatMemberConfigDTO implements Serializable{
private String relateWechat;
/**
* 是否操作过。如果操作过，则会员组那边我不会在刷新到数据库
*/
private Integer validSave;
/**
* 1:有效
*/
private Integer status;
......@@ -124,4 +129,13 @@ public class DataWechatMemberConfigDTO implements Serializable{
this.updateTime = updateTime;
return this;
}
public Integer getValidSave() {
return validSave;
}
public DataWechatMemberConfigDTO setValidSave(Integer validSave) {
this.validSave = validSave;
return this;
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/market/LicenseDTO.java
......@@ -63,6 +63,8 @@ public class LicenseDTO implements Serializable{
*/
private Integer alreadyBuyQuantity;
private boolean licenseEditFlag;
public String getServeId() {
return serveId;
}
......@@ -190,4 +192,13 @@ public class LicenseDTO implements Serializable{
public void setServeQuantity(Integer serveQuantity) {
this.serveQuantity = serveQuantity;
}
public boolean isLicenseEditFlag() {
return licenseEditFlag;
}
public LicenseDTO setLicenseEditFlag(boolean licenseEditFlag) {
this.licenseEditFlag = licenseEditFlag;
return this;
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/CustomUdeskFieldApiService.java
......@@ -24,13 +24,17 @@ public interface CustomUdeskFieldApiService {
*/
ServiceResponse<Integer> saveEnterpriseField(CustomUdeskFieldDTO dto);
ServiceResponse<Integer> editEnterpriseField(CustomUdeskFieldDTO dto);
/** @Description: 查询企业配置的字段
* @author taogs
* @Date 11:11 2019/12/2
* @Param
* @return
*/
ServiceResponse<List<CustomUdeskFieldDTO>> listEnterpriseField(Integer enterpriseId);
ServiceResponse<List<CustomUdeskFieldDTO>> listEnterpriseField(Integer enterpriseId, String appId);
ServiceResponse<List<CustomUdeskFieldDTO>> listEnableEnterpriseField(Integer enterpriseId, String appId);
/** @Description: 获取字段配置详情
* @author taogs
......
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/DataConfigApiService.java
......@@ -6,6 +6,10 @@ import com.gic.enterprise.dto.data.*;
import java.util.List;
public interface DataConfigApiService {
ServiceResponse<Void> configWechatMember(DataWechatMemberConfigDTO dto);
ServiceResponse<List<DataWechatMemberConfigDTO>> listWechatMemberConfig(Integer enterpriseId);
/**
* 会员消费配置
* @Title: configMemberConsumeConfig

......
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/utils/LicenseUtils.java 0 → 100644
package com.gic.enterprise.utils;
public class LicenseUtils {
public static final String GOODS_LICENSE_NAME = "商品数量";
public static final String MEMBER_CARD_LICENSE_NAME = "会员卡";
public static final String SERVICE_CARD_LICENSE_NAME = "服务号";
public static final String WECHAT_LICENSE_NAME = "小程序";
public static final String STORE_LICENSE_NAME = "门店";
public static boolean isGoodsLicense(String licenseName) {
return GOODS_LICENSE_NAME.equals(licenseName);
}
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabCustomUdeskFieldMapper.java
......@@ -54,5 +54,13 @@ public interface TabCustomUdeskFieldMapper {
*/
int updateByPrimaryKey(TabCustomUdeskField record);
List<TabCustomUdeskField> listEnterpriseField(@Param("enterpriseId") Integer enterpriseId);
List<TabCustomUdeskField> listEnterpriseField(@Param("enterpriseId") Integer enterpriseId,
@Param("appId") String appId);
List<TabCustomUdeskField> listEnableEnterpriseField(@Param("enterpriseId") Integer enterpriseId,
@Param("appId") String appId);
TabCustomUdeskField getUdeskField(@Param("enterpriseId") Integer enterpriseId,
@Param("appId") String appId,
@Param("gicFieldId") Integer gicFieldId);
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabCustomUdeskField.java
......@@ -19,7 +19,7 @@ public class TabCustomUdeskField {
/**
*
*/
private String gicFieldId;
private Integer gicFieldId;
/**
*
......@@ -31,6 +31,13 @@ public class TabCustomUdeskField {
*/
private Integer status;
private String appId;
/**
* 1:用户信息 2：会员卡信息 3：物流信息
*/
private Integer fieldType;
/**
*
*/
......@@ -50,63 +57,89 @@ public class TabCustomUdeskField {
return id;
}
public void setId(Integer id) {
public TabCustomUdeskField setId(Integer id) {
this.id = id;
return this;
}
public String getUdeskFieldId() {
return udeskFieldId;
}
public void setUdeskFieldId(String udeskFieldId) {
public TabCustomUdeskField setUdeskFieldId(String udeskFieldId) {
this.udeskFieldId = udeskFieldId;
return this;
}
public String getGicFieldId() {
public Integer getGicFieldId() {
return gicFieldId;
}
public void setGicFieldId(String gicFieldId) {
public TabCustomUdeskField setGicFieldId(Integer gicFieldId) {
this.gicFieldId = gicFieldId;
return this;
}
public String getGicFieldName() {
return gicFieldName;
}
public void setGicFieldName(String gicFieldName) {
public TabCustomUdeskField setGicFieldName(String gicFieldName) {
this.gicFieldName = gicFieldName;
return this;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
public TabCustomUdeskField setStatus(Integer status) {
this.status = status;
return this;
}
public String getAppId() {
return appId;
}
public TabCustomUdeskField setAppId(String appId) {
this.appId = appId;
return this;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(Integer enterpriseId) {
public TabCustomUdeskField setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
return this;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
public TabCustomUdeskField setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
public TabCustomUdeskField setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
return this;
}
public Integer getFieldType() {
return fieldType;
}
public TabCustomUdeskField setFieldType(Integer fieldType) {
this.fieldType = fieldType;
return this;
}
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabDataWechatMemberConfig.java
......@@ -32,6 +32,11 @@ public class TabDataWechatMemberConfig {
private String relateWechat;
/**
* 是否操作过。如果操作过，则会员组那边我不会在刷新到数据库
*/
private Integer validSave;
/**
* 1:有效
*/
private Integer status;
......@@ -117,4 +122,13 @@ public class TabDataWechatMemberConfig {
this.updateTime = updateTime;
return this;
}
public Integer getValidSave() {
return validSave;
}
public TabDataWechatMemberConfig setValidSave(Integer validSave) {
this.validSave = validSave;
return this;
}
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/CustomUdeskFieldService.java
package com.gic.enterprise.service;
import com.gic.enterprise.dto.CustomUdeskFieldDTO;
import com.gic.enterprise.entity.TabCustomUdeskField;
import java.util.List;
public interface CustomUdeskFieldService {
List<TabCustomUdeskField> listEnterpriseField(Integer enterpriseId);
List<TabCustomUdeskField> listEnterpriseField(Integer enterpriseId, String appId);
List<TabCustomUdeskField> listEnableEnterpriseField(Integer enterpriseId, String appId);
int saveEnterpriseField(TabCustomUdeskField field);
int editEnterpriseField(CustomUdeskFieldDTO dto);
TabCustomUdeskField getDetail(Integer fieldId);
int deleteFiled(Integer fieldId);
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/DataWechatMemberConfigService.java
......@@ -17,6 +17,8 @@ public interface DataWechatMemberConfigService {

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

......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/CustomUdeskFiledServiceImpl.java
package com.gic.enterprise.service.impl;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.dao.mapper.TabCustomUdeskFieldMapper;
import com.gic.enterprise.dto.CustomUdeskFieldDTO;
import com.gic.enterprise.entity.TabCustomUdeskField;
import com.gic.enterprise.service.CustomUdeskFieldService;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -15,21 +17,35 @@ public class CustomUdeskFiledServiceImpl implements CustomUdeskFieldService {
private TabCustomUdeskFieldMapper tabCustomUdeskFieldMapper;
@Override
public List<TabCustomUdeskField> listEnterpriseField(Integer enterpriseId) {
return this.tabCustomUdeskFieldMapper.listEnterpriseField(enterpriseId);
public List<TabCustomUdeskField> listEnterpriseField(Integer enterpriseId, String appId) {
return this.tabCustomUdeskFieldMapper.listEnterpriseField(enterpriseId, appId);
}
@Override
public List<TabCustomUdeskField> listEnableEnterpriseField(Integer enterpriseId, String appId) {
return tabCustomUdeskFieldMapper.listEnableEnterpriseField(enterpriseId, appId);
}
@Override
public int saveEnterpriseField(TabCustomUdeskField field) {
field.setUpdateTime(new Date());
if(field.getId() != null){
return this.tabCustomUdeskFieldMapper.updateByPrimaryKey(field);
TabCustomUdeskField record = tabCustomUdeskFieldMapper.getUdeskField(field.getEnterpriseId(), field.getAppId(), field.getGicFieldId());
if(record != null){
return 0;
}
field.setCreateTime(new Date());
return this.tabCustomUdeskFieldMapper.insertSelective(field);
}
@Override
public int editEnterpriseField(CustomUdeskFieldDTO dto) {
TabCustomUdeskField record = EntityUtil.changeEntityNew(TabCustomUdeskField.class, dto);
record.setUpdateTime(new Date());
return tabCustomUdeskFieldMapper.updateByPrimaryKeySelective(record);
}
@Override
public TabCustomUdeskField getDetail(Integer fieldId) {
TabCustomUdeskField tabCustomUdeskField = this.tabCustomUdeskFieldMapper.selectByPrimaryKey(fieldId);
return tabCustomUdeskField;
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/DataWechatMemberConfigServiceImpl.java
......@@ -28,6 +28,13 @@ public class DataWechatMemberConfigServiceImpl implements DataWechatMemberConfig
}
@Override
public Integer editWechatMemberConfig(DataWechatMemberConfigDTO dto) {
TabDataWechatMemberConfig record = EntityUtil.changeEntityNew(TabDataWechatMemberConfig.class, dto);
record.setUpdateTime(new Date());
return tabDataWechatMemberConfigMapper.updateByPrimaryKeySelective(record);
}
@Override
public TabDataWechatMemberConfig getByMemberCardId(Integer enterpriseId, String memberCardId) {
return tabDataWechatMemberConfigMapper.getByMemberCardId(enterpriseId, memberCardId);
}
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/CustomUdeskFieldApiServiceImpl.java
......@@ -2,6 +2,7 @@ package com.gic.enterprise.service.outer.impl;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.constant.WechatServiceFieldEnum;
import com.gic.enterprise.dto.CustomChatFiledDTO;
import com.gic.enterprise.dto.CustomUdeskFieldDTO;
import com.gic.enterprise.entity.TabCustomUdeskField;
......@@ -28,16 +29,9 @@ public class CustomUdeskFieldApiServiceImpl implements CustomUdeskFieldApiServic
return ServiceResponse.success(list);
}
List<CustomChatFiledDTO> list = new ArrayList<>();
list.add(new CustomChatFiledDTO("集团卡号", "cliqueCard"));
list.add(new CustomChatFiledDTO("姓名", "userName"));
list.add(new CustomChatFiledDTO("手机号码", "phoneNumber"));
list.add(new CustomChatFiledDTO("会员卡号", "cardNo"));
list.add(new CustomChatFiledDTO("用户信息", "userInfo"));
list.add(new CustomChatFiledDTO("会员卡等级", "memberGrade"));
list.add(new CustomChatFiledDTO("积分余额", "integralBalance"));
list.add(new CustomChatFiledDTO("最近消费时间", "latestCunsumeTime"));
list.add(new CustomChatFiledDTO("消费次数", "consumeTimes"));
list.add(new CustomChatFiledDTO("消费总额", "consumeTotal"));
for (WechatServiceFieldEnum fieldEnum : WechatServiceFieldEnum.values()) {
list.add(new CustomChatFiledDTO(fieldEnum.getMessage(), String.valueOf(fieldEnum.getCode()), fieldEnum.getFieldType()));
}
RedisUtil.setCache(key, list);
return ServiceResponse.success(list);
}
......@@ -49,8 +43,20 @@ public class CustomUdeskFieldApiServiceImpl implements CustomUdeskFieldApiServic
}
@Override
public ServiceResponse<List<CustomUdeskFieldDTO>> listEnterpriseField(Integer enterpriseId) {
List<TabCustomUdeskField> list = this.customUdeskFieldService.listEnterpriseField(enterpriseId);
public ServiceResponse<Integer> editEnterpriseField(CustomUdeskFieldDTO dto) {
customUdeskFieldService.editEnterpriseField(dto);
return ServiceResponse.success();
}
@Override
public ServiceResponse<List<CustomUdeskFieldDTO>> listEnterpriseField(Integer enterpriseId, String appId) {
List<TabCustomUdeskField> list = this.customUdeskFieldService.listEnterpriseField(enterpriseId, appId);
return ServiceResponse.success(EntityUtil.changeEntityListByJSON(CustomUdeskFieldDTO.class, list));
}
@Override
public ServiceResponse<List<CustomUdeskFieldDTO>> listEnableEnterpriseField(Integer enterpriseId, String appId) {
List<TabCustomUdeskField> list = this.customUdeskFieldService.listEnableEnterpriseField(enterpriseId, appId);
return ServiceResponse.success(EntityUtil.changeEntityListByJSON(CustomUdeskFieldDTO.class, list));
}
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/DataConfigApiServiceImpl.java
package com.gic.enterprise.service.outer.impl;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.*;
import java.util.stream.Collectors;
import com.gic.enterprise.dto.data.*;
import com.gic.enterprise.entity.*;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -33,6 +31,29 @@ public class DataConfigApiServiceImpl implements DataConfigApiService {
private DataGenerationConfigService dataGenerationConfigService;
@Override
public ServiceResponse<Void> configWechatMember(DataWechatMemberConfigDTO dto) {
String memberCardId = dto.getMemberCardArea();
if (StringUtils.isBlank(memberCardId)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "会员卡域不能为空");
}
TabDataWechatMemberConfig result = dataWechatMemberConfigService.getByMemberCardId(dto.getEnterpriseId(), memberCardId);
if (result == null) {
dataWechatMemberConfigService.saveWechatMemberConfig(dto);
} else {
dto.setWechatMemberConfigId(result.getWechatMemberConfigId());
dataWechatMemberConfigService.editWechatMemberConfig(dto);
}
return ServiceResponse.success();
}
@Override
public ServiceResponse<List<DataWechatMemberConfigDTO>> listWechatMemberConfig(Integer enterpriseId) {
return ServiceResponse.success(Optional
.ofNullable(EntityUtil.changeEntityListNew(DataWechatMemberConfigDTO.class, dataWechatMemberConfigService
.listByEnterpriseId(enterpriseId))).orElse(Collections.EMPTY_LIST));
}
@Override
public ServiceResponse<Integer> configMemberConsume(DataMemberConsumeConfigDTO dto) {
if (dto.getEnterpriseId() == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "商户ID不能为空");
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/EnterpriseApiServiceImpl.java
......@@ -4,6 +4,7 @@ import java.text.SimpleDateFormat;
import java.util.*;
import com.gic.enterprise.constant.BillingAuditStatusEnum;
import com.gic.enterprise.utils.LicenseUtils;
import com.gic.marketing.process.api.service.sms.SmsSendApiService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
......@@ -427,6 +428,13 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
public ServiceResponse<MarketServiceDTO> buyForGicForNew(BuyForGicQO basicParams) {
MarketServiceDTO marketServiceDTO = new MarketServiceDTO();
List<TabEnterpriseResourceRel> businessFront = enterpriseResourceRelService.getByEnterpriseId(basicParams.getEnterpriseId().intValue());
//是否有商品管理权限
boolean hasGoodsAuth = false;
if (CollectionUtils.isNotEmpty(businessFront)) {
hasGoodsAuth = businessFront.stream().anyMatch(e -> "goods".equals(e.getResourceCode()) && e.getResourceSwitch().intValue() == 1);
}
List<com.gic.enterprise.dto.market.OrderBuyLicenseDTO> orderBuyLicenseDTOList = basicParams.getLicenseList();
List<OrderBuyLicenseDTO> licenseListParams = EntityUtil.changeEntityListNew(OrderBuyLicenseDTO.class,
orderBuyLicenseDTOList);
......@@ -478,6 +486,12 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
} else if (serviceType == 2) {
//license
LicenseDTO license = EntityUtil.changeEntityNew(LicenseDTO.class, orderItem);
//没有商品权限
if (!hasGoodsAuth) {
if (LicenseUtils.GOODS_LICENSE_NAME.equals(orderItem.getServeName())) {
continue;
}
}
license.setSkuId(long2String(orderItem.getSkuId()));
license.setServeId(long2String(orderItem.getServeId()));
licenseList.add(license);
......
gic-platform-enterprise-service/src/main/resources/mapper/TabCustomUdeskFieldMapper.xml
......@@ -4,15 +4,17 @@
<resultMap id="BaseResultMap" type="com.gic.enterprise.entity.TabCustomUdeskField">
<id column="id" jdbcType="INTEGER" property="id" />
<result column="udesk_field_id" jdbcType="VARCHAR" property="udeskFieldId" />
<result column="gic_field_id" jdbcType="VARCHAR" property="gicFieldId" />
<result column="gic_field_id" jdbcType="INTEGER" property="gicFieldId" />
<result column="gic_field_name" jdbcType="VARCHAR" property="gicFieldName" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="app_id" jdbcType="VARCHAR" property="appId" />
<result column="field_type" jdbcType="INTEGER" property="fieldType" />
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
id, udesk_field_id, gic_field_id, gic_field_name, status, enterprise_id, create_time,
id, udesk_field_id, gic_field_id, gic_field_name, status, app_id, field_type, enterprise_id, create_time,
update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
......@@ -27,10 +29,10 @@
</delete>
<insert id="insert" parameterType="com.gic.enterprise.entity.TabCustomUdeskField">
insert into tab_custom_udesk_field (id, udesk_field_id, gic_field_id,
gic_field_name, status, enterprise_id,
gic_field_name, status, app_id, field_type, enterprise_id,
create_time, update_time)
values (#{id,jdbcType=INTEGER}, #{udeskFieldId,jdbcType=VARCHAR}, #{gicFieldId,jdbcType=VARCHAR},
#{gicFieldName,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER},
values (#{id,jdbcType=INTEGER}, #{udeskFieldId,jdbcType=VARCHAR}, #{gicFieldId,jdbcType=INTEGER},
#{gicFieldName,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{appId,jdbcType=VARCHAR}, #{fieldType,jdbcType=INTEGER},#{enterpriseId,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabCustomUdeskField">
......@@ -51,6 +53,12 @@
<if test="status != null">
status,
</if>
<if test="appId != null">
app_id,
</if>
<if test="fieldType != null">
field_type,
</if>
<if test="enterpriseId != null">
enterprise_id,
</if>
......@@ -69,7 +77,7 @@
#{udeskFieldId,jdbcType=VARCHAR},
</if>
<if test="gicFieldId != null">
#{gicFieldId,jdbcType=VARCHAR},
#{gicFieldId,jdbcType=INTEGER},
</if>
<if test="gicFieldName != null">
#{gicFieldName,jdbcType=VARCHAR},
......@@ -77,6 +85,12 @@
<if test="status != null">
#{status,jdbcType=INTEGER},
</if>
<if test="appId != null">
#{appId,jdbcType=VARCHAR},
</if>
<if test="fieldType != null">
#{field_type,jdbcType=INTEGER},
</if>
<if test="enterpriseId != null">
#{enterpriseId,jdbcType=INTEGER},
</if>
......@@ -95,7 +109,7 @@
udesk_field_id = #{udeskFieldId,jdbcType=VARCHAR},
</if>
<if test="gicFieldId != null">
gic_field_id = #{gicFieldId,jdbcType=VARCHAR},
gic_field_id = #{gicFieldId,jdbcType=INTEGER},
</if>
<if test="gicFieldName != null">
gic_field_name = #{gicFieldName,jdbcType=VARCHAR},
......@@ -103,6 +117,12 @@
<if test="status != null">
status = #{status,jdbcType=INTEGER},
</if>
<if test="appId != null">
app_id = #{appId,jdbcType=VARCHAR},
</if>
<if test="fieldType != null">
field_type = #{fieldType,jdbcType=INTEGER},
</if>
<if test="enterpriseId != null">
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
</if>
......@@ -118,9 +138,11 @@
<update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabCustomUdeskField">
update tab_custom_udesk_field
set udesk_field_id = #{udeskFieldId,jdbcType=VARCHAR},
gic_field_id = #{gicFieldId,jdbcType=VARCHAR},
gic_field_id = #{gicFieldId,jdbcType=INTEGER},
gic_field_name = #{gicFieldName,jdbcType=VARCHAR},
status = #{status,jdbcType=INTEGER},
app_id = #{appId,jdbcType=VARCHAR},
field_type = #{fieldType,jdbcType=INTEGER},
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
......@@ -130,6 +152,24 @@
select
<include refid="Base_Column_List" />
from tab_custom_udesk_field
where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and (status=1 or status=2)
where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and status != 0
and app_id = #{appId}
</select>
<select id="listEnableEnterpriseField" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_custom_udesk_field
where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and status = 1
and app_id = #{appId}
</select>
<select id="getUdeskField" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_custom_udesk_field
where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and status != 0
and app_id = #{appId}
and gic_field_id = #{gicFieldId}
</select>
</mapper>
\ No newline at end of file
gic-platform-enterprise-service/src/main/resources/mapper/TabDataWechatMemberConfigMapper.xml
......@@ -7,12 +7,13 @@
<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="valid_save" jdbcType="INTEGER" property="validSave" />
<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,
wechat_member_config_id, enterprise_id, member_card_area, relate_service, relate_wechat, valid_save,
status, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
......@@ -27,11 +28,11 @@
</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,
member_card_area, relate_service, relate_wechat, valid_save,
status, create_time, update_time
)
values (#{wechatMemberConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER},
#{memberCardArea,jdbcType=VARCHAR}, #{relateService,jdbcType=VARCHAR}, #{relateWechat,jdbcType=VARCHAR},
#{memberCardArea,jdbcType=VARCHAR}, #{relateService,jdbcType=VARCHAR}, #{relateWechat,jdbcType=VARCHAR}, #{validSave,jdbcType=INTEGER},
#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
)
</insert>
......@@ -53,6 +54,9 @@
<if test="relateWechat != null">
relate_wechat,
</if>
<if test="validSave != null">
valid_save,
</if>
<if test="status != null">
status,
</if>
......@@ -79,6 +83,9 @@
<if test="relateWechat != null">
#{relateWechat,jdbcType=VARCHAR},
</if>
<if test="validSave != null">
#{valid_save,jdbcType=INTEGER},
</if>
<if test="status != null">
#{status,jdbcType=INTEGER},
</if>
......@@ -105,6 +112,9 @@
<if test="relateWechat != null">
relate_wechat = #{relateWechat,jdbcType=VARCHAR},
</if>
<if test="validSave != null">
valid_save = #{validSave,jdbcType=INTEGER},
</if>
<if test="status != null">
status = #{status,jdbcType=INTEGER},
</if>
......@@ -123,6 +133,7 @@
member_card_area = #{memberCardArea,jdbcType=VARCHAR},
relate_service = #{relateService,jdbcType=VARCHAR},
relate_wechat = #{relateWechat,jdbcType=VARCHAR},
valid_save = #{validSave,jdbcType=INTEGER},
status = #{status,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
......
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/CustomChatController.java
......@@ -3,6 +3,7 @@ package com.gic.enterprise.web.controller;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.enterprise.constant.WechatServiceFieldEnum;
import com.gic.enterprise.constant.applet.AppletPageTypeEnum;
import com.gic.enterprise.dto.AppletCustomPageDTO;
import com.gic.enterprise.dto.CustomChatFiledDTO;
......@@ -10,13 +11,18 @@ import com.gic.enterprise.dto.CustomUdeskFieldDTO;
import com.gic.enterprise.qo.AppletPageQO;
import com.gic.enterprise.service.AppletCustomPageApiService;
import com.gic.enterprise.service.CustomUdeskFieldApiService;
import com.gic.enterprise.utils.ResultControllerUtils;
import com.gic.enterprise.utils.UserDetailUtils;
import org.apache.catalina.User;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
/** @Description: 小程序配置客户服务
* @author taogs
......@@ -57,25 +63,21 @@ public class CustomChatController {
}
@RequestMapping("list-enterprise-field")
public RestResponse listEnterpriseField(){
ServiceResponse<List<CustomUdeskFieldDTO>> response = this.customUdeskFieldApiService.listEnterpriseField(UserDetailUtils.getUserDetail().getEnterpriseId());
if(response.isSuccess()){
return RestResponse.success(response.getResult());
public RestResponse listEnterpriseField(String appId) {
//初始化
for (WechatServiceFieldEnum fieldEnum : WechatServiceFieldEnum.values()) {
customUdeskFieldApiService.saveEnterpriseField(new CustomUdeskFieldDTO()
.setAppId(appId)
.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId())
.setGicFieldId(fieldEnum.getCode())
.setGicFieldName(fieldEnum.getMessage())
.setStatus(0)
.setFieldType(fieldEnum.getFieldType()));
}
return RestResponse.success();
}
@RequestMapping("save-enterprise-field")
public RestResponse saveEnterpriseField(String udeskFieldId, String gicFieldId, String gicFieldName, Integer id){
CustomUdeskFieldDTO dto = new CustomUdeskFieldDTO();
dto.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
dto.setGicFieldId(gicFieldId);
dto.setId(id);
dto.setGicFieldName(gicFieldName);
dto.setStatus(1);
dto.setUdeskFieldId(udeskFieldId);
this.customUdeskFieldApiService.saveEnterpriseField(dto);
return RestResponse.success();
ServiceResponse<List<CustomUdeskFieldDTO>> response = this.customUdeskFieldApiService
.listEnterpriseField(UserDetailUtils.getUserDetail().getEnterpriseId(), appId);
return ResultControllerUtils.commonResult(response);
}
@RequestMapping("get-enterprise-field-detail")
......@@ -84,6 +86,11 @@ public class CustomChatController {
return RestResponse.success(response.getResult());
}
@RequestMapping("edit-enterprise-field-detail")
public RestResponse editEnterpriseFieldDetail(CustomUdeskFieldDTO dto){
return ResultControllerUtils.commonResult(this.customUdeskFieldApiService.editEnterpriseField(dto));
}
@RequestMapping("delete-enterprise-field")
public RestResponse deleteEnterpriseField(Integer id){
ServiceResponse<Integer> response = this.customUdeskFieldApiService.deleteField(id);
......
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/DataConfigController.java
......@@ -5,6 +5,8 @@ import java.util.stream.Collectors;
import com.gic.enterprise.dto.data.*;
import com.gic.enterprise.web.vo.data.*;
import com.gic.member.config.api.service.AppletsConfigApiService;
import com.gic.member.config.api.service.ServiceConfigApiService;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -28,6 +30,41 @@ public class DataConfigController {
@Autowired
private DataConfigApiService dataConfigApiService;
@Autowired
private AppletsConfigApiService appletsConfigApiService;
@Autowired
private ServiceConfigApiService serviceConfigApiService;
@RequestMapping("list-all-applet")
public RestResponse listAllApplet() {
return ResultControllerUtils.commonResult(appletsConfigApiService
.listValidAppletConfigAppId(UserDetailUtils.getUserDetail().getEnterpriseId()));
}
@RequestMapping("list-all-service")
public RestResponse listAllService() {
return ResultControllerUtils.commonResult(serviceConfigApiService
.listValidServiceConfigAppId(UserDetailUtils.getUserDetail().getEnterpriseId()));
}
@RequestMapping("config-wechat-member")
public RestResponse configWechatMember(DataWechatMemberConfigDTO dto) {
return ResultControllerUtils.commonResult(dataConfigApiService
.configWechatMember(dto));
}
@RequestMapping("refresh-wechat-member-config")
public RestResponse refreshWechatMemberConfig() {
//todo
return null;
}
@RequestMapping("list-wechat-member-config")
public RestResponse listWechatMemberConfig() {
return ResultControllerUtils.commonResult(dataConfigApiService
.listWechatMemberConfig(UserDetailUtils.getUserDetail().getEnterpriseId()));
}
@RequestMapping("/config-member-consume")
public RestResponse configMemberConsume(DataMemberConsumeConfigDTO dto) {
......@@ -74,8 +111,7 @@ public class DataConfigController {
@RequestMapping("/get-actually-paid-config-new")
public RestResponse getActuallyPaidConfigNew() {
return ResultControllerUtils.commonResult(
dataConfigApiService.getDataActuallyPaidConfig(UserDetailUtils.getUserDetail().getEnterpriseId()),
ActuallyPaidConfigVO.class);
dataConfigApiService.getDataActuallyPaidConfig(UserDetailUtils.getUserDetail().getEnterpriseId()));
}
@RequestMapping("/config-single-effect")
......
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/vo/UdeskFieldVO.java 0 → 100644
package com.gic.enterprise.web.vo;
import java.io.Serializable;
/**
* 客服页面装修udesk类型的自定义字段
* @ClassName: UdeskFieldVO

* @Description: 

* @author guojuxing

* @date 2020/7/21 11:11 AM

*/
public class UdeskFieldVO implements Serializable{
private static final long serialVersionUID = 1106172629914018235L;
/**
*
*/
private Integer id;
/**
*
*/
private String udeskFieldId;
/**
*
*/
private String gicFieldId;
/**
*
*/
private String gicFieldName;
public Integer getId() {
return id;
}
public UdeskFieldVO setId(Integer id) {
this.id = id;
return this;
}
public String getUdeskFieldId() {
return udeskFieldId;
}
public UdeskFieldVO setUdeskFieldId(String udeskFieldId) {
this.udeskFieldId = udeskFieldId;
return this;
}
public String getGicFieldId() {
return gicFieldId;
}
public UdeskFieldVO setGicFieldId(String gicFieldId) {
this.gicFieldId = gicFieldId;
return this;
}
public String getGicFieldName() {
return gicFieldName;
}
public UdeskFieldVO setGicFieldName(String gicFieldName) {
this.gicFieldName = gicFieldName;
return this;
}
}
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