Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
holmes
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
QA
holmes
Commits
e58e6abc
Commit
e58e6abc
authored
Mar 09, 2022
by
黎博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改/api/afterSaleNew/getApplyDetailInfo
parent
5405699a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
110 additions
and
1 deletion
+110
-1
KeystoneService.java
src/main/java/cn/qg/holmes/bean/KeystoneService.java
+32
-0
OrderController.java
...olmes/controller/mock/keystone/jdbuy/OrderController.java
+22
-1
SupplierOrderSku.java
...a/cn/qg/holmes/entity/mock/keystone/SupplierOrderSku.java
+56
-0
No files found.
src/main/java/cn/qg/holmes/bean/KeystoneService.java
View file @
e58e6abc
package
cn
.
qg
.
holmes
.
bean
;
package
cn
.
qg
.
holmes
.
bean
;
import
cn.qg.holmes.entity.mock.keystone.ProductItem
;
import
cn.qg.holmes.entity.mock.keystone.ProductItem
;
import
cn.qg.holmes.entity.mock.keystone.SupplierOrderSku
;
import
cn.qg.holmes.utils.JdbcUtils
;
import
cn.qg.holmes.utils.JdbcUtils
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.beans.factory.annotation.Value
;
...
@@ -76,7 +77,38 @@ public class KeystoneService {
...
@@ -76,7 +77,38 @@ public class KeystoneService {
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
log
.
info
(
"从keystone.product_item根据skuId查询商品信息异常!"
);
}
}
return
productItem
;
return
productItem
;
}
}
/**
* 根据京东订单号获取数据
* @param supplierOrderNo
* @return
*/
public
SupplierOrderSku
getSupplierOrderSkuBySupplierOrderNo
(
String
supplierOrderNo
)
{
String
sql
=
"SELECT * FROM `supplier_order_sku` WHERE `supplier_order_no` = "
+
supplierOrderNo
;
log
.
info
(
"从keystone.supplier_order_sku查询信息:{}"
,
sql
);
SupplierOrderSku
supplierOrderSku
=
new
SupplierOrderSku
();
try
{
statement
=
connection
.
createStatement
();
ResultSet
resultSet
=
statement
.
executeQuery
(
sql
);
List
<
Map
<
String
,
Object
>>
resultList
=
JdbcUtils
.
convertResultSetToList
(
resultSet
);
if
(
resultList
.
size
()
>
0
)
{
Map
<
String
,
Object
>
map
=
resultList
.
get
(
0
);
supplierOrderSku
.
setSupplierOrderNo
(
map
.
get
(
"supplier_order_no"
).
toString
());
supplierOrderSku
.
setSkuNo
(
map
.
get
(
"sku_no"
).
toString
());
supplierOrderSku
.
setSkuName
(
map
.
get
(
"sku_name"
).
toString
());
supplierOrderSku
.
setImageUrl
(
map
.
get
(
"image_url"
).
toString
());
supplierOrderSku
.
setPrice
(
new
BigDecimal
(
map
.
get
(
"price"
).
toString
()));
supplierOrderSku
.
setCount
(
Integer
.
valueOf
(
map
.
get
(
"count"
).
toString
()));
supplierOrderSku
.
setState
(
Integer
.
valueOf
(
map
.
get
(
"state"
).
toString
()));
}
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
log
.
info
(
"从keystone.supplier_order_sku查询信息异常!"
);
}
return
supplierOrderSku
;
}
}
}
src/main/java/cn/qg/holmes/controller/mock/keystone/jdbuy/OrderController.java
View file @
e58e6abc
...
@@ -2,6 +2,7 @@ package cn.qg.holmes.controller.mock.keystone.jdbuy;
...
@@ -2,6 +2,7 @@ package cn.qg.holmes.controller.mock.keystone.jdbuy;
import
cn.qg.holmes.bean.KeystoneService
;
import
cn.qg.holmes.bean.KeystoneService
;
import
cn.qg.holmes.entity.mock.keystone.ProductItem
;
import
cn.qg.holmes.entity.mock.keystone.ProductItem
;
import
cn.qg.holmes.entity.mock.keystone.SupplierOrderSku
;
import
cn.qg.holmes.entity.mock.keystone.jdbuy.*
;
import
cn.qg.holmes.entity.mock.keystone.jdbuy.*
;
import
cn.qg.holmes.utils.DateUtils
;
import
cn.qg.holmes.utils.DateUtils
;
import
cn.qg.holmes.utils.RedisUtils
;
import
cn.qg.holmes.utils.RedisUtils
;
...
@@ -373,7 +374,27 @@ public class OrderController {
...
@@ -373,7 +374,27 @@ public class OrderController {
response
.
setResultCode
(
"0000"
);
response
.
setResultCode
(
"0000"
);
AfsApplyDetailResponse
.
AfsApplyDetailDto
applyDetailDto
=
new
AfsApplyDetailResponse
.
AfsApplyDetailDto
();
AfsApplyDetailResponse
.
AfsApplyDetailDto
applyDetailDto
=
new
AfsApplyDetailResponse
.
AfsApplyDetailDto
();
applyDetailDto
.
setRefundInfoResultDtos
(
null
);
// 设置AfsRefundInfoResultDto
List
<
AfsApplyDetailResponse
.
AfsRefundInfoResultDto
>
afsRefundInfoResultDtoList
=
new
ArrayList
<>();
AfsApplyDetailResponse
.
AfsRefundInfoResultDto
afsRefundInfoResultDto
=
new
AfsApplyDetailResponse
.
AfsRefundInfoResultDto
();
afsRefundInfoResultDto
.
setThirdApplyId
(
applyDetailParam
.
getThirdApplyId
());
afsRefundInfoResultDto
.
setOriginalOrderId
(
String
.
valueOf
(
applyDetailParam
.
getOrderId
()));
afsRefundInfoResultDto
.
setRefundAmount
(
new
BigDecimal
(
"10"
));
afsRefundInfoResultDto
.
setModifyDate
(
DateUtils
.
getBeforeDay
(
new
Date
(),
1
));
// 设置RefundWareVo
List
<
AfsApplyDetailResponse
.
RefundWareVo
>
refundWareVoList
=
new
ArrayList
<>();
AfsApplyDetailResponse
.
RefundWareVo
refundWareVo
=
new
AfsApplyDetailResponse
.
RefundWareVo
();
SupplierOrderSku
supplierOrderSku
=
keystoneService
.
getSupplierOrderSkuBySupplierOrderNo
(
String
.
valueOf
(
applyDetailParam
.
getOrderId
()));
refundWareVo
.
setSkuId
(
supplierOrderSku
.
getSkuNo
());
refundWareVo
.
setWareNumber
(
supplierOrderSku
.
getCount
());
refundWareVo
.
setSkuName
(
supplierOrderSku
.
getSkuName
());
refundWareVoList
.
add
(
refundWareVo
);
afsRefundInfoResultDto
.
setRefundWareDtos
(
refundWareVoList
);
afsRefundInfoResultDtoList
.
add
(
afsRefundInfoResultDto
);
applyDetailDto
.
setRefundInfoResultDtos
(
afsRefundInfoResultDtoList
);
List
<
AfsApplyDetailResponse
.
AddressInfoDto
>
addressInfoDtoList
=
new
ArrayList
<>();
List
<
AfsApplyDetailResponse
.
AddressInfoDto
>
addressInfoDtoList
=
new
ArrayList
<>();
AfsApplyDetailResponse
.
AddressInfoDto
addressInfoDto
=
new
AfsApplyDetailResponse
.
AddressInfoDto
();
AfsApplyDetailResponse
.
AddressInfoDto
addressInfoDto
=
new
AfsApplyDetailResponse
.
AddressInfoDto
();
...
...
src/main/java/cn/qg/holmes/entity/mock/keystone/SupplierOrderSku.java
0 → 100644
View file @
e58e6abc
package
cn
.
qg
.
holmes
.
entity
.
mock
.
keystone
;
import
com.baomidou.mybatisplus.annotation.FieldFill
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
lombok.Data
;
import
java.math.BigDecimal
;
import
java.time.LocalDateTime
;
@Data
public
class
SupplierOrderSku
{
private
Long
id
;
/**
* 供货商订单编号
*/
private
String
supplierOrderNo
;
/**
* sku_no
*/
private
String
skuNo
;
/**
* 商品主图
*/
private
String
imageUrl
;
/**
* 商品名称
*/
private
String
skuName
;
/**
* 商品单价 进价
*/
private
BigDecimal
price
;
/**
* 商品数量
*/
private
Integer
count
;
/**
* 0-无效 1-有效
*/
private
Integer
state
;
private
LocalDateTime
createdAt
;
private
LocalDateTime
updatedAt
;
}
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