core

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/log/OperateType.java

@@ -100,7 +100,9 @@ public enum OperateType {
     ORDER_RECEIVE("发行订单领取"),
     ORDER_EXAMINE("发行订单审核"),
     ORDER_DELIVER("发行订单发货"),
-    ORDER_CHANGESEND("发行订单换货发货"),
+    ORDER_CHANGEAPPLY("发行订单换货申请"),
+    ORDER_CHANGESEND("发行订单换货发货(审核)"),
+    ORDER_RETURNAPPLY("发行订单退货申请"),
     ORDER_RETURNEXAM("发行订单退货审核"),
 
     ;

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/order/ChangeGoodsRequest.java

@@ -7,6 +7,7 @@ import cn.com.taiji.core.model.comm.protocol.constraint.IntegerConstant;
 import cn.com.taiji.core.model.comm.protocol.valid.ErrorMsgBuilder;
 import lombok.Getter;
 import lombok.Setter;
+
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
@@ -51,17 +52,17 @@ public class ChangeGoodsRequest extends AbstractSignTypeRequest<ChangeGoodsRespo
     private String serviceHallId;//退货网点id
 
     public void relatedValid(ErrorMsgBuilder builder) {
-        if(rechangeMode == 1) {
-            builder.validFieldNotBlank(logisticsCompany, "logisticsCompany");
-            builder.validFieldNotBlank(logisticsNumber, "logisticsNumber");
+        if (rechangeMode == 1) {
+            builder.validFieldNotBlank("logisticsCompany", logisticsCompany);
+            builder.validFieldNotBlank("logisticsNumber", logisticsNumber);
 
-            builder.validFieldNotBlank(consignee, "consignee");
-            builder.validFieldNotBlank(consigneeTel, "consigneeTel");
-            builder.validFieldNotBlank(region, "region");
-            builder.validFieldNotBlank(address, "address");
-        }else {
-            builder.validFieldNotBlank(cardId, "cardId");
-            builder.validFieldNotBlank(obuId, "obuId");
+            builder.validFieldNotBlank("consignee", consignee);
+            builder.validFieldNotBlank("consigneeTel", consigneeTel);
+            builder.validFieldNotBlank("region", region);
+            builder.validFieldNotBlank("address", address);
+        } else {
+            builder.validFieldNotBlank("cardId", cardId);
+            builder.validFieldNotBlank("obuId", obuId);
         }
     }
 

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/order/ReturnGoodsRequest.java

@@ -53,12 +53,12 @@ public class ReturnGoodsRequest extends AbstractSignTypeRequest<ReturnGoodsRespo
 
 
     public void relatedValid(ErrorMsgBuilder builder) {
-        if(rechangeMode == 1) {
-            builder.validFieldNotBlank(logisticsCompany, "logisticsCompany");
-            builder.validFieldNotBlank(logisticsNumber, "logisticsNumber");
-        }else {
-            builder.validFieldNotBlank(cardId, "cardId");
-            builder.validFieldNotBlank(obuId, "obuId");
+        if (rechangeMode == 1) {
+            builder.validFieldNotBlank("logisticsCompany", logisticsCompany);
+            builder.validFieldNotBlank("logisticsNumber", logisticsNumber);
+        } else {
+            builder.validFieldNotBlank("cardId", cardId);
+            builder.validFieldNotBlank("obuId", obuId);
         }
     }