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 @@ @@ -78,6 +78,11 @@
78 <value>/UnionShareRest/getShareInfoByUid</value> 78 <value>/UnionShareRest/getShareInfoByUid</value>
79 <value>/UnionShareRest/addSettlement</value> 79 <value>/UnionShareRest/addSettlement</value>
80 <value>/UnionShareRest/queryUnionShareOrder</value> 80 <value>/UnionShareRest/queryUnionShareOrder</value>
  81 + <value>/UnionShareRest/queryUnionTypeByUid</value>
  82 + <value>/UnionShareRest/queryRecentlyOrderLimitTen</value>
  83 + <value>/UnionShareRest/queryOderDetail</value>
  84 + <value>/UnionShareRest/querySettlementRecord</value>
  85 + <value>/UnionShareRest/queryOrderList</value>
81 86
82 </list> 87 </list>
83 </property> 88 </property>
@@ -75,7 +75,7 @@ public class UnionShareRest { @@ -75,7 +75,7 @@ public class UnionShareRest {
75 */ 75 */
76 @RequestMapping("/queryUnionTypeByUid") 76 @RequestMapping("/queryUnionTypeByUid")
77 @ResponseBody 77 @ResponseBody
78 - public UnionResponse queryUnionTypeByUid(int uid){ 78 + public UnionResponse queryUnionTypeByUid(@RequestBody int uid){
79 log.info("UnionShareRest :: queryUnionTypeByUid uid is{}", uid); 79 log.info("UnionShareRest :: queryUnionTypeByUid uid is{}", uid);
80 try { 80 try {
81 UnionShareUser unionShareUser = unionShareService.queryUnionTypeByUid(uid); 81 UnionShareUser unionShareUser = unionShareService.queryUnionTypeByUid(uid);
@@ -94,7 +94,7 @@ public class UnionShareRest { @@ -94,7 +94,7 @@ public class UnionShareRest {
94 */ 94 */
95 @RequestMapping("/queryRecentlyOrderLimitTen") 95 @RequestMapping("/queryRecentlyOrderLimitTen")
96 @ResponseBody 96 @ResponseBody
97 - public UnionResponse queryRecentlyOrderLimitTen(int uid){ 97 + public UnionResponse queryRecentlyOrderLimitTen(@RequestBody int uid){
98 log.info("UnionShareRest :: queryRecentlyOrderLimitTen uid is{}", uid); 98 log.info("UnionShareRest :: queryRecentlyOrderLimitTen uid is{}", uid);
99 try { 99 try {
100 List<UnionShareOrders> unionShareOrdersList = unionShareService.queryRecentlyOrderLimitTen(uid); 100 List<UnionShareOrders> unionShareOrdersList = unionShareService.queryRecentlyOrderLimitTen(uid);
@@ -113,7 +113,7 @@ public class UnionShareRest { @@ -113,7 +113,7 @@ public class UnionShareRest {
113 */ 113 */
114 @RequestMapping("/queryOderDetail") 114 @RequestMapping("/queryOderDetail")
115 @ResponseBody 115 @ResponseBody
116 - public UnionResponse queryOderDetail(UnionShareOrderReqBO unionShareOrderReqBO){ 116 + public UnionResponse queryOderDetail(@RequestBody UnionShareOrderReqBO unionShareOrderReqBO){
117 log.info("UnionShareRest :: queryOderDetail unionShareOrderReqBO is{}", unionShareOrderReqBO); 117 log.info("UnionShareRest :: queryOderDetail unionShareOrderReqBO is{}", unionShareOrderReqBO);
118 if (null == unionShareOrderReqBO || null == unionShareOrderReqBO.getUid() || null == unionShareOrderReqBO.getOrderCode()){ 118 if (null == unionShareOrderReqBO || null == unionShareOrderReqBO.getUid() || null == unionShareOrderReqBO.getOrderCode()){
119 return new UnionResponse(400, "querySettlementRecord uid or orderCode is null"); 119 return new UnionResponse(400, "querySettlementRecord uid or orderCode is null");
@@ -135,7 +135,7 @@ public class UnionShareRest { @@ -135,7 +135,7 @@ public class UnionShareRest {
135 */ 135 */
136 @RequestMapping("/querySettlementRecord") 136 @RequestMapping("/querySettlementRecord")
137 @ResponseBody 137 @ResponseBody
138 - public UnionResponse querySettlementRecord(UnionShareOrderReqBO unionShareOrderReqBO){ 138 + public UnionResponse querySettlementRecord(@RequestBody UnionShareOrderReqBO unionShareOrderReqBO){
139 log.info("UnionShareRest :: querySettlementRecord unionShareOrderReqBO is{}", unionShareOrderReqBO); 139 log.info("UnionShareRest :: querySettlementRecord unionShareOrderReqBO is{}", unionShareOrderReqBO);
140 if (null == unionShareOrderReqBO || null == unionShareOrderReqBO.getUid()){ 140 if (null == unionShareOrderReqBO || null == unionShareOrderReqBO.getUid()){
141 return new UnionResponse(400, "querySettlementRecord params is null"); 141 return new UnionResponse(400, "querySettlementRecord params is null");
@@ -158,7 +158,7 @@ public class UnionShareRest { @@ -158,7 +158,7 @@ public class UnionShareRest {
158 */ 158 */
159 @RequestMapping("/queryOrderList") 159 @RequestMapping("/queryOrderList")
160 @ResponseBody 160 @ResponseBody
161 - public UnionResponse queryOrderList(UnionShareOrderReqBO unionShareOrderReqBO){ 161 + public UnionResponse queryOrderList(@RequestBody UnionShareOrderReqBO unionShareOrderReqBO){
162 log.info("UnionShareRest :: queryOrderList unionShareOrderReqBO is{}", unionShareOrderReqBO); 162 log.info("UnionShareRest :: queryOrderList unionShareOrderReqBO is{}", unionShareOrderReqBO);
163 if (null == unionShareOrderReqBO || null == unionShareOrderReqBO.getUid()){ 163 if (null == unionShareOrderReqBO || null == unionShareOrderReqBO.getUid()){
164 return new UnionResponse(400, "queryOrderList params is null"); 164 return new UnionResponse(400, "queryOrderList params is null");
1 union.newUserRebatesRatio=0.1 1 union.newUserRebatesRatio=0.1
2 union.oldUserRebatesRatio=0.03 2 union.oldUserRebatesRatio=0.03
3 union.shareId = 1 3 union.shareId = 1
4 -union.url = /2017/10/17/17/01118b6fa2ca8ba27423aaf6883833e8b9.jpg  
  4 +union.url = http://img10.static.yhbimg.com/article/2018/05/18/14/017112c48a4af09fdf161356b4b12f7059.png