Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!706

mp-common/src/main/java/com/qs/mp/common/enums/ChannelOrderTypeEnum.java

@@ -13,8 +13,8 @@ import com.qs.mp.common.json.EnumValueDeserializer;
 public enum ChannelOrderTypeEnum implements IEnum<Integer> {
 
     RETAIL(1,"普通票"),
-    OFFLINE_PRE(2,"线下预购票"),
-    ONLINE_PRE(3,"线上预购票");
+    OFFLINE_PRE(2,"线下预付票"),
+    ONLINE_PRE(3,"线上预付票");
 
     private final int value;
     private final String desc;

mp-common/src/main/java/com/qs/mp/common/jsms/JSMSUtils.java

@@ -140,7 +140,9 @@ public class JSMSUtils {
         } catch (APIConnectionException e) {
             logger.error("Connection error. Should retry later. " +  e.getMessage());
         } catch (APIRequestException e) {
-            logger.error(e.getStatus() + " errorCode: " + e.getErrorCode() + " " + e.getErrorMessage());
+            if (e.getStatus() != 403) {
+                logger.error(e.getStatus() + " errorCode: " + e.getErrorCode() + " " + e.getErrorMessage());
+            }
         }
         return null;
     }

mp-service/src/main/java/com/qs/mp/channel/domain/vo/ChannelMyTicketVO.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.Objects;
 
 /**
  * 经销商我的盲票出参类
@@ -63,7 +64,7 @@ public class ChannelMyTicketVO {
 
     @ApiModelProperty("票包类型")
     public ChannelOrderTypeEnum getType() {
-        if (this.isPre == 0){
+        if (Objects.isNull(this.isPre) || this.isPre == 0){
             return ChannelOrderTypeEnum.RETAIL;
         } else {
             if (TicketTypeEnum.OFFLINE.equals(this.ticketType)){