Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-enterprise
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
base_platform_enterprise
gic-platform-enterprise
Commits
50fa156b
Commit
50fa156b
authored
Sep 18, 2020
by
陶光胜
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码规范
parent
cceb63d9
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
0 additions
and
44 deletions
+0
-44
T.java
...ise-service/src/main/java/com/gic/enterprise/utils/T.java
+0
-10
AuditLogController.java
...com/gic/enterprise/web/controller/AuditLogController.java
+0
-3
BillingOrderController.java
...gic/enterprise/web/controller/BillingOrderController.java
+0
-1
BillingRechargeController.java
.../enterprise/web/controller/BillingRechargeController.java
+0
-3
WmMallStoreController.java
...c/enterprise/web/controller/wm/WmMallStoreController.java
+0
-8
WmStoreSyncController.java
...c/enterprise/web/controller/wm/WmStoreSyncController.java
+0
-6
ExcelUtils.java
...rc/main/java/com/gic/enterprise/web/utils/ExcelUtils.java
+0
-8
QrcodeUtils.java
...c/main/java/com/gic/enterprise/web/utils/QrcodeUtils.java
+0
-5
No files found.
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/utils/T.java
deleted
100644 → 0
View file @
cceb63d9
package
com
.
gic
.
enterprise
.
utils
;
/**
*
* @ClassName: T
* @Description:
* @author taogs
* @date 2020/9/11 15:35
*/
public
class
T
{
}
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/AuditLogController.java
View file @
50fa156b
...
@@ -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
);
...
...
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/BillingOrderController.java
View file @
50fa156b
...
@@ -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
();
...
...
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/BillingRechargeController.java
View file @
50fa156b
...
@@ -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
);
}
}
...
...
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/wm/WmMallStoreController.java
View file @
50fa156b
...
@@ -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
(),
...
...
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/wm/WmStoreSyncController.java
View file @
50fa156b
...
@@ -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
{
...
...
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/utils/ExcelUtils.java
View file @
50fa156b
...
@@ -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
);
...
...
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/utils/QrcodeUtils.java
View file @
50fa156b
...
@@ -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
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment