Toggle navigation
Toggle navigation
This project
Loading...
Sign in
ufo
/
ufo-platform
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
caoyan
5 years ago
Commit
ce9030476913659ae864aaee9a59c1d58f270baa
1 parent
6ee2a90b
鉴定服务
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
7 deletions
dal/src/main/java/com/yoho/order/dal/AppraiseOrderStorageMapper.java
dal/src/main/resources/META-INF/mybatis/AppraiseOrderStorageMapper.xml
order/src/main/java/com/yoho/ufo/order/controller/BuyerOrderController.java
order/src/main/java/com/yoho/ufo/order/service/impl/BuyerOrderServiceImpl.java
dal/src/main/java/com/yoho/order/dal/AppraiseOrderStorageMapper.java
View file @
ce90304
...
...
@@ -12,6 +12,8 @@ import com.yoho.order.model.AppraiseOrderStorage;
public
interface
AppraiseOrderStorageMapper
{
List
<
AppraiseOrderStorage
>
selectByOrderCodes
(
@Param
(
"list"
)
List
<
String
>
orderCodeList
);
AppraiseOrderStorage
selectByOrderCode
(
@Param
(
"orderCode"
)
String
orderCode
);
}
...
...
dal/src/main/resources/META-INF/mybatis/AppraiseOrderStorageMapper.xml
View file @
ce90304
...
...
@@ -25,4 +25,9 @@
</foreach>
</select>
<select
id=
"selectByOrderCode"
resultMap=
"BaseResultMap"
>
select
<include
refid=
"Base_Column_List"
/>
from appraise_order_storage where order_code = #{orderCode}
</select>
</mapper>
\ No newline at end of file
...
...
order/src/main/java/com/yoho/ufo/order/controller/BuyerOrderController.java
View file @
ce90304
...
...
@@ -481,7 +481,7 @@ public class BuyerOrderController {
@RequestMapping
(
value
=
"/getSfWaybillCode"
)
public
ApiResponse
generateSfWaybillCode
(
BuyerOrderReq
req
)
{
LOGGER
.
info
(
"getSfWaybillCode in. param is {}"
,
req
);
if
(
StringUtils
.
isEmpty
(
req
.
getOrderCode
())
||
null
==
req
.
getPayMethod
()
)
{
if
(
StringUtils
.
isEmpty
(
req
.
getOrderCode
()))
{
return
new
ApiResponse
.
ApiResponseBuilder
().
code
(
400
).
data
(
""
).
message
(
"订单号或付款方式不能为空"
).
build
();
}
JSONObject
result
=
buyerOrderService
.
getExpressWaybillCode
(
req
);
...
...
order/src/main/java/com/yoho/ufo/order/service/impl/BuyerOrderServiceImpl.java
View file @
ce90304
...
...
@@ -2759,6 +2759,8 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
AppraiseOrderGoods
goods
=
appraiseOrderGoodsMapper
.
selectByOrderCode
(
Long
.
valueOf
(
order
.
getOrderCode
()));
AppraiseAddress
appraiseAddress
=
appraiseAddressMapper
.
selectByType
(
null
==
goods
.
getDepotNo
()
?
1
:
goods
.
getDepotNo
());
AppraiseOrderStorage
storage
=
appraiseOrderStorageMapper
.
selectByOrderCode
(
order
.
getOrderCode
());
JSONObject
jsonReqObj
=
getSfStringHttpEntityForAppraise
(
order
,
req
,
goods
,
appraiseAddress
.
getAddress
());
HttpEntity
<
String
>
formEntity
=
new
HttpEntity
<>(
jsonReqObj
.
toString
(),
getHttpHeaders
());
...
...
@@ -2772,8 +2774,6 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
return
body
;
}
// Product product = productMapper.selectByPrimaryKey(sellerGoods.getProductId());
JSONObject
data
=
body
.
getJSONObject
(
"data"
);
data
.
put
(
"createTime"
,
DateUtil
.
getCurrentTimeSeconds
());
data
.
put
(
"dContact"
,
jsonReqObj
.
getString
(
"dContact"
));
...
...
@@ -2789,16 +2789,15 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
data
.
put
(
"jCity"
,
jsonReqObj
.
getString
(
"jCity"
));
data
.
put
(
"jDistrict"
,
jsonReqObj
.
getString
(
"jDistrict"
));
data
.
put
(
"jAddress"
,
jsonReqObj
.
getString
(
"jAddress"
));
// data.put("orderCode", buyerOrder.getOrderCode());
// data.put("productCode", product.getProductCode());
// data.put("sizeName", sellerGoods.getSizeName());
data
.
put
(
"orderCode"
,
order
.
getOrderCode
());
data
.
put
(
"productCode"
,
goods
.
getProductCode
());
data
.
put
(
"sizeName"
,
null
==
storage
?
""
:
storage
.
getSizeName
());
data
.
put
(
"shipFee"
,
"**元"
);
data
.
put
(
"amount"
,
"**元"
);
data
.
put
(
"businessType"
,
data
.
getString
(
"proCode"
).
equals
(
"T6"
)
?
"顺丰特惠"
:
"标准快递"
);
data
.
put
(
"custid"
,
"***"
);
data
.
put
(
"cargoInfo"
,
"[衣服鞋帽]*1"
);
data
.
put
(
"dWholeAddress"
,
jsonReqObj
.
getString
(
"dProvince"
)
+
jsonReqObj
.
getString
(
"dCity"
)
+
jsonReqObj
.
getString
(
"dDistrict"
)
+
jsonReqObj
.
getString
(
"dAddress"
));
//data.put("twoDimensionCode", data.getJSONObject("twoDimensionCode"));
data
.
put
(
"cargoInfo"
,
"[衣服鞋帽]*1"
);
LOGGER
.
info
(
"method getSfWaybillCode Result is {}"
,
data
);
...
...
Please
register
or
login
to post a comment