Commit 50fa156b by 陶光胜

代码规范

parent cceb63d9
package com.gic.enterprise.utils;
/**
*
* @ClassName: T
* @Description:
* @author taogs
* @date 2020/9/11 15:35
*/
public class T {
}
...@@ -58,9 +58,6 @@ public class AuditLogController { ...@@ -58,9 +58,6 @@ public class AuditLogController {
auditLogDTO.setAuditorId(auditorServiceResponse.getResult().getAuditorId()); auditLogDTO.setAuditorId(auditorServiceResponse.getResult().getAuditorId());
auditLogDTO.setAuditorName(auditorServiceResponse.getResult().getAuditorName()); auditLogDTO.setAuditorName(auditorServiceResponse.getResult().getAuditorName());
auditLogDTO.setAuditorPhone(auditorServiceResponse.getResult().getPhone()); auditLogDTO.setAuditorPhone(auditorServiceResponse.getResult().getPhone());
// ServiceResponse<AuditLogDTO> auditLog = this.auditLogApiService.getAuditLog(auditLogQO.getAuditLogId());
ServiceResponse<AuditLogDTO> serviceResponse = auditLogApiService.audit(auditLogDTO); ServiceResponse<AuditLogDTO> serviceResponse = auditLogApiService.audit(auditLogDTO);
if (serviceResponse.isSuccess()) { if (serviceResponse.isSuccess()) {
createLog(auditLogDTO); createLog(auditLogDTO);
......
...@@ -72,7 +72,6 @@ public class BillingOrderController { ...@@ -72,7 +72,6 @@ public class BillingOrderController {
vo.setPayType(dto.getPayType()); vo.setPayType(dto.getPayType());
vo.setTotalFee(dto.getTotalFee()); vo.setTotalFee(dto.getTotalFee());
vo.setTotalFeePaid(dto.getTotalFeePaid()); vo.setTotalFeePaid(dto.getTotalFeePaid());
// ServiceResponse<BillingPayInfoDTO> payInfoDetail = this.billingPayInfoApiService.getPayInfoDetail(dto.getPayInfoId());
ServiceResponse<BillingPayInfoDTO> payInfoDetail = this.billingPayInfoApiService.getPayInfo(dto.getEnterpriseId(), dto.getSerialNumber(), null); ServiceResponse<BillingPayInfoDTO> payInfoDetail = this.billingPayInfoApiService.getPayInfo(dto.getEnterpriseId(), dto.getSerialNumber(), null);
if(payInfoDetail.isSuccess()){ if(payInfoDetail.isSuccess()){
BillingPayInfoDTO payInfoDTO = payInfoDetail.getResult(); BillingPayInfoDTO payInfoDTO = payInfoDetail.getResult();
......
...@@ -57,9 +57,6 @@ public class BillingRechargeController { ...@@ -57,9 +57,6 @@ public class BillingRechargeController {
billingRechargeDTO.setInitiatorUser(userDetail.getUserId()); billingRechargeDTO.setInitiatorUser(userDetail.getUserId());
billingRechargeDTO.setInitiatorName(userDetail.getUserInfo().getUserName()); billingRechargeDTO.setInitiatorName(userDetail.getUserInfo().getUserName());
ServiceResponse<Map<String, Object>> serviceResponse = billingRechargeApiService.saveAndSelectPaymentMethod(billingRechargeDTO); ServiceResponse<Map<String, Object>> serviceResponse = billingRechargeApiService.saveAndSelectPaymentMethod(billingRechargeDTO);
// if (serviceResponse.isSuccess()) {
// LogUtils.createLog("预支付金额:" + billingRechargeQO.getTotalFee(), PayTypeEnum.getMessageByCode(billingRechargeQO.getPayType()));
// }
return ResultControllerUtils.commonResult(serviceResponse); return ResultControllerUtils.commonResult(serviceResponse);
} }
......
...@@ -482,10 +482,6 @@ public class WmMallStoreController { ...@@ -482,10 +482,6 @@ public class WmMallStoreController {
@RequestMapping("/get-integral-config") @RequestMapping("/get-integral-config")
public RestResponse getIntegralConfig(Integer wmMallStoreId) { public RestResponse getIntegralConfig(Integer wmMallStoreId) {
//获取已配置的卡券ID //获取已配置的卡券ID
// ServiceResponse<Long> mcuIdResponse = weimobMerchantService.getMcuAreaId(wmMallStoreId);
// if (!mcuIdResponse.isSuccess()) {
// return RestResponse.failure(mcuIdResponse.getCode(), mcuIdResponse.getMessage());
// }
return ResultControllerUtils.commonResult(orderPointCalculationPartyApiService return ResultControllerUtils.commonResult(orderPointCalculationPartyApiService
.isGicCalculateIntegral(UserDetailUtils.getUserDetail().getEnterpriseId(), .isGicCalculateIntegral(UserDetailUtils.getUserDetail().getEnterpriseId(),
OrderPointCalculationPartyEnum.WEIMO.getCode(), OrderPointCalculationPartyEnum.WEIMO.getCode(),
...@@ -509,10 +505,6 @@ public class WmMallStoreController { ...@@ -509,10 +505,6 @@ public class WmMallStoreController {
state = 0; state = 0;
} }
//获取已配置的卡券ID //获取已配置的卡券ID
// ServiceResponse<Long> mcuIdResponse = weimobMerchantService.getMcuAreaId(wmMallStoreId);
// if (!mcuIdResponse.isSuccess()) {
// return RestResponse.failure(mcuIdResponse.getCode(), mcuIdResponse.getMessage());
// }
return ResultControllerUtils.commonResult(orderPointCalculationPartyApiService return ResultControllerUtils.commonResult(orderPointCalculationPartyApiService
.updateIntegralRule(UserDetailUtils.getUserDetail().getEnterpriseId(), .updateIntegralRule(UserDetailUtils.getUserDetail().getEnterpriseId(),
OrderPointCalculationPartyEnum.WEIMO.getCode(), OrderPointCalculationPartyEnum.WEIMO.getCode(),
......
...@@ -1044,15 +1044,10 @@ public class WmStoreSyncController { ...@@ -1044,15 +1044,10 @@ public class WmStoreSyncController {
List<Map<Integer, String>> result = new ArrayList<Map<Integer, String>>(); List<Map<Integer, String>> result = new ArrayList<Map<Integer, String>>();
try { try {
Workbook workbook = WorkbookFactory.create(in); Workbook workbook = WorkbookFactory.create(in);
// HSSFWorkbook hssfWorkbook = new HSSFWorkbook(in);
for (int numSheet = 0; numSheet < 1; numSheet++) { for (int numSheet = 0; numSheet < 1; numSheet++) {
Sheet sheet = workbook.getSheetAt(numSheet); Sheet sheet = workbook.getSheetAt(numSheet);
// HSSFSheet hssfSheet = hssfWorkbook.getSheetAt(numSheet);
//getPhysicalNumberOfRows:实际有数据的行数,去掉空行
for (int rowNum = row - 1, rowLength = sheet.getPhysicalNumberOfRows(); rowNum <= rowLength; rowNum++) { for (int rowNum = row - 1, rowLength = sheet.getPhysicalNumberOfRows(); rowNum <= rowLength; rowNum++) {
Row hssfRow = sheet.getRow(rowNum); Row hssfRow = sheet.getRow(rowNum);
// HSSFRow hssfRow = hssfSheet.getRow(rowNum);
if (hssfRow == null) { if (hssfRow == null) {
continue; continue;
} }
...@@ -1063,7 +1058,6 @@ public class WmStoreSyncController { ...@@ -1063,7 +1058,6 @@ public class WmStoreSyncController {
Map<Integer, String> map = new HashMap<Integer, String>(); Map<Integer, String> map = new HashMap<Integer, String>();
for (int colix = minColix; colix < maxColix; colix++) { for (int colix = minColix; colix < maxColix; colix++) {
Cell hssfCell = hssfRow.getCell(colix); Cell hssfCell = hssfRow.getCell(colix);
// HSSFCell hssfCell = hssfRow.getCell(colix);
if (hssfCell == null) { if (hssfCell == null) {
map.put(colix, ""); map.put(colix, "");
} else { } else {
......
...@@ -189,21 +189,13 @@ public class ExcelUtils { ...@@ -189,21 +189,13 @@ public class ExcelUtils {
XSSFCellStyle style = workbook.createCellStyle(); XSSFCellStyle style = workbook.createCellStyle();
// 设置底边框; // 设置底边框;
style.setBorderBottom(XSSFCellStyle.BORDER_THIN); style.setBorderBottom(XSSFCellStyle.BORDER_THIN);
// 设置底边框颜色;
// style.setBottomBorderColor(XSSFColor.BLACK.index);
// 设置左边框; // 设置左边框;
style.setBorderLeft(XSSFCellStyle.BORDER_THIN); style.setBorderLeft(XSSFCellStyle.BORDER_THIN);
// 设置左边框颜色;
// style.setLeftBorderColor(XSSFColor.BLACK.index);
// 设置右边框; // 设置右边框;
style.setBorderRight(XSSFCellStyle.BORDER_THIN); style.setBorderRight(XSSFCellStyle.BORDER_THIN);
// 设置右边框颜色;
// style.setRightBorderColor(XSSFColor.BLACK.index);
// 设置顶边框; // 设置顶边框;
style.setBorderTop(XSSFCellStyle.BORDER_THIN); style.setBorderTop(XSSFCellStyle.BORDER_THIN);
// 设置顶边框颜色; // 设置顶边框颜色;
// style.setTopBorderColor(XSSFColor.BLACK.index);
// 在样式用应用设置的字体;
style.setFont(font); style.setFont(font);
// 设置自动换行; // 设置自动换行;
style.setWrapText(false); style.setWrapText(false);
......
...@@ -95,14 +95,11 @@ public class QrcodeUtils { ...@@ -95,14 +95,11 @@ public class QrcodeUtils {
g.setColor(Color.BLACK); g.setColor(Color.BLACK);
g.setFont(new Font("宋体", Font.BOLD, 50)); // 字体、字型、字号 g.setFont(new Font("宋体", Font.BOLD, 50)); // 字体、字型、字号
// int _height=outg.getFontMetrics().getHeight();
log.info("logoName1:"+logoName); log.info("logoName1:"+logoName);
int logoWidth = g.getFontMetrics().stringWidth(logoName); int logoWidth = g.getFontMetrics().stringWidth(logoName);
log.info("logoName2:"+logoName); log.info("logoName2:"+logoName);
g.drawString(logoName, (WIDTH - logoWidth) / 2, HEIGHT - 60); // 画文字 g.drawString(logoName, (WIDTH - logoWidth) / 2, HEIGHT - 60); // 画文字
// outg.dispose();
image.flush(); image.flush();
// image = outImage;
} }
if (logoPic != null) { if (logoPic != null) {
/** /**
...@@ -128,14 +125,12 @@ public class QrcodeUtils { ...@@ -128,14 +125,12 @@ public class QrcodeUtils {
// 开始绘制图片 // 开始绘制图片
g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
g.drawImage(logo, x, y, widthLogo, heightLogo, null); g.drawImage(logo, x, y, widthLogo, heightLogo, null);
// g.drawRoundRect(x,y,widthLogo,heightLogo,15,15);
g.drawRect(x, y, widthLogo, heightLogo); g.drawRect(x, y, widthLogo, heightLogo);
// logo边框大小 // logo边框大小
g.setStroke(new BasicStroke(2)); g.setStroke(new BasicStroke(2));
// logo边框颜色 // logo边框颜色
g.setColor(Color.WHITE); g.setColor(Color.WHITE);
g.drawRect(x, y, widthLogo, heightLogo); g.drawRect(x, y, widthLogo, heightLogo);
// g.dispose();
logo.flush(); logo.flush();
image.flush(); image.flush();
} catch (Exception e) { } catch (Exception e) {
......
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