1、文本管理调整

gly-base-core/src/main/java/cn/com/taiji/core/entity/managew/NoticePromptText.java

@@ -9,9 +9,7 @@ import cn.com.taiji.core.entity.dict.operation.TriggerType;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.time.LocalDateTime;
 
 @Entity
@@ -24,12 +22,14 @@ public class NoticePromptText extends AbstractStringPropertyUUIDEntity {
     private String title;//标题
 
     @Column(name = "TEXT_TYPE")
+    @Enumerated(EnumType.STRING)
     private TextType textType;//文本类型
 
     @Column(name = "TEXT")
     private String text;//文本内容
 
     @Column(name = "BUSINESS_TYPE")
+    @Enumerated(EnumType.STRING)
     private BusinessType businessType;//业务类型
 
     @Column(name = "DELETED")

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ats/AtsServiceType.java

@@ -4,6 +4,7 @@ import cn.com.taiji.core.manager.comm.client.CommServiceCommand;
 import cn.com.taiji.core.model.comm.protocol.SignServiceCommand;
 import cn.com.taiji.core.model.comm.protocol.SignServiceSystem;
 import cn.com.taiji.core.model.comm.protocol.SignServiceType;
+import cn.com.taiji.core.model.comm.protocol.ats.ali.AliServiceCmd;
 import cn.com.taiji.core.model.comm.protocol.ats.anXin.AnXinServiceCmd;
 import cn.com.taiji.core.model.comm.protocol.ats.bill.BillOpenCmd;
 import cn.com.taiji.core.model.comm.protocol.ats.notice.NoticeServiceCmd;
@@ -18,6 +19,7 @@ import java.util.regex.Pattern;
 
 public enum AtsServiceType implements SignServiceType {
     WEIXIN("微信", "^WEIXIN_\\S+\\.json$", WeiXinServiceCmd.values()),
+    ALI("支付宝", "^ALI_\\S+\\.json$", AliServiceCmd.values()),
     ANXINSIGN("安心签","^ANXINSIGN_\\S+\\.json$", AnXinServiceCmd.values()),
     OCR("ocr","^OCR\\S+\\.json$", OcrServiceCmd.values()),
     JPUSH("极光发送","^JPUSH\\S+\\.json$", JPushServiceCmd.values()),

gly-base-core/src/main/java/cn/com/taiji/core/repo/request/operation/NoticePromptTextPageRequest.java

@@ -3,6 +3,7 @@ package cn.com.taiji.core.repo.request.operation;
 import cn.com.taiji.common.pub.dao.HqlBuilder;
 import cn.com.taiji.common.repo.request.jpa.JpaDateTimePageableDataRequest;
 import cn.com.taiji.core.entity.dict.operation.BusinessType;
+import cn.com.taiji.core.entity.dict.operation.TextType;
 import cn.com.taiji.core.entity.managew.NoticePromptText;
 import lombok.Getter;
 import lombok.Setter;
@@ -25,7 +26,7 @@ public class NoticePromptTextPageRequest extends JpaDateTimePageableDataRequest<
     /** 文本内容 */
     private String text;
     /** 文本类型 */
-    private String textType;
+    private TextType textType;
     /** 业务类型 */
     private BusinessType businessType;
 
@@ -46,8 +47,8 @@ public class NoticePromptTextPageRequest extends JpaDateTimePageableDataRequest<
         hql.append(" and text like :text",text);
         hql.append(" and textType = :textType",textType);
         hql.append(" and businessType = :businessType",businessType);
-        hql.append(" insertTime >= :startTime",startTime);
-        hql.append(" insertTime <= :endTime",endTime);
+        hql.append(" and insertTime >= :startTime",startTime);
+        hql.append(" and insertTime <= :endTime",endTime);
         return hql;
     }
 }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/operation/prompt/NoticePromptTextAddRequestDTO.java

@@ -2,6 +2,7 @@ package cn.com.taiji.managew.dto.operation.prompt;
 
 import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import cn.com.taiji.core.entity.dict.operation.BusinessType;
+import cn.com.taiji.core.entity.dict.operation.TextType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -27,7 +28,7 @@ public class NoticePromptTextAddRequestDTO extends AbstractStaffBizRequestDTO {
 
     @ApiModelProperty(value = "文本类型")
     @NotBlank(message = "文本类型不能为空")
-    private String textType;
+    private TextType textType;
 
     @ApiModelProperty(value = "文本内容")
     @NotBlank(message = "文本内容不能为空")

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/operation/prompt/NoticePromptTextUpdateRequestDTO.java

@@ -2,6 +2,7 @@ package cn.com.taiji.managew.dto.operation.prompt;
 
 import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import cn.com.taiji.core.entity.dict.operation.BusinessType;
+import cn.com.taiji.core.entity.dict.operation.TextType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -32,7 +33,7 @@ public class NoticePromptTextUpdateRequestDTO extends AbstractStaffBizRequestDTO
 
     @ApiModelProperty(value = "文本类型")
     @NotBlank(message = "文本类型不能为空")
-    private String textType;
+    private TextType textType;
 
     @ApiModelProperty(value = "文本内容")
     @NotBlank(message = "文本内容不能为空")

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/ass/selfService/SelfServiceManagerImpl.java

@@ -60,7 +60,7 @@ public class SelfServiceManagerImpl extends AbstractCommManager implements SelfS
         Pagination page = new Pagination();
         if (reqDto.getOrderSource() == SourceType.SERVICE_HALL || reqDto.getOrderSource() == SourceType.WEB){
             if (reqDto.getReceiveStatus() == 3) pageRequest.setReceiveId(findOpenIdByToken(reqDto.getAccessToken()));
-            pageRequest.setOrderSource(reqDto.getOrderSourcePage());
+            pageRequest.setOrderSource(reqDto.getSourceTypePage());
             pageRequest.setOpenId(null);
             page = orderRepo.page(pageRequest);
         }// 其他的暂时不给看

zhywpt-service-ats/build.gradle

@@ -27,7 +27,7 @@ dependencies {
     //二维码
     implementation "com.google.zxing:core:3.5.1"
     // 支付宝SDK
-    implementation 'com.alipay.sdk:alipay-sdk-java-v3:2.9.0.ALL'
+    implementation group: 'com.alipay.sdk', name:'alipay-sdk-java', version: '4.39.194.ALL'
     // 微信SDK
     implementation 'com.github.binarywang:weixin-java-pay:4.7.4.B'
     implementation 'com.github.wechatpay-apiv3:wechatpay-java:0.2.17'