1.创建时间和出单时间格式化调整。

2.站内消息调整。

picc-common/src/main/java/com/jpsoft/picc/modules/base/service/impl/TemplateMessageServiceImpl.java

@@ -211,7 +211,14 @@ public class TemplateMessageServiceImpl implements TemplateMessageService {
 			message.setTitle(templateMessage.getTitle() + "-" + srcPolicyStatus.getText());
 		}
 
-		message.setContent(content);
+		//20-中国人保审核,30-待缴费,50-待制单,60-待出单
+		if (destPolicyStatus.getValue()>=20 && destPolicyStatus.getValue()<=60) {
+			message.setContent(content + "<br/>" + destPolicyStatus.getText());
+		}
+		else{
+			message.setContent(content);
+		}
+
 		message.setRecipientId(userId);
 		message.setStatus(false);
 		message.setDelFlag(false);

picc-common/src/main/java/com/jpsoft/picc/modules/business/entity/InsuranceApplication.java

@@ -75,8 +75,8 @@ public class InsuranceApplication {
     @ApiModelProperty(value = "创建人")
 	private String createBy;
 
-	@DateTimeFormat(pattern="yyyy-MM-dd")
-	@JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
     @ApiModelProperty(value = "创建时间")
 	private Date createTime;
     @ApiModelProperty(value = "更新人")
@@ -97,8 +97,8 @@ public class InsuranceApplication {
 	@ApiModelProperty(value = "投保单号")
 	private String policyNo;
 
-	@DateTimeFormat(pattern="yyyy-MM-dd")
-	@JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
 	@ApiModelProperty(value = "出单时间")
 	private Date finishTime;
 

picc-common/src/main/java/com/jpsoft/picc/modules/business/entity/InsurancePolicy.java

@@ -69,8 +69,8 @@ public class InsurancePolicy {
     @ApiModelProperty(value = "创建人")
     private String createBy;
 
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
@@ -90,8 +90,8 @@ public class InsurancePolicy {
     @ApiModelProperty(value = "投保单号")
     private String policyNo;
 
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
     @ApiModelProperty(value = "出单时间")
     private Date finishTime;
 

picc-common/src/main/java/com/jpsoft/picc/modules/common/utils/SignUtil.java

@@ -95,10 +95,10 @@ public class SignUtil {
         //              2e5a8d2ddab490d6cc0ecbc228d8482a
         //微信支付 sign=2e5a8d2ddab490d6cc0ecbc228d8482a&orderNo=20200312220723013&payType=2&code=0008&payTime=1584022071
 
-        signMap.put("orderNo","20200312220723013");
+        signMap.put("orderNo","20200313223313785");
         signMap.put("payType","2");
         signMap.put("code","0008");
-        signMap.put("payTime","1584022071");
+        signMap.put("payTime","1584109993");
         //signMap.put("userMoney","1000");
 
         String md5_sign = "";