Compare commits

..

8 Commits

  1. 73
      bweb/src/main/java/com/bweb/controller/BsGasOrderReceiptController.java
  2. 199
      bweb/src/main/java/com/bweb/controller/CmsController.java
  3. 1
      cweb/src/main/java/com/cweb/config/AuthConfig.java
  4. 24
      cweb/src/main/java/com/cweb/controller/BsDiscountUserController.java
  5. 20
      cweb/src/main/java/com/cweb/controller/BsGasController.java
  6. 61
      cweb/src/main/java/com/cweb/controller/CmsController.java
  7. 119
      openapi/src/main/java/com/openapi/controller/BsGasController.java
  8. 125
      service/src/main/java/com/hfkj/dao/CmsContentMapper.java
  9. 7
      service/src/main/java/com/hfkj/dao/CmsContentMapperExt.java
  10. 332
      service/src/main/java/com/hfkj/dao/CmsContentSqlProvider.java
  11. 232
      service/src/main/java/com/hfkj/entity/CmsContent.java
  12. 1003
      service/src/main/java/com/hfkj/entity/CmsContentExample.java
  13. 7
      service/src/main/java/com/hfkj/model/GasListModel.java
  14. 59
      service/src/main/java/com/hfkj/model/order/ExportGasOrderReceiptModel.java
  15. 48
      service/src/main/java/com/hfkj/openapi/model/request/RequestQueryGasListModel.java
  16. 35
      service/src/main/java/com/hfkj/service/CmsContentService.java
  17. 3
      service/src/main/java/com/hfkj/service/gas/impl/BsGasOrderReceiptServiceImpl.java
  18. 64
      service/src/main/java/com/hfkj/service/impl/CmsContentServiceImpl.java
  19. 18
      service/src/main/java/com/hfkj/service/order/OrderRefundBusiness.java
  20. 48
      service/src/main/java/com/hfkj/sysenum/cms/CmsStatusEnum.java
  21. 36
      service/src/main/java/com/hfkj/sysenum/cms/CmsTypeEnum.java
  22. 16
      service/src/main/java/com/hfkj/sysenum/gas/GasOrderReceiptStatusEnum.java

@ -1,5 +1,6 @@
package com.bweb.controller;
import com.alibaba.excel.EasyExcel;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
@ -8,14 +9,19 @@ import com.hfkj.common.exception.ErrorHelp;
import com.hfkj.common.exception.SysCode;
import com.hfkj.common.security.UserCenter;
import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.config.CommonSysConst;
import com.hfkj.entity.BsAgentMer;
import com.hfkj.entity.BsGasOrderReceipt;
import com.hfkj.model.AgentMerAllot;
import com.hfkj.model.ResponseData;
import com.hfkj.model.SecUserSessionObject;
import com.hfkj.model.UserSessionObject;
import com.hfkj.model.order.ExportGasOrderModel;
import com.hfkj.model.order.ExportGasOrderReceiptModel;
import com.hfkj.service.agent.BsAgentMerService;
import com.hfkj.service.gas.BsGasOrderReceiptService;
import com.hfkj.sysenum.SecUserObjectTypeEnum;
import com.hfkj.sysenum.gas.GasOrderReceiptStatusEnum;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.MapUtils;
@ -26,6 +32,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.File;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
@ -127,4 +134,70 @@ public class BsGasOrderReceiptController {
}
@RequestMapping(value="/export",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "导出")
public ResponseData export(@RequestParam(name = "orderNo", required = false) String orderNo,
@RequestParam(name = "merName", required = false) String merName,
@RequestParam(name = "contactsPhone", required = false) String contactsPhone,
@RequestParam(name = "status", required = false) Integer status,
@RequestParam(name = "createTimeS", required = false) Long createTimeS,
@RequestParam(name = "createTimeE", required = false) Long createTimeE) {
try {
Map<String,Object> param = new HashMap<>();
SecUserSessionObject sessionObject = userCenter.getSessionModel(SecUserSessionObject.class);
if (sessionObject.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type1.getCode())) {
} else if (sessionObject.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type4.getCode())) {
param.put("agentId", sessionObject.getAccount().getObjectId());
} else if (sessionObject.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type5.getCode())) {
param.put("agentStaffId", sessionObject.getAccount().getObjectId());
} else {
throw ErrorHelp.genException(SysCode.System, ErrorCode.ROLE_NOT_PERMISSIONS, "");
}
param.put("orderNo", orderNo);
param.put("merName", merName);
param.put("contactsPhone", contactsPhone);
param.put("status", status);
param.put("createTimeS", createTimeS);
param.put("createTimeE", createTimeE);
// 查询数据
List<BsGasOrderReceipt> dataList = gasOrderReceiptService.getList(param);
List<ExportGasOrderReceiptModel> exportList = new ArrayList<>();
ExportGasOrderReceiptModel exportModel;
for (BsGasOrderReceipt data : dataList) {
exportModel = new ExportGasOrderReceiptModel();
exportModel.setOrderNo(data.getOrderNo());
exportModel.setMerName(data.getMerName());
exportModel.setOilNo(data.getOilNo());
exportModel.setCompanyName(data.getCompanyName());
exportModel.setTaxNo(data.getTaxNo());
exportModel.setAmount(data.getAmount());
exportModel.setContactsPhone(data.getContactsPhone());
exportModel.setEmail(data.getEmail());
exportModel.setCreateTime(data.getCreateTime());
exportModel.setStatus(GasOrderReceiptStatusEnum.getNameByType(data.getStatus()).getManageName());
exportList.add(exportModel);
}
String fileUrl = CommonSysConst.getSysConfig().getFilesystem() + "/temporary/";
String pathName = System.currentTimeMillis()+".xlsx";
File file = new File(fileUrl);
if (!file.exists()) {
file.mkdirs();
}
EasyExcel.write(fileUrl+pathName)
.head(ExportGasOrderReceiptModel.class)
.sheet("加油订单开票")
.doWrite(exportList);
return ResponseMsgUtil.success(pathName);
} catch (Exception e) {
log.error("error!",e);
return ResponseMsgUtil.exception(e);
}
}
}

@ -0,0 +1,199 @@
package com.bweb.controller;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.hfkj.common.exception.ErrorCode;
import com.hfkj.common.exception.ErrorHelp;
import com.hfkj.common.exception.SysCode;
import com.hfkj.common.utils.RedisUtil;
import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.entity.CmsContent;
import com.hfkj.model.ResponseData;
import com.hfkj.service.CmsContentService;
import com.hfkj.service.impl.CmsContentServiceImpl;
import com.hfkj.sysenum.cms.CmsStatusEnum;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @className: CmsController
* @author: HuRui
* @date: 2024/9/24
**/
@Controller
@RequestMapping(value = "/cms")
@Api(value = "CMS")
public class CmsController {
private static Logger log = LoggerFactory.getLogger(CmsController.class);
@Resource
private CmsContentService cmsContentService;
@Resource
private RedisUtil redisUtil;
@RequestMapping(value="/edit",method = RequestMethod.POST)
@ResponseBody
@ApiOperation(value = "编辑")
public ResponseData edit(@RequestBody CmsContent body) {
try {
if (body == null
|| body.getType() == null
|| StringUtils.isBlank(body.getImgUrl())
|| body.getJumpType() == null
|| StringUtils.isBlank(body.getJumpUrl())
) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR);
}
CmsContent cmsContent = null;
if (body.getId() != null) {
// 查询内容
cmsContent = cmsContentService.getDetail(body.getId());
if (cmsContent == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到数据");
}
if (!CmsStatusEnum.status1.getStatus().equals(cmsContent.getStatus())) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "无法编辑,状态错误");
}
} else {
cmsContent = new CmsContent();
cmsContent.setStatus(CmsStatusEnum.status1.getStatus());
}
cmsContent.setType(body.getType());
cmsContent.setImgUrl(body.getImgUrl());
cmsContent.setJumpType(body.getJumpType());
cmsContent.setJumpUrl(body.getJumpUrl());
cmsContentService.editData(cmsContent);
return ResponseMsgUtil.success("操作成功");
} catch (Exception e) {
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/online",method = RequestMethod.POST)
@ResponseBody
@ApiOperation(value = "上线")
public ResponseData online(@RequestBody CmsContent body) {
try {
if (body == null || body.getId() == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR);
}
// 查询内容
CmsContent cmsContent = cmsContentService.getDetail(body.getId());
if (cmsContent == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到数据");
}
if (!CmsStatusEnum.status1.getStatus().equals(cmsContent.getStatus())) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "无法上线,状态错误");
}
cmsContent.setStatus(CmsStatusEnum.status2.getStatus());
cmsContentService.editData(cmsContent);
// 删除缓存
redisUtil.hdel(CmsContentServiceImpl.CACHE_CMS_ONLINE, ""+cmsContent.getType());
return ResponseMsgUtil.success("操作成功");
} catch (Exception e) {
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/offline",method = RequestMethod.POST)
@ResponseBody
@ApiOperation(value = "下线")
public ResponseData offline(@RequestBody CmsContent body) {
try {
if (body == null || body.getId() == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR);
}
// 查询内容
CmsContent cmsContent = cmsContentService.getDetail(body.getId());
if (cmsContent == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到数据");
}
if (!CmsStatusEnum.status2.getStatus().equals(cmsContent.getStatus())) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "无法下线,状态错误");
}
cmsContent.setStatus(CmsStatusEnum.status3.getStatus());
cmsContentService.editData(cmsContent);
// 删除缓存
redisUtil.hdel(CmsContentServiceImpl.CACHE_CMS_ONLINE, ""+cmsContent.getType());
return ResponseMsgUtil.success("操作成功");
} catch (Exception e) {
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/delete",method = RequestMethod.POST)
@ResponseBody
@ApiOperation(value = "删除")
public ResponseData delete(@RequestBody CmsContent body) {
try {
if (body == null || body.getId() == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR);
}
// 查询内容
CmsContent cmsContent = cmsContentService.getDetail(body.getId());
if (cmsContent == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到数据");
}
if (!CmsStatusEnum.status1.getStatus().equals(cmsContent.getStatus())) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "无法删除,状态错误");
}
cmsContent.setStatus(CmsStatusEnum.status0.getStatus());
cmsContentService.editData(cmsContent);
return ResponseMsgUtil.success("操作成功");
} catch (Exception e) {
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/getDetail",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "查询详情")
public ResponseData getDetail(@RequestParam(name = "id", required = true) Long id) {
try {
return ResponseMsgUtil.success(cmsContentService.getDetail(id));
} catch (Exception e) {
return ResponseMsgUtil.exception(e);
}
}
@RequestMapping(value="/queryList",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "查询列表")
public ResponseData queryList(@RequestParam(name = "name", required = false) String name,
@RequestParam(name = "type", required = false) Integer type,
@RequestParam(name = "status", required = false) Integer status,
@RequestParam(name = "pageNum", required = true) Integer pageNum,
@RequestParam(name = "pageSize", required = true) Integer pageSize) {
try {
Map<String,Object> param = new HashMap<>();
param.put("name", name);
param.put("type", type);
param.put("status", status);
PageHelper.startPage(pageNum, pageSize);
return ResponseMsgUtil.success(new PageInfo<>(cmsContentService.getList(param)));
} catch (Exception e) {
return ResponseMsgUtil.exception(e);
}
}
}

@ -97,6 +97,7 @@ public class AuthConfig implements WebMvcConfigurer {
.excludePathPatterns("/pay/*")
.excludePathPatterns("/user/*")
.excludePathPatterns("/notify/*")
.excludePathPatterns("/cms/*")
;
}

@ -10,10 +10,7 @@ import com.hfkj.common.security.UserCenter;
import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.entity.BsAgentPrice;
import com.hfkj.entity.BsDiscountUser;
import com.hfkj.model.DiscountUserModel;
import com.hfkj.model.GasListModel;
import com.hfkj.model.ResponseData;
import com.hfkj.model.UserSessionObject;
import com.hfkj.model.*;
import com.hfkj.service.agent.BsAgentPriceService;
import com.hfkj.service.discount.BsDiscountService;
import com.hfkj.service.discount.BsDiscountUserService;
@ -70,21 +67,10 @@ public class BsDiscountUserController {
PageHelper.startPage(pageNum,pageSize);
PageInfo<GasListModel> pageInfo = new PageInfo<>(gasService.getGasListByDiscount(discountNo,longitude, latitude, oilNo, gasName, distanceLimit, true));
for (GasListModel gas : pageInfo.getList()) {
BigDecimal discount = new BigDecimal("100");
if (agentMerId != null) {
// 查询代理价格
BsAgentPrice agentPrice = agentPriceService.getDetail(agentMerId, gas.getOilNo());
if (agentPrice != null) {
discount = agentPrice.getPriceRate();
}
} else {
// 查询平台价格
BsAgentPrice agentPrice = agentPriceService.getDetail(AgentPriceTypeEnum.type1, gas.getMerNo(), gas.getOilNo());
if (agentPrice != null) {
discount = agentPrice.getPriceRate();
}
}
gas.setPriceVip(gas.getPriceVip().multiply(discount.divide(new BigDecimal("100"))).setScale(2, BigDecimal.ROUND_HALF_UP));
// 计算优惠
GasPayPriceModel compute = gasService.refuelPriceCompute(new BigDecimal("100"), gas.getMerNo(), oilNo, agentMerId, null);
gas.setPriceVip(compute.getPricePlatform());
gas.setOilDiscount(compute.getTotalPreferences().compareTo(new BigDecimal("0")) > 0 ? Arrays.asList("加100省"+ compute.getTotalPreferences()) : new ArrayList<>());
}
return ResponseMsgUtil.success(pageInfo);

@ -3,6 +3,7 @@ package com.cweb.controller;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.google.common.collect.Maps;
import com.hfkj.channel.gas.newlink.NewLinkGasService;
import com.hfkj.channel.gas.newlink.NewLinkRequestService;
import com.hfkj.channel.gas.shell.CqShellPetroleumGasService;
@ -127,21 +128,10 @@ public class BsGasController {
PageInfo<GasListModel> pageInfo = new PageInfo<>(gasService.getGasList(longitude, latitude, oilNo, gasName, distanceLimit, true));
for (GasListModel gas : pageInfo.getList()) {
BigDecimal discount = new BigDecimal("100");
if (agentMerId != null) {
// 查询代理价格
BsAgentPrice agentPrice = agentPriceService.getDetail(agentMerId, gas.getOilNo());
if (agentPrice != null) {
discount = agentPrice.getPriceRate();
}
} else {
// 查询平台价格
BsAgentPrice agentPrice = agentPriceService.getDetail(AgentPriceTypeEnum.type1, gas.getMerNo(), gas.getOilNo());
if (agentPrice != null) {
discount = agentPrice.getPriceRate();
}
}
gas.setPriceVip(gas.getPriceVip().multiply(discount.divide(new BigDecimal("100"))).setScale(2, BigDecimal.ROUND_HALF_UP));
// 计算优惠
GasPayPriceModel compute = gasService.refuelPriceCompute(new BigDecimal("100"), gas.getMerNo(), oilNo, agentMerId, null);
gas.setPriceVip(compute.getPricePlatform());
gas.setOilDiscount(compute.getTotalPreferences().compareTo(new BigDecimal("0")) > 0 ? Arrays.asList("加100省"+ compute.getTotalPreferences()) : new ArrayList<>());
}
return ResponseMsgUtil.success(pageInfo);

@ -0,0 +1,61 @@
package com.cweb.controller;
import com.hfkj.common.utils.RedisUtil;
import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.entity.CmsContent;
import com.hfkj.model.ResponseData;
import com.hfkj.service.CmsContentService;
import com.hfkj.service.impl.CmsContentServiceImpl;
import com.hfkj.sysenum.cms.CmsStatusEnum;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @className: CmsController
* @author: HuRui
* @date: 2024/9/24
**/
@Controller
@RequestMapping(value = "/cms")
@Api(value = "CMS")
public class CmsController {
private static Logger log = LoggerFactory.getLogger(CmsController.class);
@Resource
private CmsContentService cmsContentService;
@Resource
private RedisUtil redisUtil;
@RequestMapping(value="/query",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "查询列表")
public ResponseData query(@RequestParam(name = "type", required = true) Integer type) {
try {
// 读取缓存
Object cacheObj = redisUtil.hget(CmsContentServiceImpl.CACHE_CMS_ONLINE, "" + type);
if (cacheObj != null) {
return ResponseMsgUtil.success(cacheObj);
}
Map<String,Object> param = new HashMap<>();
param.put("type", type);
param.put("status", CmsStatusEnum.status2.getStatus());
List<CmsContent> list = cmsContentService.getList(param);
// 缓存
redisUtil.hset(CmsContentServiceImpl.CACHE_CMS_ONLINE, "" + type, list);
return ResponseMsgUtil.success(list);
} catch (Exception e) {
return ResponseMsgUtil.exception(e);
}
}
}

@ -0,0 +1,119 @@
package com.openapi.controller;
import com.alibaba.fastjson.JSONObject;
import com.hfkj.common.exception.ErrorCode;
import com.hfkj.common.exception.ErrorHelp;
import com.hfkj.common.exception.SysCode;
import com.hfkj.common.pay.util.SignatureUtil;
import com.hfkj.common.utils.DateUtil;
import com.hfkj.common.utils.PageUtil;
import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.entity.BsAgentApiLogWithBLOBs;
import com.hfkj.entity.BsAgentApiParam;
import com.hfkj.entity.BsDiscountUser;
import com.hfkj.model.ResponseData;
import com.hfkj.openapi.model.request.RequestPushDiscountModel;
import com.hfkj.openapi.model.request.RequestPushPkDiscountModel;
import com.hfkj.openapi.model.request.RequestQueryCodeModel;
import com.hfkj.openapi.model.request.RequestQueryGasListModel;
import com.hfkj.openapi.model.response.ResponsePushDiscountModel;
import com.hfkj.openapi.model.response.ResponsePushDiscountPkModel;
import com.hfkj.openapi.model.response.ResponseQueryCodeModel;
import com.hfkj.service.agent.BsAgentApiLogService;
import com.hfkj.service.agent.BsAgentApiParamService;
import com.hfkj.service.agent.BsAgentDiscountService;
import com.hfkj.service.discount.BsDiscountUserService;
import com.hfkj.service.gas.BsGasService;
import com.hfkj.service.merchant.BsMerchantService;
import com.hfkj.sysenum.discount.DiscountStockCodeObtainTypeEnum;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Controller
@RequestMapping(value = "/gas")
@Api(value = "油站管理")
public class BsGasController {
private static Logger log = LoggerFactory.getLogger(BsGasController.class);
@Resource
private BsAgentApiParamService agentApiParamService;
@Resource
private BsGasService gasService;
@Resource
private BsAgentApiLogService agentApiLogService;
@RequestMapping(value="/queryList",method = RequestMethod.POST)
@ResponseBody
@ApiOperation(value = "分页获取(全量)油站信息")
public ResponseData queryList(@Validated @RequestBody RequestQueryGasListModel body) {
log.info("========= Start 分页获取(全量)油站信息 Start ===========");
log.info("请求参数:" + JSONObject.toJSONString(body));
BsAgentApiLogWithBLOBs apiLog = new BsAgentApiLogWithBLOBs();
try {
// 验证签名
BsAgentApiParam apiParam = agentApiParamService.getParamByAppId(body.getAppId());
if (!SignatureUtil.checkSign(body.getSign(), body, apiParam.getAppSecret())) {
throw ErrorHelp.genException(SysCode.OpenApi, ErrorCode.OPEN_API_SIGN_ERR, "");
}
// 验证请求id
if (agentApiLogService.isExist(body.getAppId(), body.getReqId())) {
throw ErrorHelp.genException(SysCode.OpenApi, ErrorCode.OPEN_API_REQ_ID_ERR, "");
}
apiLog.setAppId(body.getAppId());
apiLog.setRequestId(body.getReqId());
apiLog.setRequestUrl("gas/queryList");
apiLog.setRequestParam(JSONObject.toJSONString(body));
List<Map<String,Object>> codeMapList = new ArrayList<>();
/*for (BsDiscountUser discountUser : codeDataList) {
Map<String,Object> codeMap = new HashMap<>();
codeMap.put("discountNo", discountUser.getDiscountNo());
codeMap.put("phone", discountUser.getUserPhone());
codeMap.put("code", discountUser.getDiscountStockCode());
codeMap.put("status", discountUser.getStatus());
codeMap.put("createTime", DateUtil.date2String(discountUser.getCreateTime(), DateUtil.Y_M_D_HMS));
codeMap.put("expirationDate", DateUtil.date2String(discountUser.getExpirationDate(), DateUtil.Y_M_D_HMS));
codeMapList.add(codeMap);
}*/
ResponsePushDiscountModel response = new ResponsePushDiscountModel();
response.setReqId(body.getReqId());
response.setAppId(body.getAppId());
response.setCodeList(codeMapList);
response.setSign(SignatureUtil.createSign(response, agentApiParamService.getParamByAppId(body.getAppId()).getAppSecret()));
log.info("返回参数:" + JSONObject.toJSONString(response));
apiLog.setResponseParam(JSONObject.toJSONString(response));
return ResponseMsgUtil.success(response);
} catch (Exception e) {
log.info("出现异常:", e);
// 异常内容
ResponseData exception = ResponseMsgUtil.exception(e);
apiLog.setErrorContent(JSONObject.toJSONString(exception));
return exception;
} finally {
// 记录日志
if (apiLog.getAppId() != null) {
agentApiLogService.edit(apiLog);
}
log.info("========= END 分页获取(全量)油站信息 END ===========");
}
}
}

@ -0,0 +1,125 @@
package com.hfkj.dao;
import com.hfkj.entity.CmsContent;
import com.hfkj.entity.CmsContentExample;
import java.util.List;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.DeleteProvider;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Options;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.Results;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.annotations.Update;
import org.apache.ibatis.annotations.UpdateProvider;
import org.apache.ibatis.type.JdbcType;
import org.springframework.stereotype.Repository;
/**
*
* 代码由工具生成,请勿修改!!!
* 如果需要扩展请在其父类进行扩展
*
**/
@Repository
public interface CmsContentMapper extends CmsContentMapperExt {
@SelectProvider(type=CmsContentSqlProvider.class, method="countByExample")
long countByExample(CmsContentExample example);
@DeleteProvider(type=CmsContentSqlProvider.class, method="deleteByExample")
int deleteByExample(CmsContentExample example);
@Delete({
"delete from cms_content",
"where id = #{id,jdbcType=BIGINT}"
})
int deleteByPrimaryKey(Long id);
@Insert({
"insert into cms_content (`type`, `name`, ",
"img_url, jump_type, ",
"jump_url, `status`, ",
"create_time, update_time, ",
"ext_1, ext_2, ext_3)",
"values (#{type,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, ",
"#{imgUrl,jdbcType=VARCHAR}, #{jumpType,jdbcType=INTEGER}, ",
"#{jumpUrl,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ",
"#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
"#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
})
@Options(useGeneratedKeys=true,keyProperty="id")
int insert(CmsContent record);
@InsertProvider(type=CmsContentSqlProvider.class, method="insertSelective")
@Options(useGeneratedKeys=true,keyProperty="id")
int insertSelective(CmsContent record);
@SelectProvider(type=CmsContentSqlProvider.class, method="selectByExample")
@Results({
@Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
@Result(column="type", property="type", jdbcType=JdbcType.INTEGER),
@Result(column="name", property="name", jdbcType=JdbcType.VARCHAR),
@Result(column="img_url", property="imgUrl", jdbcType=JdbcType.VARCHAR),
@Result(column="jump_type", property="jumpType", jdbcType=JdbcType.INTEGER),
@Result(column="jump_url", property="jumpUrl", jdbcType=JdbcType.VARCHAR),
@Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR)
})
List<CmsContent> selectByExample(CmsContentExample example);
@Select({
"select",
"id, `type`, `name`, img_url, jump_type, jump_url, `status`, create_time, update_time, ",
"ext_1, ext_2, ext_3",
"from cms_content",
"where id = #{id,jdbcType=BIGINT}"
})
@Results({
@Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
@Result(column="type", property="type", jdbcType=JdbcType.INTEGER),
@Result(column="name", property="name", jdbcType=JdbcType.VARCHAR),
@Result(column="img_url", property="imgUrl", jdbcType=JdbcType.VARCHAR),
@Result(column="jump_type", property="jumpType", jdbcType=JdbcType.INTEGER),
@Result(column="jump_url", property="jumpUrl", jdbcType=JdbcType.VARCHAR),
@Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR)
})
CmsContent selectByPrimaryKey(Long id);
@UpdateProvider(type=CmsContentSqlProvider.class, method="updateByExampleSelective")
int updateByExampleSelective(@Param("record") CmsContent record, @Param("example") CmsContentExample example);
@UpdateProvider(type=CmsContentSqlProvider.class, method="updateByExample")
int updateByExample(@Param("record") CmsContent record, @Param("example") CmsContentExample example);
@UpdateProvider(type=CmsContentSqlProvider.class, method="updateByPrimaryKeySelective")
int updateByPrimaryKeySelective(CmsContent record);
@Update({
"update cms_content",
"set `type` = #{type,jdbcType=INTEGER},",
"`name` = #{name,jdbcType=VARCHAR},",
"img_url = #{imgUrl,jdbcType=VARCHAR},",
"jump_type = #{jumpType,jdbcType=INTEGER},",
"jump_url = #{jumpUrl,jdbcType=VARCHAR},",
"`status` = #{status,jdbcType=INTEGER},",
"create_time = #{createTime,jdbcType=TIMESTAMP},",
"update_time = #{updateTime,jdbcType=TIMESTAMP},",
"ext_1 = #{ext1,jdbcType=VARCHAR},",
"ext_2 = #{ext2,jdbcType=VARCHAR},",
"ext_3 = #{ext3,jdbcType=VARCHAR}",
"where id = #{id,jdbcType=BIGINT}"
})
int updateByPrimaryKey(CmsContent record);
}

@ -0,0 +1,7 @@
package com.hfkj.dao;
/**
* mapper扩展类
*/
public interface CmsContentMapperExt {
}

@ -0,0 +1,332 @@
package com.hfkj.dao;
import com.hfkj.entity.CmsContent;
import com.hfkj.entity.CmsContentExample.Criteria;
import com.hfkj.entity.CmsContentExample.Criterion;
import com.hfkj.entity.CmsContentExample;
import java.util.List;
import java.util.Map;
import org.apache.ibatis.jdbc.SQL;
public class CmsContentSqlProvider {
public String countByExample(CmsContentExample example) {
SQL sql = new SQL();
sql.SELECT("count(*)").FROM("cms_content");
applyWhere(sql, example, false);
return sql.toString();
}
public String deleteByExample(CmsContentExample example) {
SQL sql = new SQL();
sql.DELETE_FROM("cms_content");
applyWhere(sql, example, false);
return sql.toString();
}
public String insertSelective(CmsContent record) {
SQL sql = new SQL();
sql.INSERT_INTO("cms_content");
if (record.getType() != null) {
sql.VALUES("`type`", "#{type,jdbcType=INTEGER}");
}
if (record.getName() != null) {
sql.VALUES("`name`", "#{name,jdbcType=VARCHAR}");
}
if (record.getImgUrl() != null) {
sql.VALUES("img_url", "#{imgUrl,jdbcType=VARCHAR}");
}
if (record.getJumpType() != null) {
sql.VALUES("jump_type", "#{jumpType,jdbcType=INTEGER}");
}
if (record.getJumpUrl() != null) {
sql.VALUES("jump_url", "#{jumpUrl,jdbcType=VARCHAR}");
}
if (record.getStatus() != null) {
sql.VALUES("`status`", "#{status,jdbcType=INTEGER}");
}
if (record.getCreateTime() != null) {
sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}");
}
if (record.getUpdateTime() != null) {
sql.VALUES("update_time", "#{updateTime,jdbcType=TIMESTAMP}");
}
if (record.getExt1() != null) {
sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}");
}
if (record.getExt2() != null) {
sql.VALUES("ext_2", "#{ext2,jdbcType=VARCHAR}");
}
if (record.getExt3() != null) {
sql.VALUES("ext_3", "#{ext3,jdbcType=VARCHAR}");
}
return sql.toString();
}
public String selectByExample(CmsContentExample example) {
SQL sql = new SQL();
if (example != null && example.isDistinct()) {
sql.SELECT_DISTINCT("id");
} else {
sql.SELECT("id");
}
sql.SELECT("`type`");
sql.SELECT("`name`");
sql.SELECT("img_url");
sql.SELECT("jump_type");
sql.SELECT("jump_url");
sql.SELECT("`status`");
sql.SELECT("create_time");
sql.SELECT("update_time");
sql.SELECT("ext_1");
sql.SELECT("ext_2");
sql.SELECT("ext_3");
sql.FROM("cms_content");
applyWhere(sql, example, false);
if (example != null && example.getOrderByClause() != null) {
sql.ORDER_BY(example.getOrderByClause());
}
return sql.toString();
}
public String updateByExampleSelective(Map<String, Object> parameter) {
CmsContent record = (CmsContent) parameter.get("record");
CmsContentExample example = (CmsContentExample) parameter.get("example");
SQL sql = new SQL();
sql.UPDATE("cms_content");
if (record.getId() != null) {
sql.SET("id = #{record.id,jdbcType=BIGINT}");
}
if (record.getType() != null) {
sql.SET("`type` = #{record.type,jdbcType=INTEGER}");
}
if (record.getName() != null) {
sql.SET("`name` = #{record.name,jdbcType=VARCHAR}");
}
if (record.getImgUrl() != null) {
sql.SET("img_url = #{record.imgUrl,jdbcType=VARCHAR}");
}
if (record.getJumpType() != null) {
sql.SET("jump_type = #{record.jumpType,jdbcType=INTEGER}");
}
if (record.getJumpUrl() != null) {
sql.SET("jump_url = #{record.jumpUrl,jdbcType=VARCHAR}");
}
if (record.getStatus() != null) {
sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
}
if (record.getCreateTime() != null) {
sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
}
if (record.getUpdateTime() != null) {
sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
}
if (record.getExt1() != null) {
sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
}
if (record.getExt2() != null) {
sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
}
if (record.getExt3() != null) {
sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
}
applyWhere(sql, example, true);
return sql.toString();
}
public String updateByExample(Map<String, Object> parameter) {
SQL sql = new SQL();
sql.UPDATE("cms_content");
sql.SET("id = #{record.id,jdbcType=BIGINT}");
sql.SET("`type` = #{record.type,jdbcType=INTEGER}");
sql.SET("`name` = #{record.name,jdbcType=VARCHAR}");
sql.SET("img_url = #{record.imgUrl,jdbcType=VARCHAR}");
sql.SET("jump_type = #{record.jumpType,jdbcType=INTEGER}");
sql.SET("jump_url = #{record.jumpUrl,jdbcType=VARCHAR}");
sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
CmsContentExample example = (CmsContentExample) parameter.get("example");
applyWhere(sql, example, true);
return sql.toString();
}
public String updateByPrimaryKeySelective(CmsContent record) {
SQL sql = new SQL();
sql.UPDATE("cms_content");
if (record.getType() != null) {
sql.SET("`type` = #{type,jdbcType=INTEGER}");
}
if (record.getName() != null) {
sql.SET("`name` = #{name,jdbcType=VARCHAR}");
}
if (record.getImgUrl() != null) {
sql.SET("img_url = #{imgUrl,jdbcType=VARCHAR}");
}
if (record.getJumpType() != null) {
sql.SET("jump_type = #{jumpType,jdbcType=INTEGER}");
}
if (record.getJumpUrl() != null) {
sql.SET("jump_url = #{jumpUrl,jdbcType=VARCHAR}");
}
if (record.getStatus() != null) {
sql.SET("`status` = #{status,jdbcType=INTEGER}");
}
if (record.getCreateTime() != null) {
sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}");
}
if (record.getUpdateTime() != null) {
sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}");
}
if (record.getExt1() != null) {
sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}");
}
if (record.getExt2() != null) {
sql.SET("ext_2 = #{ext2,jdbcType=VARCHAR}");
}
if (record.getExt3() != null) {
sql.SET("ext_3 = #{ext3,jdbcType=VARCHAR}");
}
sql.WHERE("id = #{id,jdbcType=BIGINT}");
return sql.toString();
}
protected void applyWhere(SQL sql, CmsContentExample example, boolean includeExamplePhrase) {
if (example == null) {
return;
}
String parmPhrase1;
String parmPhrase1_th;
String parmPhrase2;
String parmPhrase2_th;
String parmPhrase3;
String parmPhrase3_th;
if (includeExamplePhrase) {
parmPhrase1 = "%s #{example.oredCriteria[%d].allCriteria[%d].value}";
parmPhrase1_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}";
parmPhrase2 = "%s #{example.oredCriteria[%d].allCriteria[%d].value} and #{example.oredCriteria[%d].criteria[%d].secondValue}";
parmPhrase2_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{example.oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}";
parmPhrase3 = "#{example.oredCriteria[%d].allCriteria[%d].value[%d]}";
parmPhrase3_th = "#{example.oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}";
} else {
parmPhrase1 = "%s #{oredCriteria[%d].allCriteria[%d].value}";
parmPhrase1_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}";
parmPhrase2 = "%s #{oredCriteria[%d].allCriteria[%d].value} and #{oredCriteria[%d].criteria[%d].secondValue}";
parmPhrase2_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}";
parmPhrase3 = "#{oredCriteria[%d].allCriteria[%d].value[%d]}";
parmPhrase3_th = "#{oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}";
}
StringBuilder sb = new StringBuilder();
List<Criteria> oredCriteria = example.getOredCriteria();
boolean firstCriteria = true;
for (int i = 0; i < oredCriteria.size(); i++) {
Criteria criteria = oredCriteria.get(i);
if (criteria.isValid()) {
if (firstCriteria) {
firstCriteria = false;
} else {
sb.append(" or ");
}
sb.append('(');
List<Criterion> criterions = criteria.getAllCriteria();
boolean firstCriterion = true;
for (int j = 0; j < criterions.size(); j++) {
Criterion criterion = criterions.get(j);
if (firstCriterion) {
firstCriterion = false;
} else {
sb.append(" and ");
}
if (criterion.isNoValue()) {
sb.append(criterion.getCondition());
} else if (criterion.isSingleValue()) {
if (criterion.getTypeHandler() == null) {
sb.append(String.format(parmPhrase1, criterion.getCondition(), i, j));
} else {
sb.append(String.format(parmPhrase1_th, criterion.getCondition(), i, j,criterion.getTypeHandler()));
}
} else if (criterion.isBetweenValue()) {
if (criterion.getTypeHandler() == null) {
sb.append(String.format(parmPhrase2, criterion.getCondition(), i, j, i, j));
} else {
sb.append(String.format(parmPhrase2_th, criterion.getCondition(), i, j, criterion.getTypeHandler(), i, j, criterion.getTypeHandler()));
}
} else if (criterion.isListValue()) {
sb.append(criterion.getCondition());
sb.append(" (");
List<?> listItems = (List<?>) criterion.getValue();
boolean comma = false;
for (int k = 0; k < listItems.size(); k++) {
if (comma) {
sb.append(", ");
} else {
comma = true;
}
if (criterion.getTypeHandler() == null) {
sb.append(String.format(parmPhrase3, i, j, k));
} else {
sb.append(String.format(parmPhrase3_th, i, j, k, criterion.getTypeHandler()));
}
}
sb.append(')');
}
}
sb.append(')');
}
}
if (sb.length() > 0) {
sql.WHERE(sb.toString());
}
}
}

@ -0,0 +1,232 @@
package com.hfkj.entity;
import java.io.Serializable;
import java.util.Date;
/**
* cms_content
* @author
*/
/**
*
* 代码由工具生成
*
**/
public class CmsContent implements Serializable {
/**
* 主键
*/
private Long id;
/**
* 类型
*/
private Integer type;
/**
* 轮播图名称
*/
private String name;
/**
* 图片地址
*/
private String imgUrl;
/**
* 跳转类型
*/
private Integer jumpType;
/**
* 跳转地址
*/
private String jumpUrl;
/**
* 状态 0删除 1编辑中 2已上线 3已下线
*/
private Integer status;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
private String ext1;
private String ext2;
private String ext3;
private static final long serialVersionUID = 1L;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getImgUrl() {
return imgUrl;
}
public void setImgUrl(String imgUrl) {
this.imgUrl = imgUrl;
}
public Integer getJumpType() {
return jumpType;
}
public void setJumpType(Integer jumpType) {
this.jumpType = jumpType;
}
public String getJumpUrl() {
return jumpUrl;
}
public void setJumpUrl(String jumpUrl) {
this.jumpUrl = jumpUrl;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getExt1() {
return ext1;
}
public void setExt1(String ext1) {
this.ext1 = ext1;
}
public String getExt2() {
return ext2;
}
public void setExt2(String ext2) {
this.ext2 = ext2;
}
public String getExt3() {
return ext3;
}
public void setExt3(String ext3) {
this.ext3 = ext3;
}
@Override
public boolean equals(Object that) {
if (this == that) {
return true;
}
if (that == null) {
return false;
}
if (getClass() != that.getClass()) {
return false;
}
CmsContent other = (CmsContent) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType()))
&& (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName()))
&& (this.getImgUrl() == null ? other.getImgUrl() == null : this.getImgUrl().equals(other.getImgUrl()))
&& (this.getJumpType() == null ? other.getJumpType() == null : this.getJumpType().equals(other.getJumpType()))
&& (this.getJumpUrl() == null ? other.getJumpUrl() == null : this.getJumpUrl().equals(other.getJumpUrl()))
&& (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
&& (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
&& (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
&& (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1()))
&& (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2()))
&& (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3()));
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
result = prime * result + ((getType() == null) ? 0 : getType().hashCode());
result = prime * result + ((getName() == null) ? 0 : getName().hashCode());
result = prime * result + ((getImgUrl() == null) ? 0 : getImgUrl().hashCode());
result = prime * result + ((getJumpType() == null) ? 0 : getJumpType().hashCode());
result = prime * result + ((getJumpUrl() == null) ? 0 : getJumpUrl().hashCode());
result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode());
result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode());
return result;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", type=").append(type);
sb.append(", name=").append(name);
sb.append(", imgUrl=").append(imgUrl);
sb.append(", jumpType=").append(jumpType);
sb.append(", jumpUrl=").append(jumpUrl);
sb.append(", status=").append(status);
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);
sb.append(", ext1=").append(ext1);
sb.append(", ext2=").append(ext2);
sb.append(", ext3=").append(ext3);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
}
}

File diff suppressed because it is too large Load Diff

@ -3,6 +3,8 @@ package com.hfkj.model;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
/**
* 油站列表模型
@ -56,4 +58,9 @@ public class GasListModel {
* 油站直降
*/
private BigDecimal gasStationDrop;
/**
* 列表的加油优惠金额200优惠xx元
*/
private List<String> oilDiscount;
}

@ -0,0 +1,59 @@
package com.hfkj.model.order;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* 导出油站订单模型
* @className: ExportGasOrderModel
* @author: HuRui
* @date: 2022/9/20
**/
@Data
public class ExportGasOrderReceiptModel {
@ColumnWidth(20)
@ExcelProperty("交易单号")
private String orderNo;
@ColumnWidth(30)
@ExcelProperty("加油站")
private String merName;
@ColumnWidth(20)
@ExcelProperty("油号")
private String oilNo;
@ColumnWidth(30)
@ExcelProperty("开票公司")
private String companyName;
@ColumnWidth(25)
@ExcelProperty("开票税号")
private String taxNo;
@ColumnWidth(25)
@ExcelProperty("开票金额")
private BigDecimal amount;
@ColumnWidth(25)
@ExcelProperty("联系电话")
private String contactsPhone;
@ColumnWidth(25)
@ExcelProperty("邮箱")
private String email;;
@ColumnWidth(25)
@ExcelProperty("申请时间")
private Date createTime;
@ColumnWidth(20)
@ExcelProperty("开票状态")
private String status;
}

@ -0,0 +1,48 @@
package com.hfkj.openapi.model.request;
import lombok.Data;
import org.hibernate.validator.constraints.Range;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
* @className: RequestQueryGasListModel
* @author: HuRui
* @date: 2024/9/18
**/
@Data
public class RequestQueryGasListModel {
/**
* appid
*/
@NotBlank(message = "请求id必填项")
private String reqId;
/**
* appid
*/
@NotBlank(message = "appId必填项")
private String appId;
/**
* 分页页数
*/
@NotNull(message = "页数必填项")
private Integer pageNum;
/**
* 每页数量
*/
@Range(min = 1, max = 50,message = "数量必须设置在1至100之内")
@NotNull(message = "每页数量必填项")
private Integer pageSize;
/**
* 签名参数
*/
@NotBlank(message = "签名必填项")
private String sign;
}

@ -0,0 +1,35 @@
package com.hfkj.service;
import com.hfkj.entity.CmsContent;
import java.util.List;
import java.util.Map;
/**
* @className: CmsContentService
* @author: HuRui
* @date: 2024/9/24
**/
public interface CmsContentService {
/**
* 编辑数据
* @param data
*/
void editData(CmsContent data);
/**
* 详情
* @param id
* @return
*/
CmsContent getDetail(Long id);
/**
* 查询列表
* @param param
* @return
*/
List<CmsContent> getList(Map<String, Object> param);
}

@ -159,7 +159,8 @@ public class BsGasOrderReceiptServiceImpl implements BsGasOrderReceiptService {
@Override
public List<BsGasOrderReceipt> getList(Map<String, Object> param) {
BsGasOrderReceiptExample example = new BsGasOrderReceiptExample();
BsGasOrderReceiptExample.Criteria criteria = example.createCriteria();
BsGasOrderReceiptExample.Criteria criteria = example.createCriteria()
.andStatusNotEqualTo(GasOrderReceiptStatusEnum.status99.getStatus());
if (StringUtils.isNotBlank(MapUtils.getString(param, "orderNo"))) {
criteria.andOrderNoLike("%"+MapUtils.getString(param, "orderNo")+"%");

@ -0,0 +1,64 @@
package com.hfkj.service.impl;
import com.hfkj.dao.CmsContentMapper;
import com.hfkj.entity.CmsContent;
import com.hfkj.entity.CmsContentExample;
import com.hfkj.service.CmsContentService;
import com.hfkj.sysenum.cms.CmsStatusEnum;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* @className: CmsContentServiceImpl
* @author: HuRui
* @date: 2024/9/24
**/
@Service("cmsContentService")
public class CmsContentServiceImpl implements CmsContentService {
@Resource
private CmsContentMapper cmsContentMapper;
public final static String CACHE_CMS_ONLINE = "CACHE_CMS_ONLINE";
@Override
public void editData(CmsContent data) {
data.setUpdateTime(new Date());
if (data.getId() == null) {
data.setCreateTime(new Date());
cmsContentMapper.insert(data);
} else {
cmsContentMapper.updateByPrimaryKey(data);
}
}
@Override
public CmsContent getDetail(Long id) {
return cmsContentMapper.selectByPrimaryKey(id);
}
@Override
public List<CmsContent> getList(Map<String, Object> param) {
CmsContentExample example = new CmsContentExample();
CmsContentExample.Criteria criteria = example.createCriteria() .andStatusNotEqualTo(CmsStatusEnum.status0.getStatus());
if (MapUtils.getInteger(param, "type") != null) {
criteria.andTypeEqualTo(MapUtils.getInteger(param, "type"));
}
if (MapUtils.getInteger(param, "status") != null) {
criteria.andStatusEqualTo(MapUtils.getInteger(param, "status"));
}
if (StringUtils.isNotBlank(MapUtils.getString(param, "name"))) {
criteria.andNameLike("%"+MapUtils.getString(param, "name")+"%");
}
example.setOrderByClause("update_time desc");
return cmsContentMapper.selectByExample(example);
}
}

@ -8,14 +8,17 @@ import com.hfkj.common.exception.ErrorCode;
import com.hfkj.common.exception.ErrorHelp;
import com.hfkj.common.exception.SysCode;
import com.hfkj.entity.BsGasOrder;
import com.hfkj.entity.BsGasOrderReceipt;
import com.hfkj.entity.BsMerchant;
import com.hfkj.entity.BsOrderRefund;
import com.hfkj.model.order.OrderChildModel;
import com.hfkj.service.agent.BsAgentMerAccountService;
import com.hfkj.service.gas.BsGasOrderReceiptService;
import com.hfkj.service.gas.BsGasOrderService;
import com.hfkj.service.merchant.BsMerchantAccountService;
import com.hfkj.service.merchant.BsMerchantChainBrandAccountService;
import com.hfkj.service.merchant.BsMerchantService;
import com.hfkj.sysenum.gas.GasOrderReceiptStatusEnum;
import com.hfkj.sysenum.merchant.MerchantChainBrandSettleTypeEnum;
import com.hfkj.sysenum.merchant.MerchantSourceTypeEnum;
import com.hfkj.sysenum.gas.OrderOilStatus;
@ -23,6 +26,9 @@ import com.hfkj.sysenum.order.OrderChildProductTypeEnum;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 退款业务
@ -43,6 +49,8 @@ public class OrderRefundBusiness {
@Resource
private BsMerchantChainBrandAccountService merchantChainBrandAccountService;
@Resource
private BsGasOrderReceiptService gasOrderReceiptService;
@Resource
private BsAgentMerAccountService agentMerAccountService;
/**
@ -92,6 +100,16 @@ public class OrderRefundBusiness {
gasOrder.setRefundRemarks(refund.getRefundRemark());
gasOrderService.updateGasOrder(gasOrder);
// 撤回开票记录
Map<String,Object> param = new HashMap<>();
param.put("orderNo", gasOrder.getOrderNo());
param.put("status", GasOrderReceiptStatusEnum.status1.getStatus());
List<BsGasOrderReceipt> orderReceiptList = gasOrderReceiptService.getList(param);
for (BsGasOrderReceipt receipt : orderReceiptList) {
receipt.setStatus(GasOrderReceiptStatusEnum.status99.getStatus());
gasOrderReceiptService.editData(receipt);
}
if (gasOrder.getAgentId() != null && MerchantSourceTypeEnum.type1.getNumber().equals(gasOrder.getChannelType())) {
try {
// 代理商商户账户退款

@ -0,0 +1,48 @@
package com.hfkj.sysenum.cms;
import lombok.Getter;
import java.util.Objects;
/**
* @className: CmsTypeEnum
* @author: HuRui
* @date: 2024/9/24
**/
@Getter
public enum CmsStatusEnum {
/**
* 删除
*/
status0(0 , "删除"),
/**
* 编辑中
*/
status1(1 , "编辑中"),
/**
* 已上线
*/
status2(2 , "已上线"),
/**
* 已下线
*/
status3(3 , "已下线"),
;
private Integer status;
private String name;
CmsStatusEnum(int status , String name) {
this.status = status;
this.name = name;
}
public static CmsStatusEnum getDataByType(Integer status) {
for (CmsStatusEnum ele : values()) {
if(Objects.equals(status,ele.getStatus())) return ele;
}
return null;
}
}

@ -0,0 +1,36 @@
package com.hfkj.sysenum.cms;
import lombok.Getter;
import java.util.Objects;
/**
* @className: CmsTypeEnum
* @author: HuRui
* @date: 2024/9/24
**/
@Getter
public enum CmsTypeEnum {
/**
* 首页轮播图
*/
type1(1 , "首页轮播图"),
;
private Integer type;
private String name;
CmsTypeEnum(int type , String name) {
this.type = type;
this.name = name;
}
public static CmsTypeEnum getDataByType(Integer type) {
for (CmsTypeEnum ele : values()) {
if(Objects.equals(type,ele.getType())) return ele;
}
return null;
}
}

@ -2,6 +2,8 @@ package com.hfkj.sysenum.gas;
import lombok.Getter;
import java.util.Objects;
/**
* 加油站价格任务
* @author hurui
@ -24,6 +26,11 @@ public enum GasOrderReceiptStatusEnum {
* 开票失败
*/
status3(3 , "开票失败", "开票失败"),
/**
* 删除
*/
status99(99 , "删除", "删除"),
;
private Integer status;
@ -36,4 +43,13 @@ public enum GasOrderReceiptStatusEnum {
this.manageName = manageName;
}
public static GasOrderReceiptStatusEnum getNameByType(Integer type) {
for (GasOrderReceiptStatusEnum ele : values()) {
if (Objects.equals(type,ele.getStatus())) {
return ele;
}
}
return null;
}
}

Loading…
Cancel
Save