YOHOBUY / yohobuy-union · Commits

Go to a project

Authored by mingdan.ge
Commit e26c67177e89ebb2e84f57b7656b43f4d03906b3 2 parents ba29f4de c7cd7aab

Merge branch 'dev_180508_联盟红人推广' into test6.6.1

Inline Side-by-side
Showing 3 changed files with 11 additions and 6 deletions
... ... @@ -78,6 +78,11 @@
<value>/UnionShareRest/getShareInfoByUid</value>
<value>/UnionShareRest/addSettlement</value>
<value>/UnionShareRest/queryUnionShareOrder</value>
<value>/UnionShareRest/queryUnionTypeByUid</value>
<value>/UnionShareRest/queryRecentlyOrderLimitTen</value>
<value>/UnionShareRest/queryOderDetail</value>
<value>/UnionShareRest/querySettlementRecord</value>
<value>/UnionShareRest/queryOrderList</value>
</list>
</property>
... ...
... ... @@ -75,7 +75,7 @@ public class UnionShareRest {
*/
@RequestMapping("/queryUnionTypeByUid")
@ResponseBody
public UnionResponse queryUnionTypeByUid(int uid){
public UnionResponse queryUnionTypeByUid(@RequestBody int uid){
log.info("UnionShareRest :: queryUnionTypeByUid uid is{}", uid);
try {
UnionShareUser unionShareUser = unionShareService.queryUnionTypeByUid(uid);
... ... @@ -94,7 +94,7 @@ public class UnionShareRest {
*/
@RequestMapping("/queryRecentlyOrderLimitTen")
@ResponseBody
public UnionResponse queryRecentlyOrderLimitTen(int uid){
public UnionResponse queryRecentlyOrderLimitTen(@RequestBody int uid){
log.info("UnionShareRest :: queryRecentlyOrderLimitTen uid is{}", uid);
try {
List<UnionShareOrders> unionShareOrdersList = unionShareService.queryRecentlyOrderLimitTen(uid);
... ... @@ -113,7 +113,7 @@ public class UnionShareRest {
*/
@RequestMapping("/queryOderDetail")
@ResponseBody
public UnionResponse queryOderDetail(UnionShareOrderReqBO unionShareOrderReqBO){
public UnionResponse queryOderDetail(@RequestBody UnionShareOrderReqBO unionShareOrderReqBO){
log.info("UnionShareRest :: queryOderDetail unionShareOrderReqBO is{}", unionShareOrderReqBO);
if (null == unionShareOrderReqBO || null == unionShareOrderReqBO.getUid() || null == unionShareOrderReqBO.getOrderCode()){
return new UnionResponse(400, "querySettlementRecord uid or orderCode is null");
... ... @@ -135,7 +135,7 @@ public class UnionShareRest {
*/
@RequestMapping("/querySettlementRecord")
@ResponseBody
public UnionResponse querySettlementRecord(UnionShareOrderReqBO unionShareOrderReqBO){
public UnionResponse querySettlementRecord(@RequestBody UnionShareOrderReqBO unionShareOrderReqBO){
log.info("UnionShareRest :: querySettlementRecord unionShareOrderReqBO is{}", unionShareOrderReqBO);
if (null == unionShareOrderReqBO || null == unionShareOrderReqBO.getUid()){
return new UnionResponse(400, "querySettlementRecord params is null");
... ... @@ -158,7 +158,7 @@ public class UnionShareRest {
*/
@RequestMapping("/queryOrderList")
@ResponseBody
public UnionResponse queryOrderList(UnionShareOrderReqBO unionShareOrderReqBO){
public UnionResponse queryOrderList(@RequestBody UnionShareOrderReqBO unionShareOrderReqBO){
log.info("UnionShareRest :: queryOrderList unionShareOrderReqBO is{}", unionShareOrderReqBO);
if (null == unionShareOrderReqBO || null == unionShareOrderReqBO.getUid()){
return new UnionResponse(400, "queryOrderList params is null");
... ...
union.newUserRebatesRatio=0.1
union.oldUserRebatesRatio=0.03
union.shareId = 1
union.url = /2017/10/17/17/01118b6fa2ca8ba27423aaf6883833e8b9.jpg
\ No newline at end of file
union.url = http://img10.static.yhbimg.com/article/2018/05/18/14/017112c48a4af09fdf161356b4b12f7059.png
\ No newline at end of file
... ...