Browse Source

Merge remote-tracking branch 'origin/develop' into develop

release_toaliyun_real
luozukai 7 years ago
parent
commit
209db0a38e
3 changed files with 5 additions and 5 deletions
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/WxOrderController.java
  2. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/WxProfitSharingOrderController.java
  3. +3
    -3
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/WxOrderController.java View File

@@ -95,7 +95,7 @@ public class WxOrderController extends BaseController {
} }


@ApiOperation("交易统计") @ApiOperation("交易统计")
@PostMapping("/queryOrderSummary")
@GetMapping("/queryOrderSummary")
public ResultData queryOrderSummary() { public ResultData queryOrderSummary() {
logger.debug("[" + getIpAddr() + "] WxOrderController::queryOrderSummary"); logger.debug("[" + getIpAddr() + "] WxOrderController::queryOrderSummary");




+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/WxProfitSharingOrderController.java View File

@@ -41,7 +41,7 @@ public class WxProfitSharingOrderController extends BaseController {
} }


@ApiOperation("交易统计") @ApiOperation("交易统计")
@PostMapping("/queryOrderSummary")
@GetMapping("/queryOrderSummary")
public ResultData queryOrderSummary() { public ResultData queryOrderSummary() {
logger.debug("[" + getIpAddr() + "] WxProfitSharingOrderController::queryOrderSummary"); logger.debug("[" + getIpAddr() + "] WxProfitSharingOrderController::queryOrderSummary");




+ 3
- 3
mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java View File

@@ -365,7 +365,7 @@ public class WxUserGrantController extends BaseController {
* 检查用户状态 * 检查用户状态
* @return * @return
*/ */
@PostMapping("/checkUserStatus")
@GetMapping("/checkUserStatus")
@ApiOperation(value = "判断是否是老用户", notes="") @ApiOperation(value = "判断是否是老用户", notes="")
public ResultData checkUserStatus() { public ResultData checkUserStatus() {
Map resultMap = new HashMap(); Map resultMap = new HashMap();
@@ -384,7 +384,7 @@ public class WxUserGrantController extends BaseController {
* 检查用户状态 * 检查用户状态
* @return * @return
*/ */
@PostMapping("/checkPhoneStatus")
@GetMapping("/checkPhoneStatus")
@ApiOperation(value = "判断是否是老用户", notes="") @ApiOperation(value = "判断是否是老用户", notes="")
public ResultData checkPhoneStatus() { public ResultData checkPhoneStatus() {
Map resultMap = new HashMap(); Map resultMap = new HashMap();
@@ -566,7 +566,7 @@ public class WxUserGrantController extends BaseController {
* 获取用户折扣率 * 获取用户折扣率
* @return * @return
*/ */
@PostMapping("/getDiscountInfo")
@GetMapping("/getDiscountInfo")
@ApiOperation(value = "获取用户折扣率", notes="") @ApiOperation(value = "获取用户折扣率", notes="")
public ResultData getDiscountInfo() { public ResultData getDiscountInfo() {




Loading…
Cancel
Save