Merge branch 'dev/lanpingxiong' into 'master'

Dev/lanpingxiong See merge request hewei/Jumeirah!81

Merge branch 'dev/lanpingxiong' into 'master'
Dev/lanpingxiong See merge request hewei/Jumeirah!81
17b8451a · lanpingxiong · dcd96907 · 5e339eca · 17b8451a · 17b8451a
Commit 17b8451a authored Nov 10, 2020 by lanpingxiong
4 changed files
--- a/api-app/src/main/java/com/jumeirah/api/app/entity/param/StrokeAddMedicalTreatmentParam.java
+++ b/api-app/src/main/java/com/jumeirah/api/app/entity/param/StrokeAddMedicalTreatmentParam.java
 package com.jumeirah.api.app.entity.param;
+import com.jumeirah.common.entity.base.ImgJson;
 import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,6 +11,7 @@ import lombok.experimental.Accessors;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.sql.Timestamp;
+import java.util.List;
 /**
 * 行程表
@@ -40,9 +42,8 @@ public class StrokeAddMedicalTreatmentParam extends BaseEntity {
    @ApiModelProperty("病人疾病名称")
    private String diseaseName;
-    @NotBlank(message = "病人病情诊断书不能为空")
    @ApiModelProperty("病人病情诊断书")
-    private String medicalCertificateUrl;
+    private List<ImgJson> medicalCertificateUrl;
    @ApiModelProperty("配备器械（格式：1,2,3）逗号分隔")
    private String instruments;

--- a/api-merchant/src/main/java/com/jumeirah/api/merchant/controller/order/McStrokeController.java
+++ b/api-merchant/src/main/java/com/jumeirah/api/merchant/controller/order/McStrokeController.java
@@ -4,12 +4,16 @@ import com.jumeirah.api.merchant.entity.param.StrokeCompleteParam;
 import com.jumeirah.api.merchant.entity.param.StrokeConfirmPaymentParam;
 import com.jumeirah.api.merchant.entity.param.StrokeDiscountCheckParam;
 import com.jumeirah.api.merchant.entity.param.StrokeQuotedPriceParam;
+import com.jumeirah.common.entity.AppUser;
 import com.jumeirah.common.entity.Stroke;
 import com.jumeirah.common.enums.StatePaymentStatusEnum;
 import com.jumeirah.common.enums.StrokeStatusEnum;
+import com.jumeirah.common.factory.PushFactory;
 import com.jumeirah.common.param.McStrokePageParam;
+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.ApiResult;
 import io.geekidea.springbootplus.framework.common.controller.BaseController;
 import io.geekidea.springbootplus.framework.core.pagination.Paging;
@@ -43,6 +47,10 @@ public class McStrokeController extends BaseController {
    @Autowired
    private StrokeService strokeService;
+    @Autowired
+    private PushFactory pushFactory;
+    @Autowired
+    private AppUserService appUserService;
    /**
     * 完成行程接口
@@ -57,10 +65,24 @@ public class McStrokeController extends BaseController {
                .setUpdateTime(new Timestamp(System.currentTimeMillis()))
                .setStatus(StrokeStatusEnum.COMPLETED.getCode());
        boolean flag = strokeService.updateStroke(stroke);
+        sendAppMsg(strokeCompleteParam.getId(), "3", "您的订单已完成");
        return ApiResult.result(flag);
    }
    /**
+     * 发送推送信息给APP端
+     * @param id
+     * @param pushType
+     * @param title
+     * @throws Exception
+     */
+    private void sendAppMsg(Long id, String pushType, String title) throws Exception {
+        StrokeDetailVo newStroke = strokeService.getStrokeById(id);
+        AppUser appUser = appUserService.getById(newStroke.getUserId());
+        pushFactory.getService(appUser.getDeviceType()).unicast(appUser.getDeviceToken(), pushType, title);
+    }
+    /**
     * 行程表分页列表
     */
    @PostMapping("/getPageList")
@@ -84,6 +106,7 @@ public class McStrokeController extends BaseController {
        BeanUtils.copyProperties(strokeQuotedPriceParam, stroke);
        stroke.setUpdateTime(new Timestamp(System.currentTimeMillis()));
        boolean flag = strokeService.updateStroke(stroke);
+        sendAppMsg(strokeQuotedPriceParam.getId(), "2", "您的订单已报价");
        return ApiResult.result(flag);
    }

--- a/common/src/main/java/com/jumeirah/common/entity/Stroke.java
+++ b/common/src/main/java/com/jumeirah/common/entity/Stroke.java
 package com.jumeirah.common.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.jumeirah.common.entity.base.ImgJson;
 import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
 import io.geekidea.springbootplus.framework.core.validator.groups.Update;
 import io.swagger.annotations.ApiModel;
@@ -15,6 +19,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
+import java.util.List;
 /**
 * 行程表
@@ -26,6 +31,7 @@ import java.sql.Timestamp;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "Stroke对象")
+@TableName(autoResultMap = true)
 public class Stroke extends BaseEntity {
    private static final long serialVersionUID = 1L;
@@ -96,8 +102,9 @@ public class Stroke extends BaseEntity {
    @ApiModelProperty("病人疾病名称")
    private String diseaseName;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
    @ApiModelProperty("病人病情诊断书")
-    private String medicalCertificateUrl;
+    private List<ImgJson> medicalCertificateUrl;
    @ApiModelProperty("配备器械（格式：1,2,3）逗号分隔")
    private String instruments;

--- a/common/src/main/java/com/jumeirah/common/vo/StrokeDetailVo.java
+++ b/common/src/main/java/com/jumeirah/common/vo/StrokeDetailVo.java
 package com.jumeirah.common.vo;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.jumeirah.common.entity.base.ImgJson;
 import io.geekidea.springbootplus.framework.core.validator.groups.Update;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,6 +18,7 @@ import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
+import java.util.List;
 /**
 * <pre>
@@ -26,6 +31,7 @@ import java.sql.Timestamp;
 @Data
 @Accessors(chain = true)
 @ApiModel(value = "StrokeDetailVo对象")
+@TableName(autoResultMap = true)
 public class StrokeDetailVo implements Serializable {
    private static final long serialVersionUID = 1L;
@@ -96,8 +102,9 @@ public class StrokeDetailVo implements Serializable {
    @ApiModelProperty("病人疾病名称")
    private String diseaseName;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
    @ApiModelProperty("病人病情诊断书")
-    private String medicalCertificateUrl;
+    private List<ImgJson> medicalCertificateUrl;
    @ApiModelProperty("配备器械（格式：1,2,3）逗号分隔")
    private String instruments;