Merge branch 'master' of http://119.28.51.83/hewei/Jumeirah into hw

 Conflicts:
	api-merchant/src/main/java/com/jumeirah/api/merchant/controller/order/McStrokeController.java

api-merchant/src/main/java/com/jumeirah/api/merchant/controller/order/McStrokeController.java

 package com.jumeirah.api.merchant.controller.order;
 
-import com.jumeirah.api.merchant.entity.param.StrokeCancelParam;
 import com.jumeirah.api.merchant.entity.param.StrokeConfirmPaymentParam;
 import com.jumeirah.api.merchant.entity.param.StrokeDiscountCheckParam;
 import com.jumeirah.common.entity.AppUser;
@@ -15,6 +14,7 @@ import com.jumeirah.common.service.AppUserService;
 import com.jumeirah.common.service.StrokeService;
 import com.jumeirah.common.vo.McStrokeQueryVo;
 import com.jumeirah.common.vo.StrokeDetailVo;
+import io.geekidea.springbootplus.framework.common.api.ApiCode;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.common.controller.BaseController;
 import io.geekidea.springbootplus.framework.core.pagination.Paging;
@@ -62,7 +62,7 @@ public class McStrokeController extends BaseController {
     @RequiresPermissions("merchant:order:edit")
     public ApiResult<Boolean> completeStroke(@Validated @RequestBody StrokeCompleteParam strokeCompleteParam) throws Exception {
         ApiResult<Boolean> result = strokeService.completeStroke(strokeCompleteParam);
-        if (result.getData()) {
+        if (result.getCode() == ApiCode.SUCCESS.getCode()) {
             sendAppMsg(strokeCompleteParam.getId(), "3", "您的订单已完成");
         }
         return result;
@@ -103,7 +103,7 @@ public class McStrokeController extends BaseController {
     @RequiresPermissions("merchant:order:edit")
     public ApiResult<Boolean> updateStroke(@Validated @RequestBody StrokeQuotedPriceParam strokeQuotedPriceParam) throws Exception {
         ApiResult<Boolean> result = strokeService.quotedPrice(strokeQuotedPriceParam);
-        if (result.getData()) {
+        if (result.getCode() == ApiCode.SUCCESS.getCode()) {
             sendAppMsg(strokeQuotedPriceParam.getId(), "2", "您的订单已报价");
         }
         return result;