Merge remote-tracking branch 'origin/feature-material-wangcz' into feature-material-wangcz

src/main/java/com/uas/platform/b2c/trade/order/service/impl/PurchaseServiceImpl.java

@@ -1179,7 +1179,7 @@ public class PurchaseServiceImpl implements PurchaseService {
 		if ("mall".equals(storeType)) {
 			storeid = sysConf.getStoreid();
 			pageInfo.expression(new SimpleExpression("storeid", storeid, CriterionExpression.Operator.EQ));
-		} else {
+		} else if ("other".equals(storeType)) {
 			List<StoreIn> storeInfos = storeInDao.findByEnUU(uu);
 			if (CollectionUtils.isEmpty(storeInfos)) {
 				if (CollectionUtils.isEmpty(storeApplyDao.findByEnUUAndStatusOrderByAuthTimeDesc(uu, StoreApply.ApplyStatus.PASS))){