Skip to content

G
gic-platform-enterprise
Commit a9a70e73 by 陶光胜
Options

Merge branch 'developer' into 'master' 

Developer

See merge request !11
parents cb2c594e b576d834
Showing with 598 additions and 88 deletions
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/ApprovalCallBackDTO.java
......@@ -28,7 +28,7 @@ public class ApprovalCallBackDTO implements Serializable {
private Integer enterpriseId;
private String errorCode;
private String errorCodeRes;
@NotNull(message = "审批时间不能为空, 格式为YYYYMMdd", groups = ApprovalValid.class)
@NotNull(message = "审批时间不能为空, 格式为yyyyMMdd", groups = ApprovalValid.class)
private String timeEnd;
private String prepayId;
......
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/OutPayDTO.java
......@@ -62,7 +62,7 @@ public class OutPayDTO implements Serializable {
@NotNull(message = "购买类型不能为空", groups = {SavePrePay.class, ConfirmPay.class})
private Integer buyProductType;
/**
* 交易开始时间， 格式为YYYYMMddHHmmss
* 交易开始时间， 格式为yyyyMMddHHmmss
*/
@NotBlank(message = "交易起始时间不能为空", groups = {SavePrePay.class})
private String timeStart;
......
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/wm/WmGoodsConfigDTO.java 0 → 100644
package com.gic.enterprise.dto.wm;
import java.io.Serializable;
/**
* 微盟店铺订单配置
* @ClassName: WmOrderConfigDTO

* @Description: 

* @author guojuxing

* @date 2020/4/30 4:09 PM

*/
public class WmGoodsConfigDTO implements Serializable{
private static final long serialVersionUID = 3273511512953006504L;
/**
* 微盟商品属性ID long类型
*/
private String wmGoodsBrand;
public String getWmGoodsBrand() {
return wmGoodsBrand;
}
public WmGoodsConfigDTO setWmGoodsBrand(String wmGoodsBrand) {
this.wmGoodsBrand = wmGoodsBrand;
return this;
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/WmStoreApiService.java
......@@ -6,6 +6,7 @@ import com.gic.enterprise.dto.WmMemberCardConfigDTO;
import com.gic.enterprise.dto.WmOrderConfigDTO;
import com.gic.enterprise.dto.WmStoreDTO;
import com.gic.enterprise.dto.wm.WmCouponDTO;
import com.gic.enterprise.dto.wm.WmGoodsConfigDTO;
import com.gic.enterprise.dto.wm.WmStoreConfigDTO;
import com.gic.enterprise.dto.wm.WmStoreCouponConfigDTO;
import com.gic.enterprise.qo.wm.CouponConfigQO;
......@@ -88,6 +89,16 @@ public interface WmStoreApiService {
ServiceResponse<WmOrderConfigDTO> getOrderConfig(Integer wmMallStoreId);
/**
* 商品品牌
* @Title: getGoodsConfig

* @Description:

* @author guojuxing
* @param wmMallStoreId
微盟店铺ID
* @return com.gic.api.base.commons.ServiceResponse<com.gic.enterprise.dto.wm.WmGoodsConfigDTO>


*/
ServiceResponse<WmGoodsConfigDTO> getGoodsConfig(Integer wmMallStoreId);
/**
* 根据微盟主账号查询配置
* @Title: getWmStoreConfig

* @Description:
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabBillingEnterpriseSmsPackageMapper.java
......@@ -60,6 +60,15 @@ public interface TabBillingEnterpriseSmsPackageMapper {
@Param("startDate") String startDate,
@Param("endDate") String endDate);
List<TabBillingEnterpriseSmsPackage> listEnterpriseSmsPackageNoStatus(@Param("enterpriseId") Integer enterpriseId,
@Param("status") Integer status,
@Param("search") String search,
@Param("startDate") String startDate,
@Param("endDate") String endDate,
@Param("pageNum") int pageNum,
@Param("pageSize") int pageSize,
@Param("totalCount") int totalCount);
/**
* 短信套餐包列表查询，账户总览页面统计使用
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/BillingOrderServiceImpl.java
package com.gic.enterprise.service.impl;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.alibaba.fastjson.JSON;
import com.gic.commons.util.GlobalInfo;
import com.gic.enterprise.constant.BillingOrderStatusEnum;
......@@ -25,6 +14,14 @@ import com.gic.enterprise.service.BillingEnterpriseSmsPackageService;
import com.gic.enterprise.service.BillingOrderService;
import com.gic.enterprise.utils.CreateRandomUtils;
import com.github.pagehelper.Page;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Calendar;
import java.util.Date;
@Service("billingOrderService")
public class BillingOrderServiceImpl implements BillingOrderService {
......@@ -102,7 +99,6 @@ public class BillingOrderServiceImpl implements BillingOrderService {
if(order != null){
int i1 = this.tabBillingOrderMapper.updateOrderBySerialNumber(orderSerialNumber, totalFeePaid, auditStatus);
logger.info("修改订单状态：{}", i1);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
SmsPackageOrderItemDTO itemDTO = JSON.parseObject(order.getItemJson(), SmsPackageOrderItemDTO.class);
if(itemDTO != null){
for(int i= 0; i< itemDTO.getBuyCount(); i++){
......@@ -113,18 +109,18 @@ public class BillingOrderServiceImpl implements BillingOrderService {
smsPackage.setCreateTime(new Date());
smsPackage.setUpdateTime(new Date());
smsPackage.setSmsPackageCode(itemDTO.getCode());
smsPackage.setSmsPackageName(itemDTO.getSmsPackageName()+"-"+itemDTO.getSmsAmount());
smsPackage.setSmsPackageName(itemDTO.getSmsPackageName());
smsPackage.setBillingOrderId(order.getOrderId());
smsPackage.setTotalAcount(itemDTO.getSmsAmount());
smsPackage.setRemainAccount(itemDTO.getSmsAmount());
Calendar now = Calendar.getInstance();
now.setTime(new Date());
now.add(Calendar.MONTH, itemDTO.getPackageLength());
try {
smsPackage.setEffectiveDate(simpleDateFormat.parse(simpleDateFormat.format(now.getTime())));
} catch (ParseException e) {
e.printStackTrace();
}
now.set(Calendar.HOUR, 23);
now.set(Calendar.MINUTE, 59);
now.set(Calendar.SECOND, 59);
smsPackage.setEffectiveDate(now.getTime());
this.billingEnterpriseSmsPackageService.saveEnterpriseSmsPackage(smsPackage);
}
}
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/PackageServiceImpl.java
......@@ -20,8 +20,14 @@ public class PackageServiceImpl implements PackageService {
Integer status, String startDate, String endDate,
int pageNum, int pageSize) {
PageHelper.startPage(pageNum, pageSize);
List<TabBillingEnterpriseSmsPackage> list = this.tabBillingEnterpriseSmsPackageMapper.listEnterpriseSmsPackage
(enterpriseId, status, search, startDate, endDate);
return (Page<TabBillingEnterpriseSmsPackage>) list;
if (status != null) {
List<TabBillingEnterpriseSmsPackage> list = this.tabBillingEnterpriseSmsPackageMapper.listEnterpriseSmsPackage(enterpriseId, status, search, startDate, endDate);
return (Page<TabBillingEnterpriseSmsPackage>) list;
} else {
List<TabBillingEnterpriseSmsPackage> list = this.tabBillingEnterpriseSmsPackageMapper
.listEnterpriseSmsPackageNoStatus(enterpriseId, status, search, startDate, endDate, pageNum, pageSize, pageNum * pageSize);
return (Page<TabBillingEnterpriseSmsPackage>) list;
}
}
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/WmStoreSyncLogServiceImpl.java
package com.gic.enterprise.service.impl;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -20,18 +22,22 @@ public class WmStoreSyncLogServiceImpl implements WmStoreSyncLogService {
@Override
public void saveWmStoreSyncLog(Integer storeId, Integer wmMallStoreId, Integer type,
Integer enterpriseId, String storeCode, String storeName) {
Date now = new Date();
TabWmStoreSyncLog record = new TabWmStoreSyncLog()
.setStoreId(storeId)
.setEnterpriseId(enterpriseId)
.setStatus(1)
.setStoreCode(storeCode)
.setWmMallStoreId(wmMallStoreId)
.setStoreName(storeName)
.setStoreType(type)
.setCreateTime(now)
.setUpdateTime(now);
tabWmStoreSyncLogMapper.insert(record);
//先判断是否已存在
List<TabWmStoreSyncLog> list = listByStoreId(Arrays.asList(storeId), wmMallStoreId);
if (CollectionUtils.isEmpty(list)) {
Date now = new Date();
TabWmStoreSyncLog record = new TabWmStoreSyncLog()
.setStoreId(storeId)
.setEnterpriseId(enterpriseId)
.setStatus(1)
.setStoreCode(storeCode)
.setWmMallStoreId(wmMallStoreId)
.setStoreName(storeName)
.setStoreType(type)
.setCreateTime(now)
.setUpdateTime(now);
tabWmStoreSyncLogMapper.insert(record);
}
}
@Override
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/BillingOrderApiServcImpl.java
package com.gic.enterprise.service.outer.impl;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
......@@ -29,6 +17,17 @@ import com.gic.enterprise.response.EnterpriseServiceResponse;
import com.gic.enterprise.service.*;
import com.gic.finance.service.TransferAccountsApprovalApiService;
import com.github.pagehelper.PageHelper;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
@Service("billingOrderApiService")
public class BillingOrderApiServcImpl implements BillingOrderApiService {
......@@ -114,7 +113,7 @@ public class BillingOrderApiServcImpl implements BillingOrderApiService {
}
}
outPayDTO.setBuyType(BuyTypeEnum.BUY_SHORT_MESSAGE_PACKAGE.getCode());
outPayDTO.setTimeStart(new SimpleDateFormat("YYYYMMddHHmmss").format(new Date()));
outPayDTO.setTimeStart(new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()));
outPayDTO.setOrderSerialNumber(order.getSerialNumber());
outPayDTO.setPayType(payType);
outPayDTO.setAuthCode(authCode);
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/WmStoreApiServiceImpl.java
......@@ -6,6 +6,7 @@ import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import com.gic.enterprise.dto.wm.WmGoodsConfigDTO;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -117,32 +118,43 @@ public class WmStoreApiServiceImpl implements WmStoreApiService {
@Override
public ServiceResponse<WmMemberCardConfigDTO> getMemberCardConfig(Integer wmMallStoreId) {
TabWmStore record = wmStoreService.getByWmMallStoreId(wmMallStoreId);
if (record == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "微盟商城店铺ID错误，查无数据");
}
TabWmStoreConfig memberCardConfig = wmStoreConfigService.getWmStoreConfig(wmMallStoreId,
WmStoreConfigTypeEnum.MEMBER_CARD_CONFIG.getCode());
if (memberCardConfig == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(),
"还未进行" + WmStoreConfigTypeEnum.MEMBER_CARD_CONFIG.getMessage());
ServiceResponse<TabWmStoreConfig> result = getWmConfig(wmMallStoreId, WmStoreConfigTypeEnum.MEMBER_CARD_CONFIG);
if (result.isSuccess()) {
return ServiceResponse.success(JSON.parseObject(result.getResult().getStoreConfigJson(), WmMemberCardConfigDTO.class));
}
return ServiceResponse.success(JSON.parseObject(memberCardConfig.getStoreConfigJson(), WmMemberCardConfigDTO.class));
return ServiceResponse.failure(result.getCode(), result.getMessage());
}
@Override
public ServiceResponse<WmOrderConfigDTO> getOrderConfig(Integer wmMallStoreId) {
ServiceResponse<TabWmStoreConfig> result = getWmConfig(wmMallStoreId, WmStoreConfigTypeEnum.ORDER_CONFIG);
if (result.isSuccess()) {
return ServiceResponse.success(JSON.parseObject(result.getResult().getStoreConfigJson(), WmOrderConfigDTO.class));
}
return ServiceResponse.failure(result.getCode(), result.getMessage());
}
@Override
public ServiceResponse<WmGoodsConfigDTO> getGoodsConfig(Integer wmMallStoreId) {
ServiceResponse<TabWmStoreConfig> result = getWmConfig(wmMallStoreId, WmStoreConfigTypeEnum.GOODS_CONFIG);
if (result.isSuccess()) {
return ServiceResponse.success(JSON.parseObject(result.getResult().getStoreConfigJson(), WmGoodsConfigDTO.class));
}
return ServiceResponse.failure(result.getCode(), result.getMessage());
}
private ServiceResponse<TabWmStoreConfig> getWmConfig(Integer wmMallStoreId, WmStoreConfigTypeEnum typeEnum) {
TabWmStore record = wmStoreService.getByWmMallStoreId(wmMallStoreId);
if (record == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "微盟商城店铺ID错误，查无数据");
}
TabWmStoreConfig orderConfig = wmStoreConfigService.getWmStoreConfig(wmMallStoreId,
WmStoreConfigTypeEnum.ORDER_CONFIG.getCode());
if (orderConfig == null) {
TabWmStoreConfig config = wmStoreConfigService.getWmStoreConfig(wmMallStoreId,
typeEnum.getCode());
if (config == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(),
"还未进行" + WmStoreConfigTypeEnum.ORDER_CONFIG.getMessage());
"还未进行" + typeEnum.getMessage());
}
return ServiceResponse.success(JSON.parseObject(orderConfig.getStoreConfigJson(), WmOrderConfigDTO.class));
return ServiceResponse.success(config);
}
@Override
......@@ -289,6 +301,9 @@ public class WmStoreApiServiceImpl implements WmStoreApiService {
if (StringUtils.isBlank(wmStoreDTO.getWmPid())) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "PID不能为空");
}
if (!StringUtils.isNumeric(wmStoreDTO.getWmPid())) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "PID必须为数字");
}
if (isCanEdit && !record.getWmPid().equals(wmStoreDTO.getWmPid())) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "已授权，PID不能修改");
}
......@@ -298,6 +313,9 @@ public class WmStoreApiServiceImpl implements WmStoreApiService {
if (StringUtils.isBlank(wmStoreDTO.getWmStoreId())) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "storeID不能为空");
}
if (!StringUtils.isNumeric(wmStoreDTO.getWmStoreId())) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "storeID必须为数字");
}
if (isCanEdit && !record.getWmStoreId().equals(wmStoreDTO.getWmStoreId())) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "已授权，storeID不能修改");
}
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/WmStoreSyncLogApiServiceImpl.java
......@@ -32,16 +32,17 @@ public class WmStoreSyncLogApiServiceImpl implements WmStoreSyncLogApiService {
Integer enterpriseId) {
StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
StringBuilder storeIds = new StringBuilder();
storeIdList.forEach(storeId -> storeIds.append(storeId).append(","));
storeIdList.forEach(storeId -> storeIds.append(storeId).append(" "));
storeSearchDTO.setStoreIds(storeIds.toString());
ServiceResponse<Page<StoreDTO>> storeResponse = storeApiService.listStore(storeSearchDTO, 0, storeIdList.size());
storeSearchDTO.setEnterpriseId(enterpriseId);
ServiceResponse<Page<StoreDTO>> storeResponse = storeApiService.listStore(storeSearchDTO, 1, storeIdList.size());
if (storeResponse.isSuccess()) {
Page<StoreDTO> page = storeResponse.getResult();
if (page != null) {
List<StoreDTO> storeList = page.getResult();
if (CollectionUtils.isNotEmpty(storeList)) {
storeList.forEach(temp -> wmStoreSyncLogService
.saveWmStoreSyncLog(temp.getStoreId(), enterpriseId, wmMallStoreId, type, temp.getStoreCode(), temp.getStoreName()));
.saveWmStoreSyncLog(temp.getStoreId(), wmMallStoreId, type, enterpriseId, temp.getStoreCode(), temp.getStoreName()));
}
return ServiceResponse.success();
}
......
gic-platform-enterprise-service/src/main/resources/mapper/TabBillingEnterpriseSmsPackageMapper.xml
......@@ -19,6 +19,42 @@
enterprise_sms_package_id, enterprise_id, status, create_time, update_time, sms_package_name,
sms_package_code, type, effective_date, billing_order_id, total_acount, remain_account
</sql>
<sql id="list1">
select
<include refid="Base_Column_List" />
from tab_billing_enterprise_sms_package
where enterprise_id = #{enterpriseId,jdbcType=INTEGER}
and status = 2
<if test="startDate != null and startDate != ''">
and effective_date &gt;= #{startDate}
</if>
<if test="endDate != null and endDate != ''">
and effective_date &lt;= #{endDate}
</if>
<if test="search !=null and search !=''">
and sms_package_name like concat('%',#{search},'%')
</if>
order by status, create_time desc
limit #{totalCount}
</sql>
<sql id="list2">
select
<include refid="Base_Column_List" />
from tab_billing_enterprise_sms_package
where enterprise_id = #{enterpriseId,jdbcType=INTEGER}
and status !=0
<if test="startDate != null and startDate != ''">
and effective_date &gt;= #{startDate}
</if>
<if test="endDate != null and endDate != ''">
and effective_date &lt;= #{endDate}
</if>
<if test="search !=null and search !=''">
and sms_package_name like concat('%',#{search},'%')
</if>
order by status, create_time desc
limit #{totalCount}
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
......@@ -194,8 +230,17 @@
<if test="search !=null and search !=''">
and sms_package_name like concat('%',#{search},'%')
</if>
order by create_time desc
</select>
<select id="listEnterpriseSmsPackageNoStatus" resultMap="BaseResultMap">
select <include refid="Base_Column_List" />
from
(
(<include refid="list1"/>)
union
(<include refid="list2"/>)
) t1
</select>
<select id="listSmsPackage" resultMap="BaseResultMap">
select
......
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/vo/wm/WeimobGoodsPropertyVO.java 0 → 100644
package com.gic.enterprise.web.vo.wm;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serializable;
import java.util.List;
public class WeimobGoodsPropertyVO implements Serializable{
private static final long serialVersionUID = 3151478691460341256L;
@JsonFormat(shape = JsonFormat.Shape.STRING)
private Long id;
private String title;
private List<Integer> supportModule;
private Integer sort;
public Long getId() {
return id;
}
public WeimobGoodsPropertyVO setId(Long id) {
this.id = id;
return this;
}
public String getTitle() {
return title;
}
public WeimobGoodsPropertyVO setTitle(String title) {
this.title = title;
return this;
}
public List<Integer> getSupportModule() {
return supportModule;
}
public WeimobGoodsPropertyVO setSupportModule(List<Integer> supportModule) {
this.supportModule = supportModule;
return this;
}
public Integer getSort() {
return sort;
}
public WeimobGoodsPropertyVO setSort(Integer sort) {
this.sort = sort;
return this;
}
}
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/vo/wm/WeimobOrderErLogVO.java 0 → 100644
package com.gic.enterprise.web.vo.wm;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serializable;
import java.util.Date;
public class WeimobOrderErLogVO implements Serializable{
private static final long serialVersionUID = -5110534109536620583L;
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.STRING)
private Long orderErLogId;
/**
*
*/
private Integer wmMallStoreId;
/**
*
*/
private Integer enterpriseId;
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.STRING)
private Long pid;
/**
*
*/
private Integer wmOrderType;
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.STRING)
private Long wmOrderId;
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.STRING)
private Long wmRightsId;
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.STRING)
private Long wid;
/**
*
*/
private String wmOrderMsg;
/**
*
*/
private String errInfo;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
/**
*
*/
private Integer status;
public Long getOrderErLogId() {
return orderErLogId;
}
public WeimobOrderErLogVO setOrderErLogId(Long orderErLogId) {
this.orderErLogId = orderErLogId;
return this;
}
public Integer getWmMallStoreId() {
return wmMallStoreId;
}
public WeimobOrderErLogVO setWmMallStoreId(Integer wmMallStoreId) {
this.wmMallStoreId = wmMallStoreId;
return this;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public WeimobOrderErLogVO setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
return this;
}
public Long getPid() {
return pid;
}
public WeimobOrderErLogVO setPid(Long pid) {
this.pid = pid;
return this;
}
public Integer getWmOrderType() {
return wmOrderType;
}
public WeimobOrderErLogVO setWmOrderType(Integer wmOrderType) {
this.wmOrderType = wmOrderType;
return this;
}
public Long getWmOrderId() {
return wmOrderId;
}
public WeimobOrderErLogVO setWmOrderId(Long wmOrderId) {
this.wmOrderId = wmOrderId;
return this;
}
public Long getWmRightsId() {
return wmRightsId;
}
public WeimobOrderErLogVO setWmRightsId(Long wmRightsId) {
this.wmRightsId = wmRightsId;
return this;
}
public Long getWid() {
return wid;
}
public WeimobOrderErLogVO setWid(Long wid) {
this.wid = wid;
return this;
}
public String getWmOrderMsg() {
return wmOrderMsg;
}
public WeimobOrderErLogVO setWmOrderMsg(String wmOrderMsg) {
this.wmOrderMsg = wmOrderMsg;
return this;
}
public String getErrInfo() {
return errInfo;
}
public WeimobOrderErLogVO setErrInfo(String errInfo) {
this.errInfo = errInfo;
return this;
}
public Date getCreateTime() {
return createTime;
}
public WeimobOrderErLogVO setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
public Date getUpdateTime() {
return updateTime;
}
public WeimobOrderErLogVO setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
return this;
}
public Integer getStatus() {
return status;
}
public WeimobOrderErLogVO setStatus(Integer status) {
this.status = status;
return this;
}
}
gic-platform-enterprise-web/src/main/resources/dubbo-gic-platform-enterprise-web.xml
......@@ -128,6 +128,7 @@
<dubbo:reference interface="com.gic.weimob.api.service.WeimobStoreSiteService" id="weimobStoreSiteService" timeout="6000"/>
<dubbo:reference interface="com.gic.weimob.api.service.WeimobMerchantService" id="weimobMerchantService" timeout="6000"/>
<dubbo:reference interface="com.gic.weimob.api.service.WeimobOrderService" id="weimobOrderService" timeout="6000"/>
<dubbo:reference interface="com.gic.weimob.api.service.WeimobMemberService" id="weimobMemberService" timeout="6000"/>
<dubbo:reference interface="com.gic.weimob.api.service.WeimobBaseService" id="weimobBaseService" timeout="6000"/>
<dubbo:reference interface="com.gic.marketing.api.service.coupon.MemberCouponApiService" id="memberCouponApiService" timeout="6000"/>
......@@ -135,4 +136,7 @@
<dubbo:reference interface="com.gic.store.service.ClerkApiService" id="clerkApiService" timeout="60000" />
<dubbo:reference interface="com.gic.goods.pump.api.service.WeiMobGoodsService" id="weiMobGoodsService" timeout="60000" />
<dubbo:reference interface="com.gic.member.config.api.service.OrderPointCalculationPartyApiService" id="orderPointCalculationPartyApiService" timeout="60000" />
<dubbo:reference interface="com.gic.open.api.service.EnterpriseLicenseApiService" id="enterpriseLicenseApiService" timeout="6000" retries="0"/>
</beans>
gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/LoginController.java
......@@ -119,6 +119,11 @@ public class LoginController {
ServiceResponse<Integer> saveResult = userApiService.saveOperationUser(temp);
user = temp;
user.setUserId(saveResult.getResult());
} else {
//更新运营人名称
if (!user.getUserName().equals(userDetailsVO.getRealName())) {
userApiService.updateOperationUser(user.getUserId(), userDetailsVO.getRealName());
}
}
//gic用户信息塞入
......
gic-platform-operation-web/src/main/java/com/gic/operation/web/vo/MenuDetailVO.java
package com.gic.operation.web.vo;
import com.gic.auth.dto.MenuAuthDepartDTO;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
......@@ -79,6 +82,16 @@ public class MenuDetailVO implements Serializable{
*/
private Integer adminOnlySign;
/**
* 1:管理员权限集 2:商户级超管及达摩侧人员 3:仅达摩侧人员
*/
private Integer authType;
/**
* 部门职位
*/
private List<MenuAuthDepartDTO> menuAuthDepartList;
public Integer getMenuId() {
return menuId;
}
......@@ -190,4 +203,22 @@ public class MenuDetailVO implements Serializable{
public void setAdminOnlySign(Integer adminOnlySign) {
this.adminOnlySign = adminOnlySign;
}
public Integer getAuthType() {
return authType;
}
public MenuDetailVO setAuthType(Integer authType) {
this.authType = authType;
return this;
}
public List<MenuAuthDepartDTO> getMenuAuthDepartList() {
return menuAuthDepartList;
}
public MenuDetailVO setMenuAuthDepartList(List<MenuAuthDepartDTO> menuAuthDepartList) {
this.menuAuthDepartList = menuAuthDepartList;
return this;
}
}
gic-platform-operation-web/src/main/java/com/gic/operation/web/vo/MenuOperationItemListVO.java
package com.gic.operation.web.vo;
import com.gic.auth.dto.MenuAuthDepartDTO;
import java.io.Serializable;
import java.util.List;
/**
* 操作项列表
* @ClassName: MenuOperationItemListVO

......@@ -36,6 +40,16 @@ public class MenuOperationItemListVO implements Serializable{
*/
private Integer adminOnlySign;
/**
* 1:管理员权限集 2:商户级超管及达摩侧人员 3:仅达摩侧人员
*/
private Integer authType;
/**
* 部门职位
*/
private List<MenuAuthDepartDTO> menuAuthDepartList;
public Integer getMenuId() {
return menuId;
}
......@@ -91,4 +105,22 @@ public class MenuOperationItemListVO implements Serializable{
public void setAdminOnlySign(Integer adminOnlySign) {
this.adminOnlySign = adminOnlySign;
}
public Integer getAuthType() {
return authType;
}
public MenuOperationItemListVO setAuthType(Integer authType) {
this.authType = authType;
return this;
}
public List<MenuAuthDepartDTO> getMenuAuthDepartList() {
return menuAuthDepartList;
}
public MenuOperationItemListVO setMenuAuthDepartList(List<MenuAuthDepartDTO> menuAuthDepartList) {
this.menuAuthDepartList = menuAuthDepartList;
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