Skip to content

G
gic-store
Commit 832e2050 by 陶光胜
Options

Merge branch 'developer' into 'master' 

Developer

See merge request !14
parents 1cae458b a0fcf68a
Showing with 138 additions and 19 deletions
gic-store-api/src/main/java/com/gic/store/dto/ClerkLogDTO.java
......@@ -71,6 +71,8 @@ public class ClerkLogDTO implements Serializable {
*
*/
private String operatorName;
private String startTime;
private String endTime;
public Integer getClerkLogId() {
return clerkLogId;
......@@ -167,4 +169,20 @@ public class ClerkLogDTO implements Serializable {
public void setOperatorName(String operatorName) {
this.operatorName = operatorName;
}
public void setStartTime(String startTime) {
this.startTime = startTime;
}
public String getStartTime() {
return startTime;
}
public void setEndTime(String endTime) {
this.endTime = endTime;
}
public String getEndTime() {
return endTime;
}
}
gic-store-api/src/main/java/com/gic/store/dto/StoreLogDTO.java
......@@ -70,6 +70,8 @@ public class StoreLogDTO implements Serializable {
*
*/
private String operatorName;
private String startTime;
private String endTime;
public Integer getStoreLogId() {
return storeLogId;
......@@ -166,4 +168,20 @@ public class StoreLogDTO implements Serializable {
public void setOperatorName(String operatorName) {
this.operatorName = operatorName;
}
public void setStartTime(String startTime) {
this.startTime = startTime;
}
public String getStartTime() {
return startTime;
}
public void setEndTime(String endTime) {
this.endTime = endTime;
}
public String getEndTime() {
return endTime;
}
}
gic-store-api/src/main/java/com/gic/store/service/StoreDictApiService.java
......@@ -77,6 +77,15 @@ public interface StoreDictApiService {
ServiceResponse saveStoreStatusAndStoreType(Integer enterpriseId, String[] storeStatusArr, String[] storeTypeArr);
/**
* @Title: saveStoreStatusAndStoreTypeCallback
* @Description: 审批回调
* @author zhiwj
* @param json
* @return com.gic.api.base.commons.ServiceResponse
* @throws
*/
ServiceResponse saveStoreStatusAndStoreTypeCallback(String json);
/**
* 查询支持列表查询的自定义字段
* @param enterpriseId
* @return
......
gic-store-service/src/main/java/com/gic/store/service/impl/ClerkServiceImpl.java
......@@ -68,6 +68,8 @@ public class ClerkServiceImpl implements ClerkService {
tabClerk.setClerkGender(copy.getClerkGender());
tabClerk.setNationcode(copy.getNationcode());
tabClerk.setPhoneNumber(copy.getPhoneNumber());
tabClerk.setClerkType(copy.getClerkType());
tabClerk.setHeadImg(copy.getHeadImg());
tabClerk.setCreateTime(new Date());
tabClerk.setStatus(StoreEnableOrDisAbleEnum.ENABLE.getCode());
tabClerkMapper.insertSelective(tabClerk);
......
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java
......@@ -254,10 +254,12 @@ public class StoreApiServiceImpl implements StoreApiService {
ServiceResponse<List<EnterpriseLicenseDTO>> listEnterpriseLicense = this.enterpriseApiService.listEnterpriseLicense(enterpriseId);
if (listEnterpriseLicense.isSuccess() && CollectionUtils.isNotEmpty(listEnterpriseLicense.getResult())) {
if (listEnterpriseLicense.getResult().size() == 4) {
Integer currCount = this.storeService.countByOverflowStatus(enterpriseId, 1);
Integer currCount = this.storeService.countByOverflowStatus(enterpriseId, 0);
Integer upperLimit = listEnterpriseLicense.getResult().get(3).getUpperLimit();
if (currCount + storeIds.split(",").length > upperLimit) {
return EnterpriseServiceResponse.failure(ErrorCode.UNKNOWN_ERROR.getCode(), String.format("本商户剩余门店数量为%s家， 请重新勾选正确的数量!", upperLimit));
// 剩余数量
int remainingCount = upperLimit - currCount;
if (storeIds.split(",").length > remainingCount) {
return EnterpriseServiceResponse.failure(ErrorCode.UNKNOWN_ERROR.getCode(), String.format("本商户剩余门店数量为%s家， 请重新勾选正确的数量!", remainingCount));
}
List<Integer> storeIdList;
if ("all".equals(storeIds)) {
......@@ -268,7 +270,7 @@ public class StoreApiServiceImpl implements StoreApiService {
for (Integer storeId : storeIdList) {
StoreDTO store = this.getStoreById(enterpriseId, storeId).getResult();
if (store != null) {
store.setOverflowStatus(1);
store.setOverflowStatus(0);
saveOrUpdate(store);
}
}
......
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreDictApiServiceImpl.java
package com.gic.store.service.outer.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.bizdict.api.dto.BizdictDTO;
import com.gic.bizdict.api.service.BizdictService;
......@@ -18,6 +20,8 @@ import com.gic.store.service.StoreFieldService;
import com.gic.store.utils.StoreRedisKeyUtils;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -26,10 +30,12 @@ import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@Service("storeDictApiService")
public class StoreDictApiServiceImpl implements StoreDictApiService {
private Logger logger = LogManager.getLogger(StoreDictApiServiceImpl.class);
@Autowired
private StoreDictService storeDictService;
@Autowired
......@@ -151,6 +157,22 @@ public class StoreDictApiServiceImpl implements StoreDictApiService {
}
@Override
public ServiceResponse saveStoreStatusAndStoreTypeCallback(String json) {
JSONObject jsonObject = JSON.parseObject(json);
logger.info("审批回调结果：{}", json);
// 审批结果 1:通过 2:不通过
Integer auditResult = jsonObject.getInteger("auditResult");
if (Integer.valueOf(1).equals(auditResult)) {
// 审批通过
ServiceResponse serviceResponse = saveStoreStatusAndStoreType(
jsonObject.getInteger("enterpriseId"), jsonObject.getString("storeStatus").split(","), jsonObject.getString("storeType").split(","));
}
return ServiceResponse.failure(ErrorCode.OPERATION_FAILED.getCode(), "审批未通过");
}
@Override
public ServiceResponse<List<StoreDictDTO>> listStoreField(Integer enterpriseId) {
return listStoreField(enterpriseId, false);
}
......
gic-store-service/src/main/resources/mapper/TabClerkLogMapper.xml
......@@ -191,6 +191,12 @@
<if test="content != null and content != '' ">
and content like concat('%', #{content}, '%')
</if>
<if test="startTime != null and startTime != '' ">
and start_time &gt;= #{startTime}
</if>
<if test="endTime != null and endTime != '' ">
and end_time &lt;= #{endTime}
</if>
order by create_time desc
</select>
</mapper>
\ No newline at end of file
gic-store-service/src/main/resources/mapper/TabStoreLogMapper.xml
......@@ -191,6 +191,12 @@
<if test="content != null and content != '' ">
and content like concat('%', #{content}, '%')
</if>
<if test="startTime != null and startTime != '' ">
and start_time &gt;= #{startTime}
</if>
<if test="endTime != null and endTime != '' ">
and end_time &lt;= #{endTime}
</if>
order by create_time desc
</select>
</mapper>
\ No newline at end of file
gic-store-web/src/main/java/com/gic/store/web/controller/ClerkController.java
......@@ -18,7 +18,10 @@ import com.gic.enterprise.service.QrCodeApiService;
import com.gic.enterprise.utils.ResultControllerUtils;
import com.gic.enterprise.utils.UserDetailUtils;
import com.gic.store.constant.ClerkLogReasonEnum;
import com.gic.store.dto.*;
import com.gic.store.dto.ClerkDTO;
import com.gic.store.dto.ClerkLogDTO;
import com.gic.store.dto.ClerkSearchDTO;
import com.gic.store.dto.ClerkStoreListDTO;
import com.gic.store.service.ClerkApiService;
import com.gic.store.service.ClerkLogApiService;
import com.gic.store.web.qo.PageQO;
......@@ -27,7 +30,7 @@ import com.gic.store.web.qo.store.ClerkQrcodeQO;
import com.gic.wechat.business.api.service.fwh.WeixinBaseFunService;
import com.gic.wechat.business.api.service.wxa.WeixinWxaFunService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -293,12 +296,18 @@ public class ClerkController extends DownloadUtils {
}
@RequestMapping("/list-clerk-log")
public RestResponse listClerkLog(PageQO pageQO, String content, Integer reason, Integer logType, Integer clerkId) {
public RestResponse listClerkLog(PageQO pageQO, String search, Integer reason, Integer logType, Integer clerkId, String startTime, String endTime) {
ClerkLogDTO clerkLogDTO = new ClerkLogDTO();
clerkLogDTO.setContent(content);
clerkLogDTO.setContent(search);
clerkLogDTO.setReason(reason);
clerkLogDTO.setLogType(logType);
clerkLogDTO.setClerkId(clerkId);
if (StringUtils.isNotBlank(startTime)) {
clerkLogDTO.setStartTime(startTime + " 00:00:00");
}
if (StringUtils.isNotBlank(endTime)) {
clerkLogDTO.setEndTime(endTime + " 23:59:59");
}
ServiceResponse<Page<ClerkLogDTO>> response = clerkLogApiService.listClerkLog(clerkLogDTO, pageQO.getCurrentPage(), pageQO.getPageSize());
return ResultControllerUtils.commonResult(response);
}
......
gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java
......@@ -306,12 +306,19 @@ public class StoreController extends DownloadUtils {
// return EnterpriseRestResponse.failure(response);
// }
@RequestMapping("list-store-log")
public RestResponse listStoreLog(com.gic.enterprise.qo.PageQO pageQO, String content, Integer reason, Integer logType, Integer storeId) {
public RestResponse listStoreLog(com.gic.enterprise.qo.PageQO pageQO, String content, Integer reason, Integer logType, Integer storeId, String startTime, String endTime) {
StoreLogDTO storeLog = new StoreLogDTO();
storeLog.setContent(content);
storeLog.setReason(reason);
storeLog.setLogType(logType);
storeLog.setStoreId(storeId);
if (StringUtils.isNotBlank(startTime)) {
storeLog.setStartTime(startTime + " 00:00:00");
}
if (StringUtils.isNotBlank(endTime)) {
storeLog.setEndTime(endTime + " 23:59:59");
}
ServiceResponse<Page<StoreLogDTO>> response = storeLogApiService.listStoreLog(storeLog, pageQO.getCurrentPage(), pageQO.getPageSize());
return ResultControllerUtils.commonResult(response);
}
......
gic-store-web/src/main/java/com/gic/store/web/controller/StoreDictController.java
......@@ -11,6 +11,7 @@ import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.response.EnterpriseRestResponse;
import com.gic.enterprise.service.AuditLogApiService;
import com.gic.enterprise.service.EnterpriseInitApiService;
import com.gic.enterprise.utils.ResultControllerUtils;
import com.gic.enterprise.utils.UserDetailUtils;
import com.gic.redis.data.util.RedisUtil;
import com.gic.store.constant.StoreESFieldsEnum;
......@@ -39,6 +40,7 @@ public class StoreDictController {
@Autowired
private AuditLogApiService auditLogApiService;
@RequestMapping("list-all-businesscategory")
@ResponseBody
public Object listAllBusinessCategory(){
......@@ -134,15 +136,31 @@ public class StoreDictController {
@RequestMapping("save-status-type")
@ResponseBody
public RestResponse saveStoreStatusAndStoreType(String storeStatus, String storeType){
Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
ServiceResponse serviceResponse = this.storeDictApiService.saveStoreStatusAndStoreType(enterpriseId, storeStatus.split(","), storeType.split(","));
if(serviceResponse.isSuccess()){
LogUtils.createLog("配置商户门店类型和门店状态", "门店状态和门店类型");
this.enterpriseInitApiService.setStoreStatusAndType(enterpriseId);
return RestResponse.success();
}else {
return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
}
AuditLogDTO auditLogDTO = new AuditLogDTO();
// 商户id
auditLogDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
// 申请人id
auditLogDTO.setApplyUserId(UserDetailUtils.getUserDetail().getUserId());
// 申请的受审项 在运营平台配置
auditLogDTO.setProjectItemCode(Constants.PROJECT_ITEM_SAVE_STATUS_TYPE_APPLY);
// 额外信息 必须是json
JSONObject jsonObject = new JSONObject();
// 自定义的信息
jsonObject.put("enterpriseId", UserDetailUtils.getUserDetail().getEnterpriseId());
jsonObject.put("storeStatus", storeStatus);
jsonObject.put("storeType", storeType);
auditLogDTO.setExtraInfo(jsonObject.toJSONString());
ServiceResponse<Void> serviceResponse = auditLogApiService.apply(auditLogDTO);
return ResultControllerUtils.commonResult(serviceResponse);
// Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
// ServiceResponse serviceResponse = this.storeDictApiService.saveStoreStatusAndStoreType(enterpriseId, storeStatus.split(","), storeType.split(","));
// if(serviceResponse.isSuccess()){
// LogUtils.createLog("配置商户门店类型和门店状态", "门店状态和门店类型");
// this.enterpriseInitApiService.setStoreStatusAndType(enterpriseId);
// return RestResponse.success();
// }else {
// return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
// }
}
......
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