店铺审核-取数修改

src/main/java/com/uas/platform/b2c/prod/store/service/impl/StoreApplyServiceImpl.java

@@ -16,6 +16,7 @@ import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.exception.IllegalStatusException;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.persistence.criteria.CriterionExpression;
+import com.uas.platform.core.persistence.criteria.LogicalExpression;
 import com.uas.platform.core.persistence.criteria.SimpleExpression;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.convert.converter.Converter;
@@ -227,8 +228,16 @@ public class StoreApplyServiceImpl implements StoreApplyService {
 	@Override
 	public Page<StoreApply> pageStoreApplications(final PageInfo pageInfo, StoreApply.ApplyStatus status, StoreType type, String keyword) {
 		if (status != null) {
-			SimpleExpression expression = new SimpleExpression("status", status, CriterionExpression.Operator.EQ);
-			pageInfo.expression(expression);
+			if (StoreApply.ApplyStatus.PREPARE.equals(status)) {
+				SimpleExpression exCheck = new SimpleExpression("status", StoreApply.ApplyStatus.CHECK, CriterionExpression.Operator.EQ);
+				SimpleExpression exPrepare = new SimpleExpression("status", status, CriterionExpression.Operator.EQ);
+				SimpleExpression[] expressions = {exCheck, exPrepare};
+				LogicalExpression logical = new LogicalExpression(expressions, CriterionExpression.Operator.OR);
+				pageInfo.expression(logical);
+			} else {
+				SimpleExpression expression = new SimpleExpression("status", status, CriterionExpression.Operator.EQ);
+				pageInfo.expression(expression);
+			}
 		}
 		if (type != null) {
 			SimpleExpression expression = new SimpleExpression("type", type, CriterionExpression.Operator.EQ);
@@ -249,8 +258,16 @@ public class StoreApplyServiceImpl implements StoreApplyService {
 
 	public Page<StoreApply> pageStoreApplicationsByAuthor(final PageInfo pageInfo, StoreApply.ApplyStatus status, StoreType type, String keyword) {
 		if (status != null) {
-			SimpleExpression expression = new SimpleExpression("status", status, CriterionExpression.Operator.EQ);
-			pageInfo.expression(expression);
+			if (StoreApply.ApplyStatus.PREPARE.equals(status)) {
+				SimpleExpression exCheck = new SimpleExpression("status", StoreApply.ApplyStatus.CHECK, CriterionExpression.Operator.EQ);
+				SimpleExpression exPrepare = new SimpleExpression("status", status, CriterionExpression.Operator.EQ);
+				SimpleExpression[] expressions = {exCheck, exPrepare};
+				LogicalExpression logical = new LogicalExpression(expressions, CriterionExpression.Operator.OR);
+				pageInfo.expression(logical);
+			} else {
+				SimpleExpression expression = new SimpleExpression("status", status, CriterionExpression.Operator.EQ);
+				pageInfo.expression(expression);
+			}
 		}
 		if (type != null) {
 			SimpleExpression expression = new SimpleExpression("type", type, CriterionExpression.Operator.EQ);