Merge branch 'dev/lanpingxiong' into 'master'

Dev/lanpingxiong

See merge request hewei/Jumeirah!51

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

@@ -5,6 +5,7 @@ import com.jumeirah.api.merchant.entity.param.StrokeConfirmPaymentParam;
 import com.jumeirah.api.merchant.entity.param.StrokeDiscountCheckParam;
 import com.jumeirah.api.merchant.entity.param.StrokeDiscountCheckParam;
 import com.jumeirah.api.merchant.entity.param.StrokeQuotedPriceParam;
 import com.jumeirah.api.merchant.entity.param.StrokeQuotedPriceParam;
 import com.jumeirah.common.entity.Stroke;
 import com.jumeirah.common.entity.Stroke;
+import com.jumeirah.common.enums.StatePaymentStatusEnum;
 import com.jumeirah.common.enums.StrokeStatusEnum;
 import com.jumeirah.common.enums.StrokeStatusEnum;
 import com.jumeirah.common.param.McStrokePageParam;
 import com.jumeirah.common.param.McStrokePageParam;
 import com.jumeirah.common.service.StrokeService;
 import com.jumeirah.common.service.StrokeService;
@@ -106,15 +107,15 @@ public class McStrokeController extends BaseController {
      * 行程订单确认付款接口
      * 行程订单确认付款接口
      */
      */
     @PostMapping("/confirmPayment")
     @PostMapping("/confirmPayment")
-    @OperationLog(name = "优惠调机审核接口", type = OperationLogType.UPDATE)
-    @ApiOperation(value = "优惠调机审核接口", response = ApiResult.class)
+    @OperationLog(name = "行程订单确认付款接口", type = OperationLogType.UPDATE)
+    @ApiOperation(value = "行程订单确认付款接口", response = ApiResult.class)
     @RequiresPermissions("merchant:order:edit")
     @RequiresPermissions("merchant:order:edit")
     public ApiResult<Boolean> confirmPaymentStroke(@Validated @RequestBody StrokeConfirmPaymentParam strokeConfirmPaymentParam) throws Exception {
     public ApiResult<Boolean> confirmPaymentStroke(@Validated @RequestBody StrokeConfirmPaymentParam strokeConfirmPaymentParam) throws Exception {
         Stroke stroke = new Stroke();
         Stroke stroke = new Stroke();
         stroke.setId(strokeConfirmPaymentParam.getId())
         stroke.setId(strokeConfirmPaymentParam.getId())
                 .setStatus(StrokeStatusEnum.PROCESSING.getCode())
                 .setStatus(StrokeStatusEnum.PROCESSING.getCode())
                 .setUpdateTime(new Timestamp(System.currentTimeMillis()))
                 .setUpdateTime(new Timestamp(System.currentTimeMillis()))
-                .setPaymentStatus(strokeConfirmPaymentParam.getPaymentStatus());
+                .setPaymentStatus(StatePaymentStatusEnum.PAID.getCode());
         boolean flag = strokeService.updateStroke(stroke);
         boolean flag = strokeService.updateStroke(stroke);
         return ApiResult.result(flag);
         return ApiResult.result(flag);
     }
     }

common/src/main/resources/mapper/StrokeMapper.xml

@@ -122,6 +122,10 @@
             resultType="com.jumeirah.common.vo.McStrokeQueryVo">
             resultType="com.jumeirah.common.vo.McStrokeQueryVo">
         SELECT
         SELECT
             s.*,
             s.*,
+            ctco.city_name_cn as city_outset_name,
+            ctco.airport_name_cn as outset_airport_name,
+            ctca.city_name_cn as city_arrive_name,
+            ctca.airport_name_cn as arrive_airport_name,
             CONCAT( au.surname, au.`name` ) AS applicant,
             CONCAT( au.surname, au.`name` ) AS applicant,
             pt.name AS plain_type_name,
             pt.name AS plain_type_name,
             au.phone AS phone_number
             au.phone AS phone_number
@@ -129,6 +133,8 @@
             stroke s
             stroke s
             LEFT JOIN app_user au ON au.id = s.user_id
             LEFT JOIN app_user au ON au.id = s.user_id
             LEFT JOIN plain_type pt ON pt.id = s.plain_type_id
             LEFT JOIN plain_type pt ON pt.id = s.plain_type_id
+            INNER JOIN city_three_code ctco ON ctco.id = s.city_outset_id
+            INNER JOIN city_three_code ctca ON ctca.id = s.city_arrive_id
             <where>
             <where>
                 <if test="mcStrokePageParam.status != null and mcStrokePageParam.status != -1">
                 <if test="mcStrokePageParam.status != null and mcStrokePageParam.status != -1">
                     AND s.status = #{mcStrokePageParam.status}
                     AND s.status = #{mcStrokePageParam.status}